X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=e608c85c14897e0b56d2e49740a307879015e4a3;hb=32be5b22462fa271c8837694d7f242a0bda2f2f7;hp=aff12c27527160014d74f3598c44a7b03b406a41;hpb=ae3a59de62e5912d68d8738a78a4403146cbfda5;p=libsigrok.git diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h index aff12c27..e608c85c 100644 --- a/hardware/serial-dmm/protocol.h +++ b/hardware/serial-dmm/protocol.h @@ -20,14 +20,14 @@ #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "serial-dmm: " -#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) -#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) -#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) -#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) -#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) -#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "serial-dmm: " +#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) +#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) +#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) +#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) +#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) /* Note: When adding entries here, don't forget to update DMM_COUNT. */ enum { @@ -43,13 +43,16 @@ enum { RADIOSHACK_22_168, RADIOSHACK_22_805, RADIOSHACK_22_812, + TECPEL_DMM_8060_SER, + TECPEL_DMM_8061_SER, + VOLTCRAFT_M3650D, VOLTCRAFT_VC820_SER, VOLTCRAFT_VC840_SER, UNI_T_UT61D_SER, UNI_T_UT61E_SER, }; -#define DMM_COUNT 16 +#define DMM_COUNT 19 struct dmm_info { char *vendor; @@ -103,6 +106,9 @@ 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_805(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_TECPEL_DMM_8060_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data); SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);