radioshack-dmm: Fix opening of serial port.

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 5991bc71cde270955418348993be81f28d1fde56..0b92a488bfa43b43bd0cfc94b11e5582572b50b6 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -125,6 +125,12 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
+enum {
+       SERIAL_RDWR = 1,
+       SERIAL_RDONLY = 2,
+       SERIAL_NONBLOCK = 4,
+};
+
 typedef gboolean (*packet_valid_t)(const uint8_t *buf);
 
 SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags);
@@ -181,8 +187,7 @@ struct fs9721_info {
 SR_PRIV gboolean sr_fs9721_is_packet_start(uint8_t b);
 SR_PRIV gboolean sr_fs9721_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval,
-                           struct sr_datafeed_analog *analog,
-                           struct fs9721_info *info);
+                           struct sr_datafeed_analog *analog, void *info);
 
 /*--- hardware/common/dmm/metex14.c -----------------------------------------*/
 
@@ -192,12 +197,12 @@ struct metex14_info {
        gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature;
        gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad;
        gboolean is_hertz, is_ohm, is_celsius, is_nano, is_micro, is_milli;
-       gboolean is_kilo, is_mega;
+       gboolean is_kilo, is_mega, is_gain, is_decibel, is_hfe, is_unitless;
 };
 
+SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial);
 SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
-                            struct sr_datafeed_analog *analog,
-                            struct metex14_info *info);
+                            struct sr_datafeed_analog *analog, void *info);
 
 #endif