X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=55358ebf3953a86c7a6476dcb33041b940dd7a12;hb=2b0e4a468a522770f27959d07efdd7b23e70a509;hp=eb0ac3d2c80fe065c06df67822ed5276d8c2da70;hpb=471607f0244e93cd67097760431a0dd3d39152eb;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index eb0ac3d2..55358ebf 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -53,7 +53,7 @@ static struct sr_config_info sr_config_info_data[] = { {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio", "Pre-trigger capture ratio", NULL}, {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern", - "Pattern generator mode", NULL}, + "Pattern", NULL}, {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype", "Trigger types", NULL}, {SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock", @@ -100,8 +100,6 @@ static struct sr_config_info sr_config_info_data[] = { "Number of logic probes", NULL}, {SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes", "Number of analog probes", NULL}, - {SR_CONF_MAX_UNCOMPRESSED_SAMPLES, SR_T_UINT64, "max_uncompressed_samples", - "Maximum number of uncompressed samples", NULL}, {SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage", "Current output voltage", NULL}, {SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max", @@ -118,6 +116,8 @@ static struct sr_config_info sr_config_info_data[] = { "Over-voltage protection", NULL}, {SR_CONF_OVER_CURRENT_PROTECTION, SR_T_BOOL, "ocp", "Over-current protection", NULL}, + {SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples", + "Sample limit", NULL}, {0, 0, NULL, NULL, NULL}, }; @@ -126,7 +126,7 @@ static struct sr_config_info sr_config_info_data[] = { extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info; #endif #ifdef HAVE_HW_ATTEN_PPS3XXX -extern SR_PRIV struct sr_dev_driver atten_pps3xxx_driver_info; +extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info; #endif #ifdef HAVE_HW_BRYMEN_DMM extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info; @@ -178,6 +178,9 @@ extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info; #ifdef HAVE_HW_SALEAE_LOGIC16 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info; #endif +#ifdef HAVE_HW_SYSCLK_LWLA +extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info; +#endif #ifdef HAVE_HW_TELEINFO extern SR_PRIV struct sr_dev_driver teleinfo_driver_info; #endif @@ -272,7 +275,7 @@ static struct sr_dev_driver *drivers_list[] = { &appa_55ii_driver_info, #endif #ifdef HAVE_HW_ATTEN_PPS3XXX - &atten_pps3xxx_driver_info, + &atten_pps3203_driver_info, #endif #ifdef HAVE_HW_BRYMEN_DMM &brymen_bm857_driver_info, @@ -324,6 +327,9 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_SALEAE_LOGIC16 &saleae_logic16_driver_info, #endif +#ifdef HAVE_HW_SYSCLK_LWLA + &sysclk_lwla_driver_info, +#endif #ifdef HAVE_HW_TELEINFO &teleinfo_driver_info, #endif