summaryrefslogtreecommitdiff
path: root/drivers.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2013-11-10 14:00:30 -0500
committerEric S. Raymond <esr@thyrsus.com>2013-11-10 14:00:30 -0500
commit2f72253be9a6de623b0b28d77f29998414558326 (patch)
treea3e8afd40ba112bd87fa03a84ad0b30dede9e04f /drivers.c
parent652bef980071328ad83a3a88fe78d6d47f6c7db4 (diff)
downloadgpsd-2f72253be9a6de623b0b28d77f29998414558326.tar.gz
Make interpretation of the split24 flag propperly per-subscriber.
This involved moving some out of the AIS driver. There is a related small change in behavior; now, if split24 is on, the Type B half of a matched pair will be shipped with type 'both'. All regression tests pass. PPS is live.
Diffstat (limited to 'drivers.c')
-rw-r--r--drivers.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers.c b/drivers.c
index 050a8602..a2e07bf9 100644
--- a/drivers.c
+++ b/drivers.c
@@ -1154,7 +1154,7 @@ const struct gps_type_t mtk3301 = {
static bool aivdm_decode(const char *buf, size_t buflen,
struct gps_device_t *session,
struct ais_t *ais,
- bool split24, int debug)
+ int debug)
{
#ifdef __UNUSED_DEBUG__
char *sixbits[64] = {
@@ -1325,7 +1325,7 @@ static bool aivdm_decode(const char *buf, size_t buflen,
ais,
ais_context->bits,
ais_context->bitlen,
- split24 ? NULL : &ais_context->type24_queue);
+ &ais_context->type24_queue);
}
/* we're still waiting on another sentence */
@@ -1340,7 +1340,6 @@ static gps_mask_t aivdm_analyze(struct gps_device_t *session)
if (aivdm_decode
((char *)session->packet.outbuffer, session->packet.outbuflen,
session, &session->gpsdata.ais,
- session->gpsdata.policy.split24,
session->context->debug)) {
return ONLINE_SET | AIS_SET;
} else