rs9lcd: Fix segfault with unusual modes.

[libsigrok.git] / hardware / serial-dmm / protocol.h

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index b3d9e1aa4fac0f7a65ed735582a26edb7e88266a..d03a391b3ead26c20da27642897cd8ef0c28a87d 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -42,9 +42,11 @@ enum {
        PCE_PCE_DM32,
        RADIOSHACK_22_168,
        RADIOSHACK_22_812,
+       VOLTCRAFT_VC820,
+       VOLTCRAFT_VC840,
 };
 
-#define DMM_COUNT 11
+#define DMM_COUNT 13
 
 struct dmm_info {
        char *vendor;
@@ -57,9 +59,11 @@ struct dmm_info {
        int (*packet_parse)(const uint8_t *, float *,
                            struct sr_datafeed_analog *, void *);
        void (*dmm_details)(struct sr_datafeed_analog *, void *);
+       struct sr_dev_driver *di;
+       int (*receive_data)(int, int, void *);
 };
 
-SR_PRIV struct dmm_info dmms[DMM_COUNT];
+extern SR_PRIV struct dmm_info dmms[DMM_COUNT];
 
 #define DMM_BUFSIZE 256
 
@@ -81,17 +85,19 @@ struct dev_context {
        int buflen;
 };
 
-SR_PRIV int digitek_dt4000zc_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int tekpower_tp4000zc_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int metex_me31_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int peaktech_3410_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int mastech_mas345_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int va_va18b_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int metex_m3640d_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int peaktech_4370_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int pce_pce_dm32_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int radioshack_22_168_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int radioshack_22_812_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_DIGITEK_DT4000ZC(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TEKPOWER_TP4000ZC(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_METEX_ME31(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PEAKTECH_3410(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_MASTECH_MAS345(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VA_VA18B(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_METEX_M3640D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
 
 SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info);