X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=c2e6cda1dd9c8f569e2510ea518ecfa871b44096;hb=3ebce226a2672ea4f0788f5f2a222586148aabc1;hp=026c4824d185dcea118e71d7dc3b459171f3f13b;hpb=c5d6f5cc1c0069a5141c5c76f7e17dd592427138;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index 026c4824..c2e6cda1 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -79,6 +79,8 @@ static struct sr_config_info sr_config_info_data[] = { "Volts/div", NULL}, {SR_CONF_COUPLING, SR_T_CHAR, "coupling", "Coupling", NULL}, + {SR_CONF_DATALOG, SR_T_BOOL, "datalog", + "Datalog", NULL}, {0, 0, NULL, NULL, NULL}, }; @@ -96,6 +98,7 @@ extern SR_PRIV struct sr_dev_driver demo_driver_info; extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; #endif #ifdef HAVE_HW_MIC_985XX +extern SR_PRIV struct sr_dev_driver mic_98581_driver_info; extern SR_PRIV struct sr_dev_driver mic_98583_driver_info; #endif #ifdef HAVE_HW_NEXUS_OSCIPRIME @@ -151,6 +154,7 @@ extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info; extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info; extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; +extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info; @@ -176,6 +180,7 @@ static struct sr_dev_driver *drivers_list[] = { &lascar_el_usb_driver_info, #endif #ifdef HAVE_HW_MIC_985XX + &mic_98581_driver_info, &mic_98583_driver_info, #endif #ifdef HAVE_HW_NEXUS_OSCIPRIME @@ -231,6 +236,7 @@ static struct sr_dev_driver *drivers_list[] = { &peaktech_4370_driver_info, &pce_pce_dm32_driver_info, &radioshack_22_168_driver_info, + &radioshack_22_805_driver_info, &radioshack_22_812_driver_info, &voltcraft_vc820_ser_driver_info, &voltcraft_vc840_ser_driver_info, @@ -349,7 +355,7 @@ SR_PRIV void sr_hw_cleanup_all(void) } } -SR_PRIV struct sr_config *sr_config_make(int key, const void *value) +SR_PRIV struct sr_config *sr_config_new(int key, const void *value) { struct sr_config *src; @@ -383,9 +389,6 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, if (!driver || !data) return SR_ERR; - if (!driver->config_get) - return SR_ERR_ARG; - ret = driver->config_get(key, data, sdi); return ret; @@ -443,9 +446,6 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, if (!driver || !data) return SR_ERR; - if (!driver->config_list) - return SR_ERR_ARG; - ret = driver->config_list(key, data, sdi); return ret;