serial-dmm: Add RadioShack 22-168 support.

[libsigrok.git] / hardware / serial-dmm / api.c

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index ed94b89c582258113d38e406da187f778bfd628e..60e9212f3d5917c99e807a187a69bc7b1f1c8cce 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -54,6 +54,9 @@ SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
 SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
 SR_PRIV struct sr_dev_driver va_va18b_driver_info;
 SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
+SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
+SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
+SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
 
 static struct sr_dev_driver *di_dt4000zc = &digitek_dt4000zc_driver_info;
 static struct sr_dev_driver *di_tp4000zc = &tekpower_tp4000zc_driver_info;
@@ -62,6 +65,9 @@ static struct sr_dev_driver *di_3410 = &peaktech_3410_driver_info;
 static struct sr_dev_driver *di_mas345 = &mastech_mas345_driver_info;
 static struct sr_dev_driver *di_va18b = &va_va18b_driver_info;
 static struct sr_dev_driver *di_m3640d = &metex_m3640d_driver_info;
+static struct sr_dev_driver *di_4370 = &peaktech_4370_driver_info;
+static struct sr_dev_driver *di_pce_dm32 = &pce_pce_dm32_driver_info;
+static struct sr_dev_driver *di_22_168 = &radioshack_22_168_driver_info;
 
 /* After hw_init() this will point to a device-specific entry (see above). */
 static struct sr_dev_driver *di = NULL;
@@ -109,6 +115,24 @@ SR_PRIV struct dmm_info dmms[] = {
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL,
        },
+       {
+               "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200,
+               METEX14_PACKET_SIZE, sr_metex14_packet_request,
+               sr_metex14_packet_valid, sr_metex14_parse,
+               NULL,
+       },
+       {
+               "PCE", "PCE-DM32", "2400/8n1", 2400,
+               FS9721_PACKET_SIZE, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               dmm_details_pce_dm32,
+       },
+       {
+               "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,
+               METEX14_PACKET_SIZE, sr_metex14_packet_request,
+               sr_metex14_packet_valid, sr_metex14_parse,
+               NULL,
+       },
 };
 
 /* Properly close and free all devices. */
@@ -160,6 +184,12 @@ static int hw_init(int dmm)
                di = di_va18b;
        if (dmm == METEX_M3640D)
                di = di_m3640d;
+       if (dmm == PEAKTECH_4370)
+               di = di_4370;
+       if (dmm == PCE_PCE_DM32)
+               di = di_pce_dm32;
+       if (dmm == RADIOSHACK_22_168)
+               di = di_22_168;
        sr_dbg("Selected '%s' subdriver.", di->name);
 
        di->priv = drvc;
@@ -202,6 +232,21 @@ static int hw_init_metex_m3640d(void)
        return hw_init(METEX_M3640D);
 }
 
+static int hw_init_peaktech_4370(void)
+{
+       return hw_init(PEAKTECH_4370);
+}
+
+static int hw_init_pce_pce_dm32(void)
+{
+       return hw_init(PCE_PCE_DM32);
+}
+
+static int hw_init_radioshack_22_168(void)
+{
+       return hw_init(RADIOSHACK_22_168);
+}
+
 static GSList *scan(const char *conn, const char *serialcomm, int dmm)
 {
        struct sr_dev_inst *sdi;
@@ -323,6 +368,12 @@ static GSList *hw_scan(GSList *options)
                dmm = 5;
        if (!strcmp(di->name, "metex-m3640d"))
                dmm = 6;
+       if (!strcmp(di->name, "peaktech-4370"))
+               dmm = 7;
+       if (!strcmp(di->name, "pce-pce-dm32"))
+               dmm = 8;
+       if (!strcmp(di->name, "radioshack-22-168"))
+               dmm = 9;
 
        if (serialcomm) {
                /* Use the provided comm specs. */
@@ -492,6 +543,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                receive_data = va_va18b_receive_data;
        if (!strcmp(di->name, "metex-m3640d"))
                receive_data = metex_m3640d_receive_data;
+       if (!strcmp(di->name, "peaktech-4370"))
+               receive_data = peaktech_4370_receive_data;
+       if (!strcmp(di->name, "pce-pce-dm32"))
+               receive_data = pce_pce_dm32_receive_data;
+       if (!strcmp(di->name, "radioshack-22-168"))
+               receive_data = radioshack_22_168_receive_data;
 
        /* Poll every 50ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 50,
@@ -651,3 +708,57 @@ SR_PRIV struct sr_dev_driver metex_m3640d_driver_info = {
        .dev_acquisition_stop = hw_dev_acquisition_stop,
        .priv = NULL,
 };
+
+SR_PRIV struct sr_dev_driver peaktech_4370_driver_info = {
+       .name = "peaktech-4370",
+       .longname = "PeakTech 4370",
+       .api_version = 1,
+       .init = hw_init_peaktech_4370,
+       .cleanup = hw_cleanup,
+       .scan = hw_scan,
+       .dev_list = hw_dev_list,
+       .dev_clear = clear_instances,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
+       .info_get = hw_info_get,
+       .dev_config_set = hw_dev_config_set,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info = {
+       .name = "pce-pce-dm32",
+       .longname = "PCE PCE-DM32",
+       .api_version = 1,
+       .init = hw_init_pce_pce_dm32,
+       .cleanup = hw_cleanup,
+       .scan = hw_scan,
+       .dev_list = hw_dev_list,
+       .dev_clear = clear_instances,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
+       .info_get = hw_info_get,
+       .dev_config_set = hw_dev_config_set,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info = {
+       .name = "radioshack-22-168",
+       .longname = "RadioShack 22-168",
+       .api_version = 1,
+       .init = hw_init_radioshack_22_168,
+       .cleanup = hw_cleanup,
+       .scan = hw_scan,
+       .dev_list = hw_dev_list,
+       .dev_clear = clear_instances,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
+       .info_get = hw_info_get,
+       .dev_config_set = hw_dev_config_set,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .priv = NULL,
+};