X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fconrad-digi-35-cpu%2Fapi.c;h=60eb46c1932ec1402c36c9a1fceebd7e4e5eee70;hb=a9010323ddf4e479663e871386c05db05ea3522e;hp=63c0e4f18703f2614b31740ce5fbeec3cd657a1c;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git
diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index 63c0e4f1..60eb46c1 100644
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -17,9 +17,12 @@
* along with this program. If not, see .
*/
-/** @file
- * Conrad DIGI 35 CPU power supply driver
- * @internal
+/**
+ * @file
+ *
+ * Conrad DIGI 35 CPU power supply driver
+ *
+ * @internal
*/
#include
@@ -42,15 +45,11 @@ static const uint32_t devopts[] = {
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct sr_config *src;
struct sr_serial_dev_inst *serial;
- GSList *l, *devices;
+ GSList *l;
const char *conn, *serialcomm;
- devices = NULL;
- drvc = di->context;
- drvc->instances = NULL;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
@@ -91,12 +90,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->model = g_strdup("DIGI 35 CPU");
sdi->conn = serial;
sdi->priv = NULL;
- sdi->driver = di;
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
- drvc->instances = g_slist_append(drvc->instances, sdi);
- devices = g_slist_append(devices, sdi);
- return devices;
+ return std_scan_complete(di, g_slist_append(NULL, sdi));
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -107,9 +103,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
(void)cg;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
switch (key) {
case SR_CONF_VOLTAGE:
dblval = g_variant_get_double(data);
@@ -143,12 +136,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int ret;
-
(void)sdi;
(void)cg;
- ret = SR_OK;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
@@ -162,22 +152,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_NA;
}
- return ret;
-}
-
-static int dev_acquisition_start(const struct sr_dev_inst *sdi)
-{
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
- return SR_OK;
-}
-
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
return SR_OK;
}
@@ -189,14 +163,14 @@ static struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = std_dev_list,
- .dev_clear = NULL,
+ .dev_clear = std_dev_clear,
.config_get = NULL,
.config_set = config_set,
.config_list = config_list,
.dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close,
- .dev_acquisition_start = dev_acquisition_start,
- .dev_acquisition_stop = dev_acquisition_stop,
+ .dev_acquisition_start = std_dummy_dev_acquisition_start,
+ .dev_acquisition_stop = std_dummy_dev_acquisition_stop,
.context = NULL,
};
SR_REGISTER_DEV_DRIVER(conrad_digi_35_cpu_driver_info);