diff options
| -rw-r--r-- | gps.h | 62 | ||||
| -rw-r--r-- | gpsd.h-tail | 62 | ||||
| -rw-r--r-- | maskaudit.py.in | 2 |
3 files changed, 63 insertions, 63 deletions
@@ -1324,37 +1324,37 @@ typedef int socket_t; struct gps_data_t { gps_mask_t set; /* has field been set since this was last cleared? */ -#define ONLINE_SET (1u<<1) -#define TIME_SET (1u<<2) -#define TIMERR_SET (1u<<3) -#define LATLON_SET (1u<<4) -#define ALTITUDE_SET (1u<<5) -#define SPEED_SET (1u<<6) -#define TRACK_SET (1u<<7) -#define CLIMB_SET (1u<<8) -#define STATUS_SET (1u<<9) -#define MODE_SET (1u<<10) -#define DOP_SET (1u<<11) -#define HERR_SET (1u<<12) -#define VERR_SET (1u<<13) -#define ATTITUDE_SET (1u<<14) -#define SATELLITE_SET (1u<<15) -#define SPEEDERR_SET (1u<<16) -#define TRACKERR_SET (1u<<17) -#define CLIMBERR_SET (1u<<18) -#define DEVICE_SET (1u<<19) -#define DEVICELIST_SET (1u<<20) -#define DEVICEID_SET (1u<<21) -#define RTCM2_SET (1u<<22) -#define RTCM3_SET (1u<<23) -#define AIS_SET (1u<<24) -#define PACKET_SET (1u<<25) -#define SUBFRAME_SET (1u<<26) -#define GST_SET (1u<<27) -#define VERSION_SET (1u<<28) -#define POLICY_SET (1u<<29) -#define LOGMESSAGE_SET (1u<<30) -#define ERROR_SET (1u<<31) +#define ONLINE_SET (1llu<<1) +#define TIME_SET (1llu<<2) +#define TIMERR_SET (1llu<<3) +#define LATLON_SET (1llu<<4) +#define ALTITUDE_SET (1llu<<5) +#define SPEED_SET (1llu<<6) +#define TRACK_SET (1llu<<7) +#define CLIMB_SET (1llu<<8) +#define STATUS_SET (1llu<<9) +#define MODE_SET (1llu<<10) +#define DOP_SET (1llu<<11) +#define HERR_SET (1llu<<12) +#define VERR_SET (1llu<<13) +#define ATTITUDE_SET (1llu<<14) +#define SATELLITE_SET (1llu<<15) +#define SPEEDERR_SET (1llu<<16) +#define TRACKERR_SET (1llu<<17) +#define CLIMBERR_SET (1llu<<18) +#define DEVICE_SET (1llu<<19) +#define DEVICELIST_SET (1llu<<20) +#define DEVICEID_SET (1llu<<21) +#define RTCM2_SET (1llu<<22) +#define RTCM3_SET (1llu<<23) +#define AIS_SET (1llu<<24) +#define PACKET_SET (1llu<<25) +#define SUBFRAME_SET (1llu<<26) +#define GST_SET (1llu<<27) +#define VERSION_SET (1llu<<28) +#define POLICY_SET (1llu<<29) +#define LOGMESSAGE_SET (1llu<<30) +#define ERROR_SET (1llu<<31) timestamp_t online; /* NZ if GPS is on line, 0 if not. * * Note: gpsd clears this time when sentences diff --git a/gpsd.h-tail b/gpsd.h-tail index 3e2d18ec..6ece588f 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -233,37 +233,37 @@ typedef enum { event_reactivate, } event_t; -#define ONLINE_IS ((gps_mask_t)(1u<<1)) -#define TIME_IS ((gps_mask_t)(1u<<2)) -#define TIMERR_IS ((gps_mask_t)(1u<<3)) -#define LATLON_IS ((gps_mask_t)(1u<<4)) -#define ALTITUDE_IS ((gps_mask_t)(1u<<5)) -#define SPEED_IS ((gps_mask_t)(1u<<6)) -#define TRACK_IS ((gps_mask_t)(1u<<7)) -#define CLIMB_IS ((gps_mask_t)(1u<<8)) -#define STATUS_IS ((gps_mask_t)(1u<<9)) -#define MODE_IS ((gps_mask_t)(1u<<10)) -#define DOP_IS ((gps_mask_t)(1u<<11)) -#define HERR_IS ((gps_mask_t)(1u<<12)) -#define VERR_IS ((gps_mask_t)(1u<<13)) -#define PERR_IS ((gps_mask_t)(1u<<14)) -#define SATELLITE_IS ((gps_mask_t)(1u<<15)) -#define RAW_IS ((gps_mask_t)(1u<<16)) -#define USED_IS ((gps_mask_t)(1u<<17)) -#define SPEEDERR_IS ((gps_mask_t)(1u<<18)) -#define DRIVER_IS ((gps_mask_t)(1u<<19)) -#define DEVICEID_IS ((gps_mask_t)(1u<<20)) -#define ERROR_IS ((gps_mask_t)(1u<<21)) -#define RTCM2_IS ((gps_mask_t)(1u<<22)) -#define RTCM3_IS ((gps_mask_t)(1u<<23)) -#define AIS_IS ((gps_mask_t)(1u<<24)) -#define ATT_IS ((gps_mask_t)(1u<<25)) -#define SUBFRAME_IS ((gps_mask_t)(1u<<26)) -#define PACKET_IS ((gps_mask_t)(1u<<27)) -#define CLEAR_IS ((gps_mask_t)(1u<<28)) /* starts a reporting cycle */ -#define REPORT_IS ((gps_mask_t)(1u<<29)) /* ends a reporting cycle */ -#define NOISE_IS ((gps_mask_t)(1u<<30)) -#define NODATA_IS ((gps_mask_t)(1u<<31)) /* no data read from fd */ +#define ONLINE_IS ((gps_mask_t)(1llu<<1)) +#define TIME_IS ((gps_mask_t)(1llu<<2)) +#define TIMERR_IS ((gps_mask_t)(1llu<<3)) +#define LATLON_IS ((gps_mask_t)(1llu<<4)) +#define ALTITUDE_IS ((gps_mask_t)(1llu<<5)) +#define SPEED_IS ((gps_mask_t)(1llu<<6)) +#define TRACK_IS ((gps_mask_t)(1llu<<7)) +#define CLIMB_IS ((gps_mask_t)(1llu<<8)) +#define STATUS_IS ((gps_mask_t)(1llu<<9)) +#define MODE_IS ((gps_mask_t)(1llu<<10)) +#define DOP_IS ((gps_mask_t)(1llu<<11)) +#define HERR_IS ((gps_mask_t)(1llu<<12)) +#define VERR_IS ((gps_mask_t)(1llu<<13)) +#define PERR_IS ((gps_mask_t)(1llu<<14)) +#define SATELLITE_IS ((gps_mask_t)(1llu<<15)) +#define RAW_IS ((gps_mask_t)(1llu<<16)) +#define USED_IS ((gps_mask_t)(1llu<<17)) +#define SPEEDERR_IS ((gps_mask_t)(1llu<<18)) +#define DRIVER_IS ((gps_mask_t)(1llu<<19)) +#define DEVICEID_IS ((gps_mask_t)(1llu<<20)) +#define ERROR_IS ((gps_mask_t)(1llu<<21)) +#define RTCM2_IS ((gps_mask_t)(1llu<<22)) +#define RTCM3_IS ((gps_mask_t)(1llu<<23)) +#define AIS_IS ((gps_mask_t)(1llu<<24)) +#define ATT_IS ((gps_mask_t)(1llu<<25)) +#define SUBFRAME_IS ((gps_mask_t)(1llu<<26)) +#define PACKET_IS ((gps_mask_t)(1llu<<27)) +#define CLEAR_IS ((gps_mask_t)(1llu<<28)) /* starts a reporting cycle */ +#define REPORT_IS ((gps_mask_t)(1llu<<29)) /* ends a reporting cycle */ +#define NOISE_IS ((gps_mask_t)(1llu<<30)) +#define NODATA_IS ((gps_mask_t)(1llu<<31)) /* no data read from fd */ #define DATA_IS ~(ONLINE_IS|PACKET_IS|CLEAR_IS|REPORT_IS) typedef /*@unsignedintegraltype@*/ unsigned int driver_mask_t; diff --git a/maskaudit.py.in b/maskaudit.py.in index 93d52754..1360413e 100644 --- a/maskaudit.py.in +++ b/maskaudit.py.in @@ -25,7 +25,7 @@ class SourceExtractor: if line.startswith("#define") and self.suffix in line: fields = line.split() self.masks.append((fields[1], fields[2])) - if fields[2].startswith("(1u<<") or fields[2].startswith("((gps_mask_t)"): + if fields[2].startswith("(1llu<<") or fields[2].startswith("((gps_mask_t)"): self.primitive_masks.append((fields[1], fields[2])) def in_library(self, flag): |