X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fnexus-osciprime%2Fapi.c;h=a19ca73335cd6273a17faa005642cde39eb36840;hb=e44ac12a29c39cb873968a8fd4c02b3e05316b3b;hp=4c9a1da6ac6eeb3374af9cf281ce145a48f04bd8;hpb=35a078bce5cff9b8ff221a9930d271ec90e20ec4;p=libsigrok.git
diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index 4c9a1da6..a19ca733 100644
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -17,13 +17,97 @@
* along with this program. If not, see .
*/
+#include
#include
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
+#define OSCI_VENDOR "Nexus Computing"
+#define OSCI_MODEL "OsciPrime"
+#define OSCI_VERSION "1.0"
+#define OSCI_FIRMWARE FIRMWARE_DIR "/nexus-osciprime.fw"
+#define OSCI_VIDPID "04b4.1004"
+
+static const int hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+ 0,
+};
+
+static const int hwcaps[] = {
+ SR_CONF_OSCILLOSCOPE,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
+ SR_CONF_TIMEBASE,
+ SR_CONF_VDIV,
+ 0,
+};
+
+static const struct sr_rational timebases[] = {
+ /* 24 MHz */
+ { 42, 1e9 },
+ /* 12 MHz */
+ { 83, 1e9 },
+ /* 6 MHz */
+ { 167, 1e9 },
+ /* 3 MHz */
+ { 333, 1e9 },
+ /* 1.5 MHz */
+ { 667, 1e9 },
+ /* 750 kHz */
+ { 1333, 1e9 },
+ /* 375 kHz */
+ { 2667, 1e9 },
+ /* 187.5 kHz */
+ { 5333, 1e9 },
+ /* 93.25 kHz */
+ { 10724, 1e9 },
+ /* 46.875 kHz */
+ { 21333, 1e9 },
+ /* 23.4375 kHz */
+ { 42666, 1e9 },
+ /* 11.718 kHz */
+ { 85339, 1e9 },
+ /* 5.859 kHz */
+ { 170678, 1e9 },
+ /* 2.929 kHz */
+ { 341413, 1e9 },
+ /* 1.465 kHz */
+ { 682594, 1e9 },
+ /* 732 Hz */
+ { 1366, 1e6 },
+ /* 366 Hz */
+ { 2732, 1e6 },
+ /* 183 Hz */
+ { 5464, 1e6 },
+ /* 91 Hz */
+ { 10989, 1e6 },
+ /* 46 Hz */
+ { 21739, 1e6 },
+ /* 23 Hz */
+ { 43478, 1e6 },
+ /* 12 Hz */
+ { 83333, 1e6 },
+};
+
+static const char *probe_names[] = {
+ "CHA", "CHB",
+ NULL,
+};
+
+static const struct sr_rational vdivs[] = {
+ { 1, 1 },
+ { 2, 1 },
+ { 5, 2 },
+ { 5, 1 },
+ { 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)
@@ -42,8 +126,8 @@ static int clear_instances(void)
if (!(devc = sdi->priv))
continue;
- /* TODO */
-
+ hw_dev_close(sdi);
+ sr_usb_dev_inst_free(devc->usb);
sr_dev_inst_free(sdi);
}
@@ -53,57 +137,104 @@ static int clear_instances(void)
return SR_OK;
}
-static int hw_init(void)
+static int hw_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;
- }
-
- /* TODO */
-
- di->priv = drvc;
-
- return SR_OK;
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
}
static GSList *hw_scan(GSList *options)
{
struct drv_context *drvc;
- GSList *devices;
+ struct dev_context *devc;
+ struct sr_dev_inst *sdi;
+ struct sr_usb_dev_inst *usb;
+ struct sr_config *src;
+ struct sr_probe *probe;
+ libusb_device *dev;
+ GSList *usb_devices, *devices, *l;
+ int i;
+ const char *conn;
(void)options;
- devices = NULL;
drvc = di->priv;
- drvc->instances = NULL;
- /* TODO */
+ /* USB scan is always authoritative. */
+ clear_instances();
+
+ conn = NULL;
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = src->value;
+ break;
+ }
+ }
+ if (!conn)
+ conn = OSCI_VIDPID;
+
+ devices = NULL;
+ if ((usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
+ for (l = usb_devices; l; l = l->next) {
+ usb = l->data;
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+ OSCI_VENDOR, OSCI_MODEL, OSCI_VERSION)))
+ return NULL;
+ sdi->driver = di;
+ for (i = 0; probe_names[i]; i++) {
+ if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+ probe_names[i])))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
+
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
+ return NULL;
+ sdi->priv = devc;
+ devc->usb = usb;
+
+ if (strcmp(conn, OSCI_VIDPID)) {
+ if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
+ break;
+ dev = libusb_get_device(usb->devhdl);
+ if (ezusb_upload_firmware(dev, 0, OSCI_FIRMWARE) == SR_OK)
+ /* Remember when the firmware on this device was updated */
+ devc->fw_updated = g_get_monotonic_time();
+ else
+ sr_err("Firmware upload failed for device "
+ "at bus %d address %d.", usb->bus, usb->address);
+ }
+
+ 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 *hw_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)
{
+
/* TODO */
+ (void)sdi;
return SR_OK;
}
static int hw_dev_close(struct sr_dev_inst *sdi)
{
+
/* TODO */
+ (void)sdi;
return SR_OK;
}
@@ -117,44 +248,48 @@ static int hw_cleanup(void)
return SR_OK;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
-{
- switch (info_id) {
- /* TODO */
- default:
- sr_err("Unknown info_id: %d.", info_id);
- return SR_ERR_ARG;
- }
-
- return SR_OK;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int config_set(int id, const void *value, 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) {
- /* TODO */
+ switch (id) {
+
default:
- sr_err("Unknown hardware capability: %d.", hwcap);
+ sr_err("Unknown hardware capability: %d.", id);
ret = SR_ERR_ARG;
}
return ret;
}
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ default:
+ return SR_ERR_ARG;
+ }
+
+ return SR_OK;
+}
+
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
/* TODO */
+ (void)sdi;
+ (void)cb_data;
return SR_OK;
}
@@ -175,17 +310,18 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info = {
.name = "nexus-osciprime",
- .longname = "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,
+ .config_get = NULL,
+ .config_set = config_set,
+ .config_list = config_list,
.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,
.priv = NULL,