diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-04-16 12:19:00 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-04-16 12:19:00 -0400 |
| commit | e2e31856f98542d79d37111e1a8b6d8d173b2f81 (patch) | |
| tree | 99e73864f9afc54f2d9cfb569b92455b55c09210 | |
| parent | a6bb633bc1f446f97834f7678f3d78739a8bbc5b (diff) | |
| download | gpsd-e2e31856f98542d79d37111e1a8b6d8d173b2f81.tar.gz | |
Doc update and reindent.
All regression tests pass. Codebase splints and cppchecks clean.
| -rw-r--r-- | driver_sirf.c | 12 | ||||
| -rw-r--r-- | driver_ubx.c | 2 | ||||
| -rw-r--r-- | libgpsd_core.c | 5 | ||||
| -rw-r--r-- | www/hacking.html | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/driver_sirf.c b/driver_sirf.c index 3769477f..a93fcbfa 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -472,11 +472,11 @@ static gps_mask_t sirf_msg_navdata(struct gps_device_t *session, if (invert) { words[i] ^= 0x3fffffC0; } - parity = isgps_parity( words[i] ) ; - if ( parity != (words[i] & 0x3F) ) { + parity = isgps_parity(words[i]); + if (parity != (words[i] & 0x3F)) { gpsd_report(LOG_PROG, - "SiRF: 50BPS parity fail words[%d] 0x%x != 0x%x\n", i, - parity, ( words[i] & 0x1)); + "SiRF: 50BPS parity fail words[%d] 0x%x != 0x%x\n", i, + parity, (words[i] & 0x1)); return 0; } words[i] = (words[i] & 0x3fffffff) >> 6; @@ -488,8 +488,8 @@ static gps_mask_t sirf_msg_navdata(struct gps_device_t *session, words[5], words[6], words[7], words[8], words[9]); // Look for the preamble in the first byte OR its complement if (preamble != 0x74) { - gpsd_report(LOG_WARN, "SiRF: 50BPS bad premable: 0x%x header 0x%x\n" - , preamble, words[0]); + gpsd_report(LOG_WARN, "SiRF: 50BPS bad premable: 0x%x header 0x%x\n", + preamble, words[0]); return 0; } diff --git a/driver_ubx.c b/driver_ubx.c index ffd7f61c..ebbdcc1b 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -281,7 +281,7 @@ static void ubx_msg_sfrb(struct gps_device_t *session, unsigned char *buf) gpsd_report(LOG_PROG, "UBX_RXM_SFRB: %u %u\n", chan, svid); /* UBX does all the parity checking, but still bad data gets through */ words[0] = (unsigned int)getleul(buf, 2) & 0xffffff; - preamble = (words[0] >> 16) & 0xff; + preamble = (words[0] >> 16) & 0xff; if ((preamble != 0x74) && (preamble != 0x8b)) return; words[1] = (unsigned int)getleul(buf, 6) & 0xffffff; diff --git a/libgpsd_core.c b/libgpsd_core.c index 6ae828f0..1700b7b5 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -672,10 +672,11 @@ gps_mask_t gpsd_poll(struct gps_device_t *session) /* track the packet count since achieving sync on the device */ if (first_sync) { /*@-nullderef@*/ - gpsd_report(LOG_INF, "%s identified as type %s (%f sec @ %dbps)\n", + gpsd_report(LOG_INF, + "%s identified as type %s (%f sec @ %dbps)\n", session->gpsdata.dev.path, session->device_type->type_name, - timestamp()- session->opentime, + timestamp() - session->opentime, gpsd_get_speed(&session->ttyset)); /*@+nullderef@*/ /* fire the identified hook */ diff --git a/www/hacking.html b/www/hacking.html index cebf116c..e45f6d87 100644 --- a/www/hacking.html +++ b/www/hacking.html @@ -1365,7 +1365,7 @@ the following order:</p> href="http://developer.berlios.de/bugs/?group_id=2116">Berlios bug tracker</a> for release blockers.</dt> <dd></dd> -<dt>2. Run the stable regression tests and other checks</dt> +<dt>2. Run the regression tests and other checks</dt> <dd>If it doesn't pass regressions, it isn't ready to ship. This is the time to run valgrind-audit, 'make splint', and 'make cppcheck' as well and check that those reports are clean. Use flocktest to |