summaryrefslogtreecommitdiff
path: root/gpsd.h
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2005-06-28 13:40:05 +0000
committerEric S. Raymond <esr@thyrsus.com>2005-06-28 13:40:05 +0000
commite1151850476780e284ba91b02ab3290fde7aa432 (patch)
treeb5a0490f48eb733170b78ea997c906d429672512 /gpsd.h
parent0b20190e7489c762b5815780344a9b1c30a63343 (diff)
downloadgpsd-e1151850476780e284ba91b02ab3290fde7aa432.tar.gz
Eliminate use of FIONREAD.
This may fix the hang-during-backups bug. It may break the Garmin driver and DGPS handling; this will have to be tested.
Diffstat (limited to 'gpsd.h')
-rw-r--r--gpsd.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/gpsd.h b/gpsd.h
index 10187c0d..feb0db7d 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -51,7 +51,7 @@ struct gps_type_t {
/*@observer@*//*@null@*/char *trigger;
/*@null@*/bool (*probe)(struct gps_device_t *session);
/*@null@*/void (*initializer)(struct gps_device_t *session);
- /*@null@*/int (*get_packet)(struct gps_device_t *session, size_t waiting);
+ /*@null@*/ssize_t (*get_packet)(struct gps_device_t *session);
/*@null@*/gps_mask_t (*parse_packet)(struct gps_device_t *session);
/*@null@*/ssize_t (*rtcm_writer)(struct gps_device_t *session, char *rtcmbuf, size_t rtcmbytes);
/*@null@*/bool (*speed_switcher)(struct gps_device_t *session, speed_t speed);
@@ -86,7 +86,6 @@ struct gps_device_t {
int fixcnt; /* count of good fixes seen */
struct termios ttyset, ttyset_old;
/* packet-getter internals */
- int packet_full; /* do we presently see a full packet? */
int packet_type;
#define BAD_PACKET -1
#define NMEA_PACKET 0
@@ -167,7 +166,7 @@ extern gps_mask_t sirf_parse(struct gps_device_t *, unsigned char *, size_t);
extern void packet_reset(struct gps_device_t *session);
extern void packet_pushback(struct gps_device_t *session);
-extern int packet_get(struct gps_device_t *, size_t);
+extern ssize_t packet_get(struct gps_device_t *);
extern int packet_sniff(struct gps_device_t *);
extern int gpsd_open(struct gps_device_t *);