X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=fa50dd698d7a56400e6fa890080404052657077c;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=293d3c8549b7ca4adceccb5497275d872d6cfec9;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git
diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 293d3c85..fa50dd69 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include "protocol.h"
@@ -24,14 +25,15 @@
#define VENDOR "Kecheng"
#define USB_INTERFACE 0
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
SR_CONF_SOUNDLEVELMETER,
- SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
- SR_CONF_DATALOG,
- SR_CONF_SPL_WEIGHT_FREQ,
- SR_CONF_SPL_WEIGHT_TIME,
- SR_CONF_DATA_SOURCE,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_SAMPLE_INTERVAL | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_DATALOG | SR_CONF_GET,
+ SR_CONF_SPL_WEIGHT_FREQ | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SPL_WEIGHT_TIME | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
SR_PRIV const uint64_t kecheng_kc_330b_sample_intervals[][2] = {
@@ -59,22 +61,14 @@ static const char *data_sources[] = {
"Memory",
};
-SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
-static struct sr_dev_driver *di = &kecheng_kc_330b_driver_info;
-
-
-static int init(struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static int scan_kecheng(struct sr_usb_dev_inst *usb, char **model)
+static int scan_kecheng(struct sr_dev_driver *di,
+ struct sr_usb_dev_inst *usb, char **model)
{
struct drv_context *drvc;
int len, ret;
unsigned char cmd, buf[32];
- drvc = di->priv;
+ drvc = di->context;
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
return SR_ERR;
@@ -107,42 +101,33 @@ static int scan_kecheng(struct sr_usb_dev_inst *usb, char **model)
return SR_OK;
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
GSList *usb_devices, *devices, *l;
char *model;
(void)options;
- drvc = di->priv;
- drvc->instances = NULL;
+ drvc = di->context;
devices = NULL;
if ((usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, USB_CONN))) {
/* We have a list of sr_usb_dev_inst matching the connection
* string. Wrap them in sr_dev_inst and we're done. */
for (l = usb_devices; l; l = l->next) {
- if (scan_kecheng(l->data, &model) != SR_OK)
+ if (scan_kecheng(di, l->data, &model) != SR_OK)
continue;
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR,
- model, NULL)))
- return NULL;
- g_free(model);
- sdi->driver = di;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup(VENDOR);
+ sdi->model = model; /* Already g_strndup()'d. */
sdi->inst_type = SR_INST_USB;
sdi->conn = l->data;
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
- return NULL;
- sdi->channels = g_slist_append(sdi->channels, ch);
-
- if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
- sr_dbg("Device context malloc failed.");
- return NULL;
- }
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "SPL");
+ devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
devc->limit_samples = 0;
/* The protocol provides no way to read the current
@@ -156,32 +141,22 @@ static GSList *scan(GSList *options)
/* TODO: Set date/time? */
- drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
}
g_slist_free(usb_devices);
} else
g_slist_free_full(usb_devices, g_free);
- return devices;
-}
-
-static GSList *dev_list(void)
-{
- return ((struct drv_context *)(di->priv))->instances;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
{
- struct drv_context *drvc;
+ struct sr_dev_driver *di = sdi->driver;
+ struct drv_context *drvc = di->context;
struct sr_usb_dev_inst *usb;
int ret;
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
usb = sdi->conn;
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
@@ -196,9 +171,8 @@ static int dev_open(struct sr_dev_inst *sdi)
sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
return SR_ERR;
}
- sdi->status = SR_ST_ACTIVE;
- return ret;
+ return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
@@ -206,16 +180,10 @@ static int dev_close(struct sr_dev_inst *sdi)
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
usb = sdi->conn;
if (!usb->devhdl)
- /* Nothing to do. */
- return SR_OK;
+ return SR_ERR_BUG;
/* This allows a frontend to configure the device without ever
* doing an acquisition step. */
@@ -226,28 +194,10 @@ static int dev_close(struct sr_dev_inst *sdi)
libusb_release_interface(usb->devhdl, USB_INTERFACE);
libusb_close(usb->devhdl);
usb->devhdl = NULL;
- sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
-static int cleanup(void)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->priv))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
- di->priv = NULL;
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
@@ -308,14 +258,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;
-
- if (!di->priv) {
- sr_err("Driver was not initialized.");
- return SR_ERR;
- }
-
devc = sdi->priv;
ret = SR_OK;
switch (key) {
@@ -390,7 +332,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_SAMPLE_INTERVAL:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -418,9 +360,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct dev_context *devc;
struct sr_datafeed_packet packet;
@@ -429,21 +371,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_usb_dev_inst *usb;
GVariant *gvar, *rational[2];
const uint64_t *si;
- int stored_mqflags, req_len, buf_len, len, ret;
+ int req_len, buf_len, len, ret;
unsigned char buf[9];
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
- drvc = di->priv;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
- devc->cb_data = cb_data;
devc->num_samples = 0;
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi);
if (devc->data_source == DATA_SOURCE_LIVE) {
/* Force configuration. */
@@ -461,13 +398,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
} else {
if (kecheng_kc_330b_log_info_get(sdi, buf) != SR_OK)
return SR_ERR;
- stored_mqflags = buf[4] ? SR_MQFLAG_SPL_TIME_WEIGHT_S : SR_MQFLAG_SPL_TIME_WEIGHT_F;
- stored_mqflags |= buf[5] ? SR_MQFLAG_SPL_FREQ_WEIGHT_C : SR_MQFLAG_SPL_FREQ_WEIGHT_A;
+ devc->mqflags = buf[4] ? SR_MQFLAG_SPL_TIME_WEIGHT_S : SR_MQFLAG_SPL_TIME_WEIGHT_F;
+ devc->mqflags |= buf[5] ? SR_MQFLAG_SPL_FREQ_WEIGHT_C : SR_MQFLAG_SPL_FREQ_WEIGHT_A;
devc->stored_samples = (buf[7] << 8) | buf[8];
if (devc->stored_samples == 0) {
/* Notify frontend of empty log by sending start/end packets. */
- packet.type = SR_DF_END;
- sr_session_send(cb_data, &packet);
+ std_session_send_df_end(sdi);
return SR_OK;
}
@@ -482,7 +418,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
packet.type = SR_DF_META;
packet.payload = &meta;
meta.config = g_slist_append(NULL, src);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_free(src);
}
@@ -529,15 +465,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- (void)cb_data;
-
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
/* Signal USB transfer handler to clean up and stop. */
sdi->status = SR_ST_STOPPING;
@@ -555,14 +486,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info = {
+static struct sr_dev_driver kecheng_kc_330b_driver_info = {
.name = "kecheng-kc-330b",
.longname = "Kecheng KC-330B",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = NULL,
.config_get = config_get,
.config_set = config_set,
@@ -571,5 +502,6 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
+SR_REGISTER_DEV_DRIVER(kecheng_kc_330b_driver_info);