summaryrefslogtreecommitdiff
path: root/gpsd.h
diff options
context:
space:
mode:
Diffstat (limited to 'gpsd.h')
-rw-r--r--gpsd.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/gpsd.h b/gpsd.h
index c77d1f57..ea4e8e3b 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -36,7 +36,7 @@ enum isgpsstat_t {
};
#define PREAMBLE_PATTERN 0x66
-#define RTCM_ERRLEVEL_BASE 5
+#define ISGPS_ERRLEVEL_BASE 5
#define NTPSHMSEGS 4 /* number of NTP SHM segments */
@@ -267,17 +267,18 @@ extern /*@ observer @*/ char *gpsd_hexdump(const void *, size_t);
extern int netlib_connectsock(const char *, const char *, const char *);
extern int ntpshm_init(struct gps_context_t *, bool);
-extern int ntpshm_alloc(struct gps_context_t *context);
-extern bool ntpshm_free(struct gps_context_t *context, int segment);
+extern int ntpshm_alloc(struct gps_context_t *);
+extern bool ntpshm_free(struct gps_context_t *, int);
extern int ntpshm_put(struct gps_device_t *, double);
extern int ntpshm_pps(struct gps_device_t *,struct timeval *);
extern void isgps_init(/*@out@*/struct gps_device_t *);
-enum isgpsstat_t isgps_decode(struct gps_device_t *session,
+enum isgpsstat_t isgps_decode(struct gps_device_t *,
bool (*preamble_match)(isgps30bits_t *),
bool (*length_check)(struct gps_device_t *),
- unsigned int c);
-extern unsigned int isgps_parity(isgps30bits_t th);
+ size_t,
+ unsigned int);
+extern unsigned int isgps_parity(isgps30bits_t);
extern enum isgpsstat_t rtcm_decode(struct gps_device_t *, unsigned int);
extern void rtcm_dump(struct gps_device_t *, /*@out@*/char[], size_t);
@@ -294,13 +295,12 @@ extern gps_mask_t dop(struct gps_data_t *);
extern void hexdump(size_t, unsigned char *, unsigned char *);
extern unsigned char sr_sum(unsigned int, unsigned int, unsigned char *);
extern int bin2srec(unsigned int, unsigned int, unsigned int, unsigned char *, unsigned char *);
-extern int srec_hdr(unsigned int num, unsigned char *bbuf, unsigned char *sbuf);
+extern int srec_hdr(unsigned int, unsigned char *, unsigned char *);
extern int srec_fin(unsigned int, unsigned char *);
extern unsigned char hc(unsigned char);
/* External interface */
-extern void gpsd_init(struct gps_device_t *,
- struct gps_context_t *, char *device);
+extern void gpsd_init(struct gps_device_t *, struct gps_context_t *, char *);
extern int gpsd_activate(struct gps_device_t *);
extern void gpsd_deactivate(struct gps_device_t *);
extern gps_mask_t gpsd_poll(struct gps_device_t *);
@@ -313,7 +313,7 @@ void gpsd_report(int, const char *, ...);
extern bool finite(double);
extern int cfmakeraw(struct termios *);
extern struct protoent *getprotobyname(const char *);
-extern /*@observer@*/char *strptime(const char *,const char *,/*@out@*/struct tm *tp)/*@modifies tp@*/;
+extern /*@observer@*/char *strptime(const char *,const char *tp,/*@out@*/struct tm *)/*@modifies tp@*/;
extern struct tm *gmtime_r(const time_t *,/*@out@*/struct tm *tp)/*@modifies tp@*/;
extern struct tm *localtime_r(const time_t *,/*@out@*/struct tm *tp)/*@modifies tp@*/;
extern float roundf(float x);