X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=23cb9b356363cc2a504159e4f426965447e9bdcb;hb=ca4b130943e266f545ae8ba89528f285831540cd;hp=52d5a8848a7b80cdcfcfc2a85b1fd0ccd881013b;hpb=f1437c6814c693bd624211c5b644951cf16139f2;p=libsigrok.git diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index 52d5a884..23cb9b35 100644 --- a/hardware/serial-dmm/api.c +++ b/hardware/serial-dmm/api.c @@ -68,77 +68,77 @@ SR_PRIV struct dmm_info dmms[] = { FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, dmm_details_dt4000zc, - &digitek_dt4000zc_driver_info, digitek_dt4000zc_receive_data, + &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC, }, { "TekPower", "TP4000ZC", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, dmm_details_tp4000zc, - &tekpower_tp4000zc_driver_info, tekpower_tp4000zc_receive_data, + &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_TP4000ZC, }, { "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600, METEX14_PACKET_SIZE, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL, - &metex_me31_driver_info, metex_me31_receive_data, + &metex_me31_driver_info, receive_data_METEX_ME31, }, { "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600, METEX14_PACKET_SIZE, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL, - &peaktech_3410_driver_info, peaktech_3410_receive_data, + &peaktech_3410_driver_info, receive_data_PEAKTECH_3410, }, { "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, METEX14_PACKET_SIZE, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL, - &mastech_mas345_driver_info, mastech_mas345_receive_data, + &mastech_mas345_driver_info, receive_data_MASTECH_MAS345, }, { "V&A", "VA18B", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, dmm_details_va18b, - &va_va18b_driver_info, va_va18b_receive_data, + &va_va18b_driver_info, receive_data_VA_VA18B, }, { "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200, METEX14_PACKET_SIZE, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL, - &metex_m3640d_driver_info, metex_m3640d_receive_data, + &metex_m3640d_driver_info, receive_data_METEX_M3640D, }, { "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200, METEX14_PACKET_SIZE, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL, - &peaktech_4370_driver_info, peaktech_4370_receive_data, + &peaktech_4370_driver_info, receive_data_PEAKTECH_4370, }, { "PCE", "PCE-DM32", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, dmm_details_pce_dm32, - &pce_pce_dm32_driver_info, pce_pce_dm32_receive_data, + &pce_pce_dm32_driver_info, receive_data_PCE_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, - &radioshack_22_168_driver_info, radioshack_22_168_receive_data, + &radioshack_22_168_driver_info, receive_data_RADIOSHACK_22_168, }, { "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, RS9LCD_PACKET_SIZE, NULL, sr_rs9lcd_packet_valid, sr_rs9lcd_parse, NULL, - &radioshack_22_812_driver_info, radioshack_22_812_receive_data, + &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812, }, }; @@ -292,12 +292,11 @@ scan_cleanup: return devices; } -static GSList *hw_scan(GSList *options) +static GSList *hw_scan(GSList *options, int dmm) { struct sr_hwopt *opt; GSList *l, *devices; const char *conn, *serialcomm; - int dmm; conn = serialcomm = NULL; for (l = options; l; l = l->next) { @@ -314,29 +313,6 @@ static GSList *hw_scan(GSList *options) if (!conn) return NULL; - if (!strcmp(di->name, "digitek-dt4000zc")) - dmm = 0; - if (!strcmp(di->name, "tekpower-tp4000zc")) - dmm = 1; - if (!strcmp(di->name, "metex-me31")) - dmm = 2; - if (!strcmp(di->name, "peaktech-3410")) - dmm = 3; - if (!strcmp(di->name, "mastech-mas345")) - dmm = 4; - if (!strcmp(di->name, "va-va18b")) - 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 (!strcmp(di->name, "radioshack-22-812")) - dmm = 10; - if (serialcomm) { /* Use the provided comm specs. */ devices = scan(conn, serialcomm, dmm); @@ -348,15 +324,45 @@ static GSList *hw_scan(GSList *options) return devices; } -static GSList *hw_dev_list(void) +/* Driver-specific hw_scan() function wrappers */ +#define HW_SCAN(X) static GSList *hw_scan_##X(GSList *options) \ + { return hw_scan(options, X); } +HW_SCAN(DIGITEK_DT4000ZC) +HW_SCAN(TEKPOWER_TP4000ZC) +HW_SCAN(METEX_ME31) +HW_SCAN(PEAKTECH_3410) +HW_SCAN(MASTECH_MAS345) +HW_SCAN(VA_VA18B) +HW_SCAN(METEX_M3640D) +HW_SCAN(PEAKTECH_4370) +HW_SCAN(PCE_PCE_DM32) +HW_SCAN(RADIOSHACK_22_168) +HW_SCAN(RADIOSHACK_22_812) + +static GSList *hw_dev_list(int dmm) { struct drv_context *drvc; - drvc = di->priv; + drvc = dmms[dmm].di->priv; return drvc->instances; } +/* Driver-specific hw_dev_list() function wrappers */ +#define HW_DEV_LIST(X) static GSList *hw_dev_list_##X(void) \ + { return hw_dev_list(X); } +HW_DEV_LIST(DIGITEK_DT4000ZC) +HW_DEV_LIST(TEKPOWER_TP4000ZC) +HW_DEV_LIST(METEX_ME31) +HW_DEV_LIST(PEAKTECH_3410) +HW_DEV_LIST(MASTECH_MAS345) +HW_DEV_LIST(VA_VA18B) +HW_DEV_LIST(METEX_M3640D) +HW_DEV_LIST(PEAKTECH_4370) +HW_DEV_LIST(PCE_PCE_DM32) +HW_DEV_LIST(RADIOSHACK_22_168) +HW_DEV_LIST(RADIOSHACK_22_812) + static int hw_dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -531,8 +537,8 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .api_version = 1, \ .init = hw_init_##ID_UPPER, \ .cleanup = hw_cleanup, \ - .scan = hw_scan, \ - .dev_list = hw_dev_list, \ + .scan = hw_scan_##ID_UPPER, \ + .dev_list = hw_dev_list_##ID_UPPER, \ .dev_clear = clear_instances, \ .dev_open = hw_dev_open, \ .dev_close = hw_dev_close, \