X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=dea9e0c413c7152a55ff7190eef37bef4f40a123;hb=71422cb6eb8be34f6fca8a3be7ebe10fe1bea319;hp=f198e86325d8a581236255216e25a6d9c9ff2271;hpb=53b4680fceab9351fc87b8c5b34854733f5fdac0;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index f198e863..dea9e0c4 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -27,7 +27,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "hwdriver"
+/** @endcond */
 
 /**
  * @file
@@ -96,10 +98,10 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Power off", NULL},
 	{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
 		"Data source", NULL},
-	{SR_CONF_NUM_LOGIC_PROBES, SR_T_INT32, "logic_probes",
-		"Number of logic probes", NULL},
-	{SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes",
-		"Number of analog probes", NULL},
+	{SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
+		"Number of logic channels", NULL},
+	{SR_CONF_NUM_ANALOG_CHANNELS, SR_T_INT32, "analog_channels",
+		"Number of analog channels", 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",
@@ -208,15 +210,12 @@ extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
 #ifdef HAVE_HW_ASIX_SIGMA
 extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
 #endif
-#ifdef HAVE_HW_CHRONOVU_LA8
-extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
+#ifdef HAVE_HW_CHRONOVU_LA
+extern SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
 #endif
 #ifdef HAVE_HW_LINK_MSO19
 extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 #endif
-#ifdef HAVE_HW_ALSA
-extern SR_PRIV struct sr_dev_driver alsa_driver_info;
-#endif
 #ifdef HAVE_HW_FX2LAFW
 extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 #endif
@@ -366,15 +365,12 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_ASIX_SIGMA
 	&asix_sigma_driver_info,
 #endif
-#ifdef HAVE_HW_CHRONOVU_LA8
-	&chronovu_la8_driver_info,
+#ifdef HAVE_HW_CHRONOVU_LA
+	&chronovu_la_driver_info,
 #endif
 #ifdef HAVE_HW_LINK_MSO19
 	&link_mso19_driver_info,
 #endif
-#ifdef HAVE_HW_ALSA
-	&alsa_driver_info,
-#endif
 #ifdef HAVE_HW_FX2LAFW
 	&fx2lafw_driver_info,
 #endif
@@ -774,7 +770,7 @@ SR_PRIV int sr_source_remove(int fd)
  *  @see sr_session_source_add()
  */
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
-			  sr_receive_data_callback_t cb, void *cb_data)
+			  sr_receive_data_callback cb, void *cb_data)
 {
 	return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }