summaryrefslogtreecommitdiff
path: root/driver_ubx.c
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2018-10-03 16:44:45 -0700
committerGary E. Miller <gem@rellim.com>2018-10-03 16:44:45 -0700
commit22c269d9d9f2da1019c87a3cc98fdb44bd9221ed (patch)
treebade05201b15352409c055d454c3bfcf0c1eb594 /driver_ubx.c
parentf62490f863670239e88074d1fe31c5f6a5535701 (diff)
downloadgpsd-22c269d9d9f2da1019c87a3cc98fdb44bd9221ed.tar.gz
driver_ubx: Partial sort of parser messages. No functional change.
Diffstat (limited to 'driver_ubx.c')
-rw-r--r--driver_ubx.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/driver_ubx.c b/driver_ubx.c
index be88cc87..d2c2024a 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -708,6 +708,31 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
data_len = (size_t) getles16(buf, 4);
switch (msgid) {
+ case UBX_ACK_ACK:
+ gpsd_log(&session->context->errout, LOG_DATA,
+ "UBX_ACK_ACK, class: %02x, id: %02x\n",
+ buf[UBX_CLASS_OFFSET],
+ buf[UBX_TYPE_OFFSET]);
+ break;
+ case UBX_ACK_NAK:
+ gpsd_log(&session->context->errout, LOG_WARN,
+ "UBX_ACK_NAK, class: %02x, id: %02x\n",
+ buf[UBX_CLASS_OFFSET],
+ buf[UBX_TYPE_OFFSET]);
+ break;
+
+ case UBX_INF_DEBUG:
+ /* FALLTHROUGH */
+ case UBX_INF_ERROR:
+ /* FALLTHROUGH */
+ case UBX_INF_NOTICE:
+ /* FALLTHROUGH */
+ case UBX_INF_TEST:
+ /* FALLTHROUGH */
+ case UBX_INF_WARNING:
+ ubx_msg_inf(session, buf, data_len);
+ break;
+
case UBX_NAV_POSECEF:
gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_POSECEF\n");
mask = ubx_msg_nav_posecef(session, &buf[UBX_PREFIX_LEN], data_len);
@@ -830,18 +855,6 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
gpsd_log(&session->context->errout, LOG_DATA, "UBX_MON_USB\n");
break;
- case UBX_INF_DEBUG:
- /* FALLTHROUGH */
- case UBX_INF_TEST:
- /* FALLTHROUGH */
- case UBX_INF_NOTICE:
- /* FALLTHROUGH */
- case UBX_INF_WARNING:
- /* FALLTHROUGH */
- case UBX_INF_ERROR:
- ubx_msg_inf(session, buf, data_len);
- break;
-
case UBX_CFG_PRT:
if ( session->driver.ubx.port_id != (unsigned char)buf[UBX_MESSAGE_DATA_OFFSET + 0] ) {
session->driver.ubx.port_id = (unsigned char)buf[UBX_MESSAGE_DATA_OFFSET + 0];
@@ -872,19 +885,6 @@ gps_mask_t ubx_parse(struct gps_device_t * session, unsigned char *buf,
gpsd_log(&session->context->errout, LOG_DATA, "UBX_TIM_SVIN\n");
break;
- case UBX_ACK_NAK:
- gpsd_log(&session->context->errout, LOG_WARN,
- "UBX_ACK_NAK, class: %02x, id: %02x\n",
- buf[UBX_CLASS_OFFSET],
- buf[UBX_TYPE_OFFSET]);
- break;
- case UBX_ACK_ACK:
- gpsd_log(&session->context->errout, LOG_DATA,
- "UBX_ACK_ACK, class: %02x, id: %02x\n",
- buf[UBX_CLASS_OFFSET],
- buf[UBX_TYPE_OFFSET]);
- break;
-
default:
gpsd_log(&session->context->errout, LOG_WARN,
"UBX: unknown packet id 0x%04hx (length %zd)\n",