X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=dea9e0c413c7152a55ff7190eef37bef4f40a123;hb=f0554946600a7db68f9ef33d25646f17562bf284;hp=f508a4696d5b2cace3e6751e86e02540b83251e7;hpb=660e398fe9f5fc608787f8fd75a9df8aac61026f;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index f508a469..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 @@ -587,7 +583,7 @@ SR_PRIV void sr_config_free(struct sr_config *src) * @param[in] sdi (optional) If the key is specific to a device, this must * contain a pointer to the struct sr_dev_inst to be checked. * Otherwise it must be NULL. - * @param[in] channel_group The channel group on the device for which to list the + * @param[in] cg The channel group on the device for which to list the * values, or NULL. * @param[in] key The configuration key (SR_CONF_*). * @param[in,out] data Pointer to a GVariant where the value will be stored. @@ -604,7 +600,7 @@ SR_PRIV void sr_config_free(struct sr_config *src) */ SR_API int sr_config_get(const struct sr_dev_driver *driver, const struct sr_dev_inst *sdi, - const struct sr_channel_group *channel_group, + const struct sr_channel_group *cg, int key, GVariant **data) { int ret; @@ -615,7 +611,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, if (!driver->config_get) return SR_ERR_ARG; - if ((ret = driver->config_get(key, data, sdi, channel_group)) == SR_OK) { + if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) { /* Got a floating reference from the driver. Sink it here, * caller will need to unref when done with it. */ g_variant_ref_sink(*data); @@ -628,7 +624,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, * Set value of a configuration key in a device instance. * * @param[in] sdi The device instance. - * @param[in] channel_group The channel group on the device for which to list the + * @param[in] cg The channel group on the device for which to list the * values, or NULL. * @param[in] key The configuration key (SR_CONF_*). * @param data The new value for the key, as a GVariant with GVariantType @@ -642,7 +638,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, * that it's not applicable. */ SR_API int sr_config_set(const struct sr_dev_inst *sdi, - const struct sr_channel_group *channel_group, + const struct sr_channel_group *cg, int key, GVariant *data) { int ret; @@ -654,7 +650,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, else if (!sdi->driver->config_set) ret = SR_ERR_ARG; else - ret = sdi->driver->config_set(key, data, sdi, channel_group); + ret = sdi->driver->config_set(key, data, sdi, cg); g_variant_unref(data); @@ -688,7 +684,7 @@ SR_API int sr_config_commit(const struct sr_dev_inst *sdi) * @param[in] driver The sr_dev_driver struct to query. * @param[in] sdi (optional) If the key is specific to a device, this must * contain a pointer to the struct sr_dev_inst to be checked. - * @param[in] channel_group The channel group on the device for which to list the + * @param[in] cg The channel group on the device for which to list the * values, or NULL. * @param[in] key The configuration key (SR_CONF_*). * @param[in,out] data A pointer to a GVariant where the list will be stored. @@ -705,7 +701,7 @@ SR_API int sr_config_commit(const struct sr_dev_inst *sdi) */ SR_API int sr_config_list(const struct sr_dev_driver *driver, const struct sr_dev_inst *sdi, - const struct sr_channel_group *channel_group, + const struct sr_channel_group *cg, int key, GVariant **data) { int ret; @@ -714,7 +710,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, ret = SR_ERR; else if (!driver->config_list) ret = SR_ERR_ARG; - else if ((ret = driver->config_list(key, data, sdi, channel_group)) == SR_OK) + else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK) g_variant_ref_sink(*data); return ret; @@ -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); }