diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 05:31:35 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 05:31:35 -0400 |
| commit | 643b49ada1691215bc974be55dc01657e648c9ca (patch) | |
| tree | 47ffd6ccf3c3c279ca460dd1936b96e9fcdb1b68 | |
| parent | 720c77615731fbecfce63c727c35762ab7336cad (diff) | |
| download | gpsd-643b49ada1691215bc974be55dc01657e648c9ca.tar.gz | |
Minor refactoring step in the UBX driver.
A move towards eliminating reverse linkage.
| -rw-r--r-- | driver_ubx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/driver_ubx.c b/driver_ubx.c index cab2765e..ac8c5116 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -67,7 +67,7 @@ static gps_mask_t ubx_msg_nav_timegps(struct gps_device_t *session, static gps_mask_t ubx_msg_nav_svinfo(struct gps_device_t *session, unsigned char *buf, size_t data_len); static void ubx_msg_sbas(struct gps_device_t *session, unsigned char *buf); -static void ubx_msg_inf(unsigned char *buf, size_t data_len, const int debug); +static void ubx_msg_inf(struct gps_device_t *session, unsigned char *buf, size_t data_len); #ifdef RECONFIGURE_ENABLE static void ubx_mode(struct gps_device_t *session, int mode); #endif /* RECONFIGURE_ENABLE */ @@ -332,7 +332,7 @@ static gps_mask_t ubx_msg_sfrb(struct gps_device_t *session, unsigned char *buf) return gpsd_interpret_subframe(session, svid, words); } -static void ubx_msg_inf(unsigned char *buf, size_t data_len, const int debug) +static void ubx_msg_inf(struct gps_device_t *session, unsigned char *buf, size_t data_len) { unsigned short msgid; static char txtbuf[MAX_PACKET_LENGTH]; @@ -345,19 +345,19 @@ static void ubx_msg_inf(unsigned char *buf, size_t data_len, const int debug) txtbuf[data_len] = '\0'; switch (msgid) { case UBX_INF_DEBUG: - gpsd_report(debug, LOG_PROG, "UBX_INF_DEBUG: %s\n", txtbuf); + gpsd_report(session->context->debug, LOG_PROG, "UBX_INF_DEBUG: %s\n", txtbuf); break; case UBX_INF_TEST: - gpsd_report(debug, LOG_PROG, "UBX_INF_TEST: %s\n", txtbuf); + gpsd_report(session->context->debug, LOG_PROG, "UBX_INF_TEST: %s\n", txtbuf); break; case UBX_INF_NOTICE: - gpsd_report(debug, LOG_INF, "UBX_INF_NOTICE: %s\n", txtbuf); + gpsd_report(session->context->debug, LOG_INF, "UBX_INF_NOTICE: %s\n", txtbuf); break; case UBX_INF_WARNING: - gpsd_report(debug, LOG_WARN, "UBX_INF_WARNING: %s\n", txtbuf); + gpsd_report(session->context->debug, LOG_WARN, "UBX_INF_WARNING: %s\n", txtbuf); break; case UBX_INF_ERROR: - gpsd_report(debug, LOG_WARN, "UBX_INF_ERROR: %s\n", txtbuf); + gpsd_report(session->context->debug, LOG_WARN, "UBX_INF_ERROR: %s\n", txtbuf); break; default: break; @@ -498,7 +498,7 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf, case UBX_INF_WARNING: /* FALLTHROUGH */ case UBX_INF_ERROR: - ubx_msg_inf(buf, data_len, session->context->debug); + ubx_msg_inf(session, buf, data_len); break; case UBX_CFG_PRT: |