1 files changed, 13 insertions, 13 deletions

diff --git a/src/ginput/ginput_dial.c b/src/ginput/ginput_dial.c
index 7763f209..375e10b1 100644
--- a/src/ginput/ginput_dial.c
+++ b/src/ginput/ginput_dial.c
@@ -21,13 +21,13 @@
 
 static GTIMER_DECL(DialTimer);
 static struct DialStatus_t {
-	uint16_t	sensitivity;
-	uint16_t	lastvalue;
-	uint16_t	max;
+	gU16	sensitivity;
+	gU16	lastvalue;
+	gU16	max;
 } DialStatus[GINPUT_DIAL_NUM_PORTS];
 
 // The reading callback function
-static void DialCallback(uint16_t instance, uint16_t rawvalue) {
+static void DialCallback(gU16 instance, gU16 rawvalue) {
 	struct DialStatus_t *pds;
 	GSourceListener		*psl;
 	GEventDial			*pe;
@@ -37,7 +37,7 @@ static void DialCallback(uint16_t instance, uint16_t rawvalue) {
 
 	/* Range scale - if needed */
 	if (pds->max != GINPUT_DIAL_MAX_VALUE)
-		rawvalue = (uint16_t)((uint32_t)rawvalue * pds->max / GINPUT_DIAL_MAX_VALUE);
+		rawvalue = (gU16)((gU32)rawvalue * pds->max / GINPUT_DIAL_MAX_VALUE);
 
 	/* Forget about changes below our sensitivity threshold */
 	if (rawvalue >= pds->lastvalue) {
@@ -62,7 +62,7 @@ static void DialCallback(uint16_t instance, uint16_t rawvalue) {
 	}
 }
 
-GSourceHandle ginputGetDial(uint16_t instance) {
+GSourceHandle ginputGetDial(gU16 instance) {
 	struct DialStatus_t *pds;
 
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
@@ -87,21 +87,21 @@ GSourceHandle ginputGetDial(uint16_t instance) {
 	return (GSourceHandle)(DialStatus+instance);
 }
 
-void ginputResetDialRange(uint16_t instance) {
+void ginputResetDialRange(gU16 instance) {
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
 		return;
 
 	ginputSetDialRange(instance, GINPUT_DIAL_MAX_VALUE);
 }
 
-uint16_t ginputGetDialRange(uint16_t instance) {
+gU16 ginputGetDialRange(gU16 instance) {
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
 		return 0;
 
 	return DialStatus[instance].max;
 }
 
-void ginputSetDialRange(uint16_t instance, uint16_t max) {
+void ginputSetDialRange(gU16 instance, gU16 max) {
 	struct DialStatus_t *pds;
 
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
@@ -111,8 +111,8 @@ void ginputSetDialRange(uint16_t instance, uint16_t max) {
 
 	// Rescale the last value and the sensitivity
 	if (max != pds->max) {
-		pds->lastvalue = (uint16_t)((uint32_t)pds->lastvalue * max / pds->max);
-		pds->sensitivity = (uint16_t)((uint32_t)pds->sensitivity * max / pds->max);
+		pds->lastvalue = (gU16)((gU32)pds->lastvalue * max / pds->max);
+		pds->sensitivity = (gU16)((gU32)pds->sensitivity * max / pds->max);
 		pds->max = max;
 	}
 }
@@ -124,7 +124,7 @@ void ginputSetDialRange(uint16_t instance, uint16_t max) {
  * @param[in] instance	The ID of the dial input instance
  * @param[in] diff		The amount of level changes
  */
-void ginputSetDialSensitivity(uint16_t instance, uint16_t diff) {
+void ginputSetDialSensitivity(gU16 instance, gU16 diff) {
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
 		return;
 
@@ -139,7 +139,7 @@ void ginputSetDialSensitivity(uint16_t instance, uint16_t diff) {
  *
  * @return	Returns gFalse on an error (eg invalid instance)
  */
-gBool ginputGetDialStatus(uint16_t instance, GEventDial *pdial) {
+gBool ginputGetDialStatus(gU16 instance, GEventDial *pdial) {
 	if (instance >= GINPUT_DIAL_NUM_PORTS)
 		return gFalse;
 	pdial->type = GEVENT_DIAL;