Replace 'ushort' with 'unsigned short'.

3 files changed, 48 insertions, 48 deletions

diff --git a/driver_italk.c b/driver_italk.c
index 28a2c1f1..b3310a85 100644
--- a/driver_italk.c
+++ b/driver_italk.c
@@ -46,9 +46,9 @@ static gps_mask_t decode_itk_navfix(struct gps_device_t *session,
 	return -1;
     }
 
-    flags = (ushort) getleu16(buf, 7 + 4);
-    //cflags = (ushort) getleu16(buf, 7 + 6);
-    pflags = (ushort) getleu16(buf, 7 + 8);
+    flags = (unsigned short) getleu16(buf, 7 + 4);
+    //cflags = (unsigned short) getleu16(buf, 7 + 6);
+    pflags = (unsigned short) getleu16(buf, 7 + 8);
 
     session->gpsdata.status = STATUS_NO_FIX;
     session->newdata.mode = MODE_NO_FIX;
@@ -140,7 +140,7 @@ static gps_mask_t decode_itk_prnstatus(struct gps_device_t *session,
 	    unsigned int off = 7 + 52 + 10 * i;
 	    unsigned short flags;
 
-	    flags = (ushort) getleu16(buf, off);
+	    flags = (unsigned short) getleu16(buf, off);
 	    session->gpsdata.ss[i] = (float)(getleu16(buf, off + 2) & 0xff);
 	    session->gpsdata.PRN[i] = (int)getleu16(buf, off + 4) & 0xff;
 	    session->gpsdata.elevation[i] = (int)getles16(buf, off + 6) & 0xff;
@@ -178,7 +178,7 @@ static gps_mask_t decode_itk_utcionomodel(struct gps_device_t *session,
 	return 0;
     }
 
-    flags = (ushort) getleu16(buf, 7);
+    flags = (unsigned short) getleu16(buf, 7);
     if (0 == (flags & UTC_IONO_MODEL_UTCVALID))
 	return 0;
 
@@ -208,9 +208,9 @@ static gps_mask_t decode_itk_subframe(struct gps_device_t *session,
 	return 0;
     }
 
-    flags = (ushort) getleu16(buf, 7 + 4);
-    prn = (ushort) getleu16(buf, 7 + 6);
-    sf = (ushort) getleu16(buf, 7 + 8);
+    flags = (unsigned short) getleu16(buf, 7 + 4);
+    prn = (unsigned short) getleu16(buf, 7 + 6);
+    sf = (unsigned short) getleu16(buf, 7 + 8);
     gpsd_report(LOG_PROG, "iTalk 50B SUBFRAME prn %u sf %u - decode %s %s\n",
 		prn, sf,
 		flags & SUBFRAME_WORD_FLAG_MASK ? "error" : "ok",
@@ -233,7 +233,7 @@ static gps_mask_t decode_itk_pseudo(struct gps_device_t *session,
 {
     unsigned short flags, n, i;
 
-    n = (ushort) getleu16(buf, 7 + 4);
+    n = (unsigned short) getleu16(buf, 7 + 4);
     if ((n < 1) || (n > MAXCHANNELS)){
 	gpsd_report(LOG_INF, "ITALK: bad PSEUDO channel count\n");
 	return 0;
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index db2adbfb..7c9e9b22 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -104,12 +104,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	rtcm->rtcmtypes.rtcm3_1001.header.station_id = (uint)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1001.header.tow = (time_t)ugrab(30);
 	rtcm->rtcmtypes.rtcm3_1001.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1001.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1001.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1001.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1001.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1001.header.interval = (unsigned short)ugrab(3);
 #define R1001 rtcm->rtcmtypes.rtcm3_1001.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1001.header.satcount; i++) {
-	    R1001.ident = (ushort)ugrab(6);
+	    R1001.ident = (unsigned short)ugrab(6);
 	    R1001.L1.indicator = (unsigned char)ugrab(1);
 	    GPS_PSEUDORANGE(R1001.L1, 24);
 	    RANGEDIFF(R1001.L1, 20);
@@ -122,12 +122,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	rtcm->rtcmtypes.rtcm3_1002.header.station_id = (uint)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1002.header.tow = (time_t)ugrab(30);
 	rtcm->rtcmtypes.rtcm3_1002.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1002.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1002.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1002.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1002.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1002.header.interval = (unsigned short)ugrab(3);
 #define R1002 rtcm->rtcmtypes.rtcm3_1002.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1002.header.satcount; i++) {
-	    R1002.ident = (ushort)ugrab(6);
+	    R1002.ident = (unsigned short)ugrab(6);
 	    R1002.L1.indicator = (unsigned char)ugrab(1);
 	    GPS_PSEUDORANGE(R1002.L1, 24);
 	    RANGEDIFF(R1002.L1, 20);
@@ -142,12 +142,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	rtcm->rtcmtypes.rtcm3_1003.header.station_id = (uint)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1003.header.tow = (time_t)ugrab(30);
 	rtcm->rtcmtypes.rtcm3_1003.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1003.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1003.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1003.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1003.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1003.header.interval = (unsigned short)ugrab(3);
 #define R1003 rtcm->rtcmtypes.rtcm3_1003.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1003.header.satcount; i++) {
-	    R1003.ident = (ushort)ugrab(6);
+	    R1003.ident = (unsigned short)ugrab(6);
 	    R1003.L1.indicator =
 		(unsigned char)ugrab(1);
 	    GPS_PSEUDORANGE(R1003.L1, 24);
@@ -169,12 +169,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	rtcm->rtcmtypes.rtcm3_1004.header.station_id = (uint)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1004.header.tow = (time_t)ugrab(30);
 	rtcm->rtcmtypes.rtcm3_1004.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1004.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1004.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1004.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1004.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1004.header.interval = (unsigned short)ugrab(3);
 #define R1004 rtcm->rtcmtypes.rtcm3_1004.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1004.header.satcount; i++) {
-	    R1004.ident = (ushort)ugrab(6);
+	    R1004.ident = (unsigned short)ugrab(6);
 	    R1004.L1.indicator = (bool)ugrab(1);
 	    GPS_PSEUDORANGE(R1004.L1, 24);
 	    RANGEDIFF(R1004.L1, 20);
@@ -248,12 +248,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	    (unsigned short)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1009.header.tow = (time_t)ugrab(27);
 	rtcm->rtcmtypes.rtcm3_1009.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1009.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1009.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1009.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1009.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1009.header.interval = (unsigned short)ugrab(3);
 #define R1009 rtcm->rtcmtypes.rtcm3_1009.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1009.header.satcount; i++) {
-	    R1009.ident = (ushort)ugrab(6);
+	    R1009.ident = (unsigned short)ugrab(6);
 	    R1009.L1.indicator = (bool)ugrab(1);
 	    R1009.L1.channel = (short)ugrab(5) - GLONASS_CHANNEL_BASE;
 	    R1009.L1.pseudorange = ugrab(25) * GLONASS_PSEUDORANGE_RESOLUTION;
@@ -268,12 +268,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	    (unsigned short)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1010.header.tow = (time_t)ugrab(27);
 	rtcm->rtcmtypes.rtcm3_1010.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1010.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1010.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1010.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1010.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1010.header.interval = (unsigned short)ugrab(3);
 #define R1010 rtcm->rtcmtypes.rtcm3_1010.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1010.header.satcount; i++) {
-	    R1010.ident = (ushort)ugrab(6);
+	    R1010.ident = (unsigned short)ugrab(6);
 	    R1010.L1.indicator = (bool)ugrab(1);
 	    R1010.L1.channel = (short)ugrab(5) - GLONASS_CHANNEL_BASE;
 	    R1010.L1.pseudorange = ugrab(25) * GLONASS_PSEUDORANGE_RESOLUTION;
@@ -290,12 +290,12 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	    (unsigned short)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1011.header.tow = (time_t)ugrab(27);
 	rtcm->rtcmtypes.rtcm3_1011.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1011.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1011.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1011.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1011.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1011.header.interval = (unsigned short)ugrab(3);
 #define R1011 rtcm->rtcmtypes.rtcm3_1011.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1011.header.satcount; i++) {
-	    R1011.ident = (ushort)ugrab(6);
+	    R1011.ident = (unsigned short)ugrab(6);
 	    R1011.L1.indicator = (bool)ugrab(1);
 	    R1011.L1.channel = (short)ugrab(5) - GLONASS_CHANNEL_BASE;
 	    R1011.L1.pseudorange = ugrab(25) * GLONASS_PSEUDORANGE_RESOLUTION;
@@ -319,13 +319,13 @@ void rtcm3_unpack( /*@out@*/ struct rtcm3_t *rtcm, char *buf)
 	    (unsigned short)ugrab(12);
 	rtcm->rtcmtypes.rtcm3_1012.header.tow = (time_t)ugrab(27);
 	rtcm->rtcmtypes.rtcm3_1012.header.sync = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1012.header.satcount = (ushort)ugrab(5);
+	rtcm->rtcmtypes.rtcm3_1012.header.satcount = (unsigned short)ugrab(5);
 	rtcm->rtcmtypes.rtcm3_1012.header.smoothing = (bool)ugrab(1);
-	rtcm->rtcmtypes.rtcm3_1012.header.interval = (ushort)ugrab(3);
+	rtcm->rtcmtypes.rtcm3_1012.header.interval = (unsigned short)ugrab(3);
 #define R1012 rtcm->rtcmtypes.rtcm3_1012.rtk_data[i]
 	for (i = 0; i < rtcm->rtcmtypes.rtcm3_1012.header.satcount; i++) {
 	    unsigned int rangeincr;
-	    R1012.ident = (ushort)ugrab(6);
+	    R1012.ident = (unsigned short)ugrab(6);
 	    R1012.L1.indicator = (bool)ugrab(1);
 	    R1012.L1.channel = (short)ugrab(5) - GLONASS_CHANNEL_BASE;
 	    R1012.L1.pseudorange = ugrab(25) * GLONASS_PSEUDORANGE_RESOLUTION;
diff --git a/monitor_italk.c b/monitor_italk.c
index 1bb79a76..0f93ffa2 100644
--- a/monitor_italk.c
+++ b/monitor_italk.c
@@ -83,24 +83,24 @@ static void display_itk_navfix(unsigned char *buf, size_t len)
 	return;
 
 #ifdef __UNUSED__
-    flags = (ushort) getleu16(buf, 7 + 4); */
-    cflags = (ushort) getleu16(buf, 7 + 6);
-    pflags = (ushort) getleu16(buf, 7 + 8);
+    flags = (unsigned short) getleu16(buf, 7 + 4); */
+    cflags = (unsigned short) getleu16(buf, 7 + 6);
+    pflags = (unsigned short) getleu16(buf, 7 + 8);
 #endif /* __UNUSED__ */
 
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
-    nsv = (ushort) MAX(getleu16(buf, 7 + 12), getleu16(buf, 7 + 14));
-    svlist = (ushort) getleu32(buf, 7 + 16) | getleu32(buf, 7 + 24);
-
-    hour = (ushort) getleu16(buf, 7 + 66);
-    min = (ushort) getleu16(buf, 7 + 68);
-    sec = (ushort) getleu16(buf, 7 + 70);
-    //nsec = (ushort) getleu32(buf, 7 + 72);
-    year = (ushort) getleu16(buf, 7 + 76);
-    mon = (ushort) getleu16(buf, 7 + 78);
-    day = (ushort) getleu16(buf, 7 + 80);
-    gps_week = (ushort) getles16(buf, 7 + 82);
-    tow = (ushort) getleu32(buf, 7 + 84);
+    nsv = (unsigned short) MAX(getleu16(buf, 7 + 12), getleu16(buf, 7 + 14));
+    svlist = (unsigned short) getleu32(buf, 7 + 16) | getleu32(buf, 7 + 24);
+
+    hour = (unsigned short) getleu16(buf, 7 + 66);
+    min = (unsigned short) getleu16(buf, 7 + 68);
+    sec = (unsigned short) getleu16(buf, 7 + 70);
+    //nsec = (unsigned short) getleu32(buf, 7 + 72);
+    year = (unsigned short) getleu16(buf, 7 + 76);
+    mon = (unsigned short) getleu16(buf, 7 + 78);
+    day = (unsigned short) getleu16(buf, 7 + 80);
+    gps_week = (unsigned short) getles16(buf, 7 + 82);
+    tow = (unsigned short) getleu32(buf, 7 + 84);
 
     epx = (double)(getles32(buf, 7 + 96) / 100.0);
     epy = (double)(getles32(buf, 7 + 100) / 100.0);