#define OSCI_FIRMWARE FIRMWARE_DIR "/nexus-osciprime.fw"
#define OSCI_VIDPID "04b4.1004"
-static const int hwopts[] = {
+static const int32_t hwopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
- 0,
};
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
SR_CONF_OSCILLOSCOPE,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
SR_CONF_TIMEBASE,
SR_CONF_VDIV,
- 0,
};
-static const struct sr_rational timebases[] = {
+static const uint64_t timebases[][2] = {
/* 24 MHz */
{ 42, 1e9 },
/* 12 MHz */
NULL,
};
-static const struct sr_rational vdivs[] = {
+static const uint64_t vdivs[][2] = {
{ 1, 1 },
{ 2, 1 },
{ 5, 2 },
{ 10, 1 },
};
-
SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
static struct sr_dev_driver *di = &nexus_osciprime_driver_info;
-static int hw_dev_close(struct sr_dev_inst *sdi);
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static int dev_clear(void)
{
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
- struct dev_context *devc;
- GSList *l;
-
- if (!(drvc = di->priv))
- return SR_OK;
-
- for (l = drvc->instances; l; l = l->next) {
- if (!(sdi = l->data))
- continue;
- if (!(devc = sdi->priv))
- continue;
-
- hw_dev_close(sdi);
- sr_usb_dev_inst_free(devc->usb);
- sr_dev_inst_free(sdi);
- }
-
- g_slist_free(drvc->instances);
- drvc->instances = NULL;
-
- return SR_OK;
+ return std_dev_clear(di, NULL);
}
-static int hw_init(struct sr_context *sr_ctx)
+static int init(struct sr_context *sr_ctx)
{
- struct drv_context *drvc;
-
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
- }
-
- drvc->sr_ctx = sr_ctx;
- di->priv = drvc;
-
- return SR_OK;
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
-static GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
int i;
const char *conn;
- (void)options;
-
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
-
- /* USB scan is always authoritative. */
- clear_instances();
+ drvc = di->priv;
conn = NULL;
for (l = options; l; l = l->next) {
src = l->data;
switch (src->key) {
case SR_CONF_CONN:
- conn = src->value;
+ conn = g_variant_get_string(src->data, NULL);
break;
}
}
return devices;
}
-static GSList *hw_dev_list(void)
+static GSList *dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int dev_open(struct sr_dev_inst *sdi)
{
/* TODO */
- (void)sdi;
+ sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int dev_close(struct sr_dev_inst *sdi)
{
/* TODO */
- (void)sdi;
+ sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
-static int hw_cleanup(void)
+static int cleanup(void)
{
- clear_instances();
-
- /* TODO */
-
- return SR_OK;
+ return dev_clear();
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
+ int ret;
+
/* TODO */
(void)data;
- (void)sdi;
- switch (info_id) {
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
+ ret = SR_OK;
+ switch (id) {
+
default:
- return SR_ERR_ARG;
+ ret = SR_ERR_NA;
}
- return SR_OK;
+ return ret;
}
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
- int ret;
-
- /* TODO */
- (void)value;
-
- if (sdi->status != SR_ST_ACTIVE) {
- sr_err("Device inactive, can't set config options.");
- return SR_ERR;
- }
-
- ret = SR_OK;
- switch (hwcap) {
+ (void)sdi;
+ (void)data;
+ switch (key) {
default:
- sr_err("Unknown hardware capability: %d.", hwcap);
- ret = SR_ERR_ARG;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
/* TODO */
- (void)sdi;
(void)cb_data;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
return SR_OK;
}
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
(void)cb_data;
.name = "nexus-osciprime",
.longname = "Nexus OsciPrime",
.api_version = 1,
- .init = hw_init,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
+ .init = init,
+ .cleanup = cleanup,
+ .scan = scan,
+ .dev_list = dev_list,
+ .dev_clear = dev_clear,
+ .config_get = NULL,
+ .config_set = config_set,
+ .config_list = config_list,
+ .dev_open = dev_open,
+ .dev_close = dev_close,
+ .dev_acquisition_start = dev_acquisition_start,
+ .dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
};
projects / libsigrok.git / blobdiff