Skip to content

Commit

Permalink
A glut of whitespace fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
garyemiller committed Apr 30, 2015
1 parent 16981f2 commit 63e79d6
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Remco Treffkorn <[email protected]>
Derrick J. Brashear <[email protected]>
Russ Nelson <[email protected]>
Eric S. Raymond <[email protected]>
Gary E. Miller <[email protected]>
Gary E. Miller <[email protected]>
Jeff Francis <[email protected]>
Amaury Jacquot <[email protected]>
Chris Kuethe <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ this file is in the repository as:

www/hacking.html

If you only have www/hacking.html.in, run
If you only have www/hacking.html.in, run

scons www

Expand Down
4 changes: 2 additions & 2 deletions Qgpsmm.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ qt_config=lex yacc warn_on uic resources qt release incremental link_prl def_fil
Name: Qgpsmm
Description: GPS Daemon communication library - QT binding
Version: @VERSION@
Libs: -L${libdir} -lQgpsmm
Libs.private: -L/usr/lib -lQtNetwork -lQtCore -lpthread
Libs: -L${libdir} -lQgpsmm
Libs.private: -L/usr/lib -lQtNetwork -lQtCore -lpthread
Cflags: -I${includedir}
Requires: QtNetwork
18 changes: 9 additions & 9 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ into one package and autoconfiscated it.
Derrick J. Brashear <[email protected]> (KB3EGH) added code for the
EarthMate DeLorme. He also added "incredibly gross code to output
NMEA sentences" (his own words :-) He also did the first cut at
DGPS support (see http://www.wsrcc.com/wolfgang/gps/dgps-ip.html),
DGPS support (see http://www.wsrcc.com/wolfgang/gps/dgps-ip.html),
for the Earthmate.

Curt Mills <[email protected]> (WE7U) furthered the dgps support,
Expand All @@ -65,35 +65,35 @@ included:
* Documentation (what a concept!)
* Cleaned up, simplified command-line options.
* Now understands the GLL (Geographic position - Latitude, Longitude)
sentence from NMEA 3.0.
* Now parses both the NMEA 3.01 and pre-3.01 variants of the VTG sentence
sentence from NMEA 3.0.
* Now parses both the NMEA 3.01 and pre-3.01 variants of the VTG sentence
correctly.
* New commands including 'y', 'w', and 'x', since obsolesced by a
JSON-based protocol.
* Massive refactoring -- one main loop now calls a self-contained
driver object for each type.
* The GPS-bashing code the daemon uses can now be directly linked as a
library, libgpsd(3).
library, libgpsd(3).
* C and Python libraries are available to encapsulate the client side of
querying gpsd, see libgps(3).
* Cleaned-up error reporting, we don't use syslog when running in foreground
but send all error and status messages to the tty instead.
* Added -n option to do batch monitoring of GPSes.
* xgpsspeed is working again; xgps has been seriously reworked and improved.
* RPMs which include installation of gpsd to start up at boot time
* RPMs which include installation of gpsd to start up at boot time
are available.
* New gpsprobe program probes the capabilities of GPSes and generates
error scattergrams from fixes. (Later this moved to gpsprof.)
* Autobauding, self-configuration, and hotplugging. gpsd can now get
its device from a hotplug script, and figures out itself which baud
its device from a hotplug script, and figures out itself which baud
rate to use and what the GPS's device type is.
* Support for SiRF binary mode.
* Support for RTCM104 and AIVDM.
* Support for multiple devices.
* Other test tools -- gpsfake, gpscat, gpsmon.

Chris Kuethe <[email protected]> maintains the OpenBSD port, shipped
the 2.34 release, is our SiRF and low-level protocols expert, and does a
the 2.34 release, is our SiRF and low-level protocols expert, and does a
lot of general hacking and support. He has release authority.

Gary Miller <[email protected]> wrote the driver for Garmin binary protocol
Expand All @@ -106,7 +106,7 @@ Ville Nuorvala <[email protected]> wrote the NTRIP support.

We are delighted to acknowlege the assistance of Carl Carter, a field
application engineer at SiRF. He assisted us with the correction and
tuning of the SiRF binary-protocol driver, shedding a good deal of
tuning of the SiRF binary-protocol driver, shedding a good deal of
light on murky aspects of the chip's behavior.

We are also delighted to acknowlege the assistance of Timo Ylhainen, VP of
Expand All @@ -116,6 +116,6 @@ the iTalk protocol, helping to further development of iTalk support.
3.X CREDITS
===========

The main feature of the 3.x versions is a stabilized and finalized
The main feature of the 3.x versions is a stabilized and finalized
version of the JSON command/response protocol. This was designed and mainly
implemented by ESR. Gary Miller wrote the subframe support.
12 changes: 6 additions & 6 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is the gpsd to-do list. If you're viewing it with Emacs, try
doing Ctl-C Ctl-t and browsing through the outline headers. Ctl-C Ctl-a
doing Ctl-C Ctl-t and browsing through the outline headers. Ctl-C Ctl-a
will unfold them again.

For contribution guidelines and internals documentation, please see
Expand Down Expand Up @@ -74,7 +74,7 @@ revision (all we have is revision 3).

The support for unpacking RTCM3 sentences in the client library is
limited to 1001, 1002, 1007, 1008, 1009, 1010, 1014, and 1033. There
are some design issues with the baby JSON parser that are going to
are some design issues with the baby JSON parser that are going to
make extending this set difficult.

**** Reporting code for specialized Type 6 and 8 AIS messages is incomplete.
Expand Down Expand Up @@ -130,7 +130,7 @@ However, Iván Sánchez Ortega notes:
>I, for one, would like to see the secs/msecs problem solved before GPSD
>embarks on the enterprise of writing TAGblocks.

If someone is working on this, please see:
If someone is working on this, please see:
http://www.nmea.org/Assets/0183_errata_tag_block_final.pdf

**** Speed, mode and rate-changes in client-mode gpsctl.
Expand Down Expand Up @@ -183,9 +183,9 @@ The baud-rate switcher in the TNT driver needs to be tested.

gpsmon could support a number of TNT configuration commands, including
unit changes. See http://gpsd.googlecode.com/truenorth-reference.pdf
for possibilities.
for possibilities.

Jon Schlueter has one of these on a flock machine, so testing
Jon Schlueter has one of these on a flock machine, so testing
shouldn't be difficult.

*** Enable flocktest on the Debian server farm
Expand Down Expand Up @@ -224,7 +224,7 @@ some (but not all) of the things it tweaks in binary mode -- at the
moment, just the Navigation Parameters from message 0x13. With more
work, we should be able to do a full revert.

The TSIP driver changes its per-cycle sentence inventory and thus
The TSIP driver changes its per-cycle sentence inventory and thus
needs some state-restore logic. This can be done; the same packet 0x35
we use to configure it can be sent in a no-argument mode to query
the current sentence mix for later restore.
Expand Down
6 changes: 3 additions & 3 deletions build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ section.)

To clean the built files, call 'scons -c' . To clean scons' cache,
call 'scons sconsclean'. Doing both should return your working directory
to a near pristine state as far as building is concerned. Some user
created files may remain, and source code changes will not have been
to a near pristine state as far as building is concerned. Some user
created files may remain, and source code changes will not have been
reverted..

You can specify the installation prefix, as for an autotools build, by
Expand Down Expand Up @@ -296,7 +296,7 @@ with pps=no. You'll lose support for updating the clock from PPS
pulses.

dbus_export=no: for systems using DBUS: gpsd includes support for
shipping fixes as DBUS notifications, compiled in by default. This
shipping fixes as DBUS notifications, compiled in by default. This
may lead to complaint messages during testing on systems that don't
support DBUS. Build with the option "dbus_export=no" to disable it

Expand Down
6 changes: 3 additions & 3 deletions control.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Description: A monitoring daemon for GPSes, AIS radios, and other nav sensors.
expected to generate position information in a well-known format -- as
NMEA-0183 sentences, SiRF binary, Rockwell binary, Garmin binary
format, or other vendor binary protocols. gpsd takes this
information from the GPS and translates it into JSON objects in a uniform
and well-documented format that easier for clients to understand. The
distribution includes sample clients, application interface libraries,
information from the GPS and translates it into JSON objects in a uniform
and well-documented format that easier for clients to understand. The
distribution includes sample clients, application interface libraries,
and test/profiling tools.

XBS-Destinations: savannah, freecode, mailto:@ANNOUNCE@
Expand Down
12 changes: 6 additions & 6 deletions gpsd.h-tail
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#ifndef DEFAULT_GPSD_SOCKET
#define DEFAULT_GPSD_SOCKET "/var/run/gpsd.sock"
#endif
#endif

/* Some internal capabilities depend on which drivers we're compiling. */
#if !defined(AIVDM_ENABLE) && defined(NMEA2000_ENABLE)
Expand Down Expand Up @@ -320,7 +320,7 @@ typedef unsigned int driver_mask_t;
|| (dp)->rate_switcher != NULL))

/*
* True if a driver selection of it should be sticky.
* True if a driver selection of it should be sticky.
*/
#define STICKY(dp) ((dp) != NULL && ((dp)->flags & DRIVER_STICKY) != 0)

Expand Down Expand Up @@ -741,7 +741,7 @@ extern void json_rtcm2_dump(const struct rtcm2_t *,
extern void rtcm2_unpack(struct rtcm2_t *, char *);
extern void json_rtcm3_dump(const struct rtcm3_t *,
const char *, char[], size_t);
extern void rtcm3_unpack(const struct gps_context_t *,
extern void rtcm3_unpack(const struct gps_context_t *,
struct rtcm3_t *, char *);

/* here are the available GPS drivers */
Expand Down Expand Up @@ -888,7 +888,7 @@ int b64_ntop(unsigned char const *src, size_t srclength, char *target,
size_t targsize);

/* application interface */
extern void gps_context_init(struct gps_context_t *context,
extern void gps_context_init(struct gps_context_t *context,
const char *label);
extern void gpsd_init(struct gps_device_t *,
struct gps_context_t *,
Expand All @@ -906,7 +906,7 @@ extern void gpsd_deactivate(struct gps_device_t *);
#define AWAIT_FAILED -1
extern int gpsd_await_data(fd_set *,
fd_set *,
const int,
const int,
fd_set *,
struct gpsd_errout_t *errout);
extern gps_mask_t gpsd_poll(struct gps_device_t *);
Expand Down Expand Up @@ -947,7 +947,7 @@ extern void libgps_dump_state(struct gps_data_t *);

void gpsd_labeled_report(const int, const int,
const char *, const char *, va_list);
void gpsd_vlog(const struct gpsd_errout_t *,
void gpsd_vlog(const struct gpsd_errout_t *,
const int, char *, size_t, const char *, va_list ap);
PRINTF_FUNC(3, 4) void gpsd_log(const struct gpsd_errout_t *, const int, const char *, ...);

Expand Down
4 changes: 2 additions & 2 deletions gpsd.hotplug
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ fi
# the node, and the node is not created until after you kill the
# gpsd script, because the gpsd script waits forever for the node
# to appear.
#
#
# This is a race condition, and is best fixed by running the
# actual wait/hotplug portion in the background.

{
#logger -t gpsd.hotplug -p daemon.info "waiting for" $DEVNAME
while [ -x $DEVNAME ]
while [ -x $DEVNAME ]
do
sleep 1
done
Expand Down
4 changes: 2 additions & 2 deletions gpsd.usermap
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# This file is Copyright (c) 2010 by the GPSD project
# BSD terms apply: see the file COPYING in the distribution root for details.
#
# GPSes don't have their own USB device class. They're serial-over-USB
# GPSes don't have their own USB device class. They're serial-over-USB
# devices, so what you see is actually the ID of the serial-over-USB chip.
# Fortunately, just two of these account for over 80% of consumer-grade
# Fortunately, just two of these account for over 80% of consumer-grade
# GPS sensors. The gpsdplug script will tell a running gpsd that it should
# look at the device that just went active, because it might be a GPS.
#
Expand Down
4 changes: 2 additions & 2 deletions gpsinit
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ done
shift $((${OPTIND} - 1))

candevice=$1

case ${candevice} in
plx_pci)
# For the SJA1000 based PCI or PCI-Express CAN interface
Expand Down Expand Up @@ -74,7 +74,7 @@ slcan)
device=${2:-/dev/ttyUSB0};
modprobe slcan;
slcan_attach -f -s5 -o ${device};
slcand `basename ${device}`;
slcand `basename ${device}`;
ip link set slcan${net} up;;
beaglebone)
# For CAN interface on a BeagleBone
Expand Down
2 changes: 1 addition & 1 deletion maintainers.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= GPSD area maintainers =

This file points at responsible submaintainers for various portions
of the GPSD code, packaging, and ports.
of the GPSD code, packaging, and ports.

== Modules and drivers ==

Expand Down
4 changes: 2 additions & 2 deletions test_nmea2000
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ${GPSD_HOME}/gpsd -n -G -D0 -S ${GPSD_PORT} -P ${TMP_PID_FILE} nmea2000://${CAN_

sleep 1

${GPSD_HOME}/gpspipe -d -r -w -S -o ${TMP_OUT_FILE} :${GPSD_PORT}
${GPSD_HOME}/gpspipe -d -r -w -S -o ${TMP_OUT_FILE} :${GPSD_PORT}

sleep 1

Expand All @@ -114,4 +114,4 @@ else
fi

rm -f ${TMP_PID_FILE}
rm -f ${TMP_OUT_FILE}
rm -f ${TMP_OUT_FILE}

0 comments on commit 63e79d6

Please sign in to comment.