diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2008-06-27 19:27:22 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2008-06-27 19:27:22 +0000 |
| commit | 3b20652e914296dd9446fed1c058f9ceae273196 (patch) | |
| tree | 919c0f0c2f41d13b22c8f461b613ddec646b9b55 /gpsd.c | |
| parent | 98f2cc3afcbc4865ecc9dd22bf663d419995cebf (diff) | |
| download | gpsd-3b20652e914296dd9446fed1c058f9ceae273196.tar.gz | |
More preparation for RTCM 3. No behavior changes. All regression tests pass.
Diffstat (limited to 'gpsd.c')
| -rw-r--r-- | gpsd.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -555,10 +555,10 @@ static bool allocation_policy(struct gps_device_t *channel, /* we might have type constraints */ if (user->requires == ANY) return true; - else if (user->requires==RTCM104 && (channel->packet.type==RTCM_PACKET)) + else if (user->requires==RTCM104 && (channel->packet.type==RTCM2_PACKET)) return true; else if (user->requires == GPS - && (channel->packet.type!=RTCM_PACKET) && (channel->packet.type!=BAD_PACKET)) + && (channel->packet.type!=RTCM2_PACKET) && (channel->packet.type!=BAD_PACKET)) return true; else return false; @@ -810,7 +810,7 @@ static int handle_gpsd_request(struct subscriber_t* sub, char *buf, int buflen) (void)assign_channel(sub); if (sub->device==NULL||sub->device->packet.type==BAD_PACKET) (void)strlcpy(phrase, ",G=?", BUFSIZ); - else if (sub->device->packet.type == RTCM_PACKET) + else if (sub->device->packet.type == RTCM2_PACKET) (void)snprintf(phrase, sizeof(phrase), ",G=RTCM104"); else (void)snprintf(phrase, sizeof(phrase), ",G=GPS"); @@ -1623,7 +1623,7 @@ int main(int argc, char *argv[]) /* pass the current RTCM correction to the GPS if new */ if (channel->device_type) - rtcm_relay(channel); + rtcm2_relay(channel); /* get data from the device */ changed = 0; |