[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gpsd-dev] [PATCH 1/8] Shift function definitions in gps_json.h that use
From: |
Rob Norris |
Subject: |
[gpsd-dev] [PATCH 1/8] Shift function definitions in gps_json.h that use gps_device_t to gpsd.h |
Date: |
Tue, 19 Apr 2016 21:01:38 +0100 |
gps_device_t is private to gpsd.h and these functions are implemented in gpsd.c
This helps towards making libgps independent of gpsd.h
TESTED:
'scons build-all check' passes
---
gps_json.h | 8 +-------
gpsd.h-tail | 8 ++++++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gps_json.h b/gps_json.h
index 1d4cf58..da9c2b2 100644
--- a/gps_json.h
+++ b/gps_json.h
@@ -13,19 +13,13 @@
#ifdef __cplusplus
extern "C" {
#endif
-void json_data_report(const gps_mask_t,
- const struct gps_device_t *,
- const struct policy_t *,
- char *, size_t);
+
char *json_stringify(char *, size_t, const char *);
-void json_tpv_dump(const struct gps_device_t *,
- const struct policy_t *, char *, size_t);
void json_noise_dump(const struct gps_data_t *, char *, size_t);
void json_sky_dump(const struct gps_data_t *, char *, size_t);
void json_att_dump(const struct gps_data_t *, char *, size_t);
void json_oscillator_dump(const struct gps_data_t *, char *, size_t);
void json_subframe_dump(const struct gps_data_t *, char buf[], size_t);
-void json_device_dump(const struct gps_device_t *, char *, size_t);
void json_watch_dump(const struct policy_t *, char *, size_t);
int json_watch_read(const char *, struct policy_t *,
const char **);
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 4a15d34..eb32eb2 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -853,6 +853,14 @@ extern void nmea_subframe_dump(struct gps_device_t *,
char[], size_t);
extern void nmea_ais_dump(struct gps_device_t *, char[], size_t);
extern unsigned int ais_binary_encode(struct ais_t *ais, unsigned char *bits,
int flag);
+extern void json_data_report(const gps_mask_t,
+ const struct gps_device_t *,
+ const struct policy_t *,
+ char *, size_t);
+extern void json_tpv_dump(const struct gps_device_t *,
+ const struct policy_t *, char *, size_t);
+extern void json_device_dump(const struct gps_device_t *, char *, size_t);
+
#ifdef NTP_ENABLE
extern void ntp_latch(struct gps_device_t *device, struct timedelta_t *td);
#ifdef NTPSHM_ENABLE
--
2.8.0.rc3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gpsd-dev] [PATCH 1/8] Shift function definitions in gps_json.h that use gps_device_t to gpsd.h,
Rob Norris <=