From 8162cad7e0727fc31d797afacfed4c23dd97aca0 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Tue, 14 Jan 2014 23:38:23 +0100 Subject: [PATCH] move function declarations to the appropriate header --- hardware/brymen-dmm/protocol.c | 4 ---- hardware/brymen-dmm/protocol.h | 3 +++ hardware/lascar-el-usb/api.c | 1 - hardware/lascar-el-usb/protocol.h | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hardware/brymen-dmm/protocol.c b/hardware/brymen-dmm/protocol.c index 230b60d3..4c33076a 100644 --- a/hardware/brymen-dmm/protocol.c +++ b/hardware/brymen-dmm/protocol.c @@ -19,10 +19,6 @@ #include "protocol.h" -/* parser.c */ -SR_PRIV int sr_brymen_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, void *info); - static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi) { float floatval; diff --git a/hardware/brymen-dmm/protocol.h b/hardware/brymen-dmm/protocol.h index e6d2e560..1270ecb6 100644 --- a/hardware/brymen-dmm/protocol.h +++ b/hardware/brymen-dmm/protocol.h @@ -76,6 +76,9 @@ SR_PRIV int brymen_packet_request(struct sr_serial_dev_inst *serial); SR_PRIV int brymen_packet_length(const uint8_t *buf, int *len); SR_PRIV gboolean brymen_packet_is_valid(const uint8_t *buf); +SR_PRIV int sr_brymen_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); + SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial, uint8_t *buf, size_t *buflen, packet_length_t get_packet_size, diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c index 74fd1e71..bf5654cb 100644 --- a/hardware/lascar-el-usb/api.c +++ b/hardware/lascar-el-usb/api.c @@ -23,7 +23,6 @@ #include "libsigrok-internal.h" #include "protocol.h" -SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address); SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; static struct sr_dev_driver *di = &lascar_el_usb_driver_info; diff --git a/hardware/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h index 4386ef4b..a94bd8a5 100644 --- a/hardware/lascar-el-usb/protocol.h +++ b/hardware/lascar-el-usb/protocol.h @@ -69,6 +69,7 @@ struct elusb_profile { SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl, unsigned char *configblock, int *configlen); +SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address); SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data); SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer); SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi);