extern SR_PRIV struct dmmchip dmmchip_fs9922;
+extern SR_PRIV struct dmmchip dmmchip_victor70c;
+static struct sr_hwopt victor_70c_vidpid[] = {
+ { SR_HWOPT_CONN, "1244.d237" },
+ { 0, NULL }
+};
static struct dev_profile dev_profiles[] = {
- { "victor-70c", "Victor", "70C", &dmmchip_fs9922,
- 0x1244, 0xd237, DMM_TRANSPORT_USBHID },
- { "mastech-va18b", "Mastech", "VA18B", NULL, 0, 0, DMM_TRANSPORT_SERIAL},
+ { "victor-70c", "Victor", "70C", &dmmchip_victor70c,
+ DMM_TRANSPORT_USBHID, 1000, victor_70c_vidpid
+ },
+ { "mastech-va18b", "Mastech", "VA18B", NULL, DMM_TRANSPORT_SERIAL, 0, NULL},
+ { NULL, NULL, NULL, NULL, 0, 0, NULL }
+};
+
+static const int hwopts[] = {
+ SR_HWOPT_MODEL,
+ SR_HWOPT_CONN,
+ SR_HWOPT_SERIALCOMM,
+ 0,
};
static const int hwcaps[] = {
SR_HWCAP_LIMIT_SAMPLES,
SR_HWCAP_LIMIT_MSEC,
SR_HWCAP_CONTINUOUS,
- SR_HWCAP_MODEL,
- SR_HWCAP_CONN,
- SR_HWCAP_SERIALCOMM,
0,
};
NULL,
};
-/* TODO need a way to keep these local to the static library */
-SR_PRIV GSList *genericdmm_dev_insts = NULL;
-SR_PRIV libusb_context *genericdmm_usb_context = NULL;
+SR_PRIV struct sr_dev_driver genericdmm_driver_info;
+static struct sr_dev_driver *gdi = &genericdmm_driver_info;
+/* TODO need a way to keep this local to the static library */
+static libusb_context *genericdmm_usb_context = NULL;
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+ void *cb_data);
-static int hw_init(void)
+static GSList *connect_usb(const char *conn)
{
+ struct sr_dev_inst *sdi;
+ struct drv_context *drvc;
+ struct dev_context *devc;
+ struct sr_probe *probe;
+ libusb_device **devlist;
+ struct libusb_device_descriptor des;
+ GSList *devices;
+ GRegex *reg;
+ GMatchInfo *match;
+ int vid, pid, bus, addr, devcnt, err, i;
+ char *mstr;
- if (libusb_init(&genericdmm_usb_context) != 0) {
- sr_err("genericdmm: Failed to initialize USB.");
- return SR_ERR;
+ drvc = gdi->priv;
+
+ vid = pid = bus = addr = 0;
+ reg = g_regex_new(DMM_CONN_USB_VIDPID, 0, 0, NULL);
+ if (g_regex_match(reg, conn, 0, &match)) {
+ /* Extract VID. */
+ if ((mstr = g_match_info_fetch(match, 1)))
+ vid = strtoul(mstr, NULL, 16);
+ g_free(mstr);
+
+ /* Extract PID. */
+ if ((mstr = g_match_info_fetch(match, 2)))
+ pid = strtoul(mstr, NULL, 16);
+ g_free(mstr);
+ } else {
+ g_match_info_unref(match);
+ g_regex_unref(reg);
+ reg = g_regex_new(DMM_CONN_USB_BUSADDR, 0, 0, NULL);
+ if (g_regex_match(reg, conn, 0, &match)) {
+ /* Extract bus. */
+ if ((mstr = g_match_info_fetch(match, 0)))
+ bus = strtoul(mstr, NULL, 16);
+ g_free(mstr);
+
+ /* Extract address. */
+ if ((mstr = g_match_info_fetch(match, 0)))
+ addr = strtoul(mstr, NULL, 16);
+ g_free(mstr);
+ }
}
+ g_match_info_unref(match);
+ g_regex_unref(reg);
+ if (vid + pid + bus + addr == 0)
+ return NULL;
- return SR_OK;
+ if (bus > 64) {
+ sr_err("Invalid bus.");
+ return NULL;
+ }
+
+ if (addr > 127) {
+ sr_err("Invalid address.");
+ return NULL;
+ }
+
+ /* Looks like a valid USB device specification, but is it connected? */
+ devices = NULL;
+ libusb_get_device_list(genericdmm_usb_context, &devlist);
+ for (i = 0; devlist[i]; i++) {
+ if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
+ sr_err("Failed to get device descriptor: %d.", err);
+ continue;
+ }
+
+ if (vid + pid && (des.idVendor != vid || des.idProduct != pid))
+ /* VID/PID specified, but no match. */
+ continue;
+
+ if (bus + addr && (
+ libusb_get_bus_number(devlist[i]) != bus
+ || libusb_get_device_address(devlist[i]) != addr))
+ /* Bus/address specified, but no match. */
+ continue;
+
+ /* Found one. */
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ return NULL;
+ }
+
+ devcnt = g_slist_length(drvc->instances);
+ if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
+ NULL, NULL, NULL))) {
+ sr_err("sr_dev_inst_new returned NULL.");
+ return NULL;
+ }
+ sdi->priv = devc;
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ devc->usb = sr_usb_dev_inst_new(
+ libusb_get_bus_number(devlist[i]),
+ libusb_get_device_address(devlist[i]), NULL);
+ devices = g_slist_append(devices, sdi);
+ }
+ libusb_free_device_list(devlist, 1);
+
+ return devices;
}
-static int hw_scan(void)
+static GSList *connect_serial(const char *conn, const char *serialcomm)
{
- struct sr_dev_inst *sdi;
- struct context *ctx;
- int devcnt = 0;
+ GSList *devices;
- if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("genericdmm: ctx malloc failed.");
- return 0;
- }
+ devices = NULL;
- devcnt = g_slist_length(genericdmm_dev_insts);
- if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_ACTIVE, "Generic DMM",
- NULL, NULL))) {
- sr_err("genericdmm: sr_dev_inst_new returned NULL.");
- return 0;
- }
- sdi->priv = ctx;
- genericdmm_dev_insts = g_slist_append(genericdmm_dev_insts, sdi);
+ /* TODO */
+ sr_dbg("Not yet implemented.");
- /* Always initialized just one device instance. */
- return 0;
+ return devices;
}
-static int hw_dev_open(int dev_index)
+GSList *genericdmm_connect(const char *conn, const char *serialcomm)
{
- struct sr_dev_inst *sdi;
- struct context *ctx;
+ GSList *devices;
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: sdi was NULL.");
- return SR_ERR_BUG;
- }
+ if (serialcomm)
+ /* Must be a serial port. */
+ return connect_serial(conn, serialcomm);
- if (!(ctx = sdi->priv)) {
- sr_err("genericdmm: sdi->priv was NULL.");
- return SR_ERR_BUG;
- }
+ if ((devices = connect_usb(conn)))
+ return devices;
- sr_dbg("genericdmm: Opening serial port '%s'.", ctx->serial->port);
+ return NULL;
+}
- switch (ctx->profile->transport) {
- case DMM_TRANSPORT_USBHID:
- /* TODO */
- break;
- case DMM_TRANSPORT_SERIAL:
- /* TODO: O_NONBLOCK? */
- ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR | O_NONBLOCK);
- if (ctx->serial->fd == -1) {
- sr_err("genericdmm: Couldn't open serial port '%s'.",
- ctx->serial->port);
- return SR_ERR;
+static GSList *default_scan(GSList *options)
+{
+ GSList *l, *devices;
+ struct sr_hwopt *opt;
+ const char *conn, *serialcomm;
+
+ devices = NULL;
+ conn = serialcomm = NULL;
+ for (l = options; l; l = l->next) {
+ opt = l->data;
+ switch (opt->hwopt) {
+ case SR_HWOPT_CONN:
+ conn = opt->value;
+ break;
+ case SR_HWOPT_SERIALCOMM:
+ serialcomm = opt->value;
+ break;
}
- // serial_set_params(ctx->serial->fd, 2400, 8, 0, 1, 2);
- break;
- default:
- sr_err("No transport set.");
}
+ if (conn)
+ devices = genericdmm_connect(conn, serialcomm);
- return SR_OK;
+ return devices;
}
-static int hw_dev_close(int dev_index)
+static int open_usb(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
- struct context *ctx;
+ libusb_device **devlist;
+ struct libusb_device_descriptor des;
+ struct dev_context *devc;
+ int ret, tmp, cnt, i;
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: %s: sdi was NULL.", __func__);
- return SR_ERR_BUG;
- }
+ devc = sdi->priv;
- if (!(ctx = sdi->priv)) {
- sr_err("genericdmm: %s: sdi->priv was NULL.", __func__);
- return SR_ERR_BUG;
+ if (sdi->status == SR_ST_ACTIVE)
+ /* already in use */
+ return SR_ERR;
+
+ cnt = libusb_get_device_list(genericdmm_usb_context, &devlist);
+ if (cnt < 0) {
+ sr_err("Failed to retrieve device list (%d).", cnt);
+ return SR_ERR;
}
- /* TODO: Check for != NULL. */
+ ret = SR_ERR;
+ for (i = 0; i < cnt; i++) {
+ if ((tmp = libusb_get_device_descriptor(devlist[i], &des))) {
+ sr_err("Failed to get device descriptor: %d.", tmp);
+ continue;
+ }
- switch (ctx->profile->transport) {
- case DMM_TRANSPORT_USBHID:
- /* TODO */
- break;
- case DMM_TRANSPORT_SERIAL:
- if (ctx->serial && ctx->serial->fd != -1) {
- serial_close(ctx->serial->fd);
- ctx->serial->fd = -1;
- sdi->status = SR_ST_INACTIVE;
+ if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
+ || libusb_get_device_address(devlist[i]) != devc->usb->address)
+ /* this is not the one */
+ continue;
+
+ if ((tmp = libusb_open(devlist[i], &devc->usb->devhdl))) {
+ sr_err("Failed to open device: %d.", tmp);
+ break;
}
+
+ sr_info("Opened device %s on %d.%d.", devc->profile->modelid,
+ devc->usb->bus, devc->usb->address);
+ ret = SR_OK;
break;
}
+ libusb_free_device_list(devlist, 1);
- return SR_OK;
+ return ret;
}
-static int hw_cleanup(void)
+static int clear_instances(void)
{
GSList *l;
struct sr_dev_inst *sdi;
- struct context *ctx;
+ struct dev_context *devc;
+ struct drv_context *drvc;
+
+ if (!(drvc = gdi->priv))
+ return SR_OK;
/* Properly close and free all devices. */
- for (l = genericdmm_dev_insts; l; l = l->next) {
+ for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
- sr_err("genericdmm: sdi was NULL, continuing.");
+ sr_err("sdi was NULL, continuing.");
continue;
}
- if (!(ctx = sdi->priv)) {
+ if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */
- sr_err("genericdmm: sdi->priv was NULL, continuing.");
+ sr_err("sdi->priv was NULL, continuing.");
continue;
}
- if (ctx->profile) {
- switch (ctx->profile->transport) {
+ if (devc->profile) {
+ switch (devc->profile->transport) {
case DMM_TRANSPORT_USBHID:
- /* TODO */
+ sr_usb_dev_inst_free(devc->usb);
break;
case DMM_TRANSPORT_SERIAL:
- if (ctx->serial && ctx->serial->fd != -1)
- serial_close(ctx->serial->fd);
- sr_serial_dev_inst_free(ctx->serial);
+ if (devc->serial && devc->serial->fd != -1)
+ serial_close(devc->serial->fd);
+ sr_serial_dev_inst_free(devc->serial);
break;
}
}
sr_dev_inst_free(sdi);
}
- g_slist_free(genericdmm_dev_insts);
- genericdmm_dev_insts = NULL;
-
- if (genericdmm_usb_context)
- libusb_exit(genericdmm_usb_context);
+ g_slist_free(drvc->instances);
+ drvc->instances = NULL;
return SR_OK;
}
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_init(void)
{
- struct sr_dev_inst *sdi;
- struct context *ctx;
- const void *info;
+ struct drv_context *drvc;
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: sdi was NULL.");
- return NULL;
+ if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
+ sr_err("Driver context malloc failed.");
+ return SR_ERR_MALLOC;
}
- if (!(ctx = sdi->priv)) {
- sr_err("genericdmm: sdi->priv was NULL.");
- return NULL;
+ if (libusb_init(&genericdmm_usb_context) != 0) {
+ sr_err("Failed to initialize USB.");
+ return SR_ERR;
}
- sr_spew("genericdmm: dev_index %d, dev_info_id %d.",
- dev_index, dev_info_id);
-
- switch (dev_info_id) {
- case SR_DI_INST:
- info = sdi;
- sr_spew("genericdmm: Returning sdi.");
- break;
- case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(1);
- sr_spew("genericdmm: Returning number of probes: 1.");
- break;
- case SR_DI_PROBE_NAMES:
- info = probe_names;
- sr_spew("genericdmm: Returning probenames.");
- break;
- case SR_DI_CUR_SAMPLERATE:
- /* TODO get rid of this */
- info = NULL;
- sr_spew("genericdmm: Returning samplerate: 0.");
- break;
- default:
- /* Unknown device info ID. */
- sr_err("genericdmm: Unknown device info ID: %d.", dev_info_id);
- info = NULL;
- break;
- }
+ gdi->priv = drvc;
- return info;
+ return SR_OK;
}
-static int hw_dev_status_get(int dev_index)
+static GSList *hw_scan(GSList *options)
{
+ GSList *l, *ldef, *defopts, *newopts, *devices;
+ struct sr_hwopt *opt, *defopt;
+ struct dev_profile *pr, *profile;
struct sr_dev_inst *sdi;
-
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: sdi was NULL, device not found.");
- return SR_ST_NOT_FOUND;
+ struct drv_context *drvc;
+ struct dev_context *devc;
+ const char *model;
+
+ drvc = gdi->priv;
+
+ /* Separate model from the options list. */
+ model = NULL;
+ newopts = NULL;
+ for (l = options; l; l = l->next) {
+ opt = l->data;
+ if (opt->hwopt == SR_HWOPT_MODEL)
+ model = opt->value;
+ else
+ /* New list with references to the original data. */
+ newopts = g_slist_append(newopts, opt);
+ }
+ if (!model) {
+ /* This driver only works when a model is specified. */
+ return NULL;
}
- sr_dbg("genericdmm: Returning status: %d.", sdi->status);
-
- return sdi->status;
-}
-
-static const int *hw_hwcap_get_all(void)
-{
- sr_spew("genericdmm: Returning list of device capabilities.");
-
- return hwcaps;
-}
-
-static int parse_conn_vidpid(struct sr_dev_inst *sdi, const char *conn)
-{
- struct context *ctx;
- libusb_device **devlist;
- struct libusb_device_descriptor des;
- GRegex *reg;
- GMatchInfo *match;
- int vid, pid, found, err, i;
- char *vidstr, *pidstr;
-
- found = FALSE;
-
- reg = g_regex_new(DMM_CONN_USB_VIDPID, 0, 0, NULL);
- if (g_regex_match(reg, conn, 0, &match)) {
- /* Extract VID. */
- if (!(vidstr = g_match_info_fetch(match, 0))) {
- sr_err("failed to fetch VID from regex");
- goto err;
- }
- vid = strtoul(vidstr, NULL, 16);
- g_free(vidstr);
- if (vid > 0xffff) {
- sr_err("invalid VID");
- goto err;
+ /* Find a profile with this model name. */
+ profile = NULL;
+ for (pr = dev_profiles; pr->modelid; pr++) {
+ if (!strcmp(pr->modelid, model)) {
+ profile = pr;
+ break;
}
+ }
+ if (!profile) {
+ sr_err("Unknown model %s.", model);
+ return NULL;
+ }
- /* Extract PID. */
- if (!(pidstr = g_match_info_fetch(match, 0))) {
- sr_err("failed to fetch PID from regex");
- goto err;
- }
- pid = strtoul(pidstr, NULL, 16);
- g_free(pidstr);
- if (pid > 0xffff) {
- sr_err("invalid PID");
- goto err;
- }
+ /* Initialize the DMM chip driver. */
+ if (profile->chip->init)
+ profile->chip->init();
- /* Looks like a valid VID:PID, but is it connected? */
- libusb_get_device_list(genericdmm_usb_context, &devlist);
- for (i = 0; devlist[i]; i++) {
- if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("genericdmm: failed to get device descriptor: %d", err);
- goto err;
- }
+ /* Convert the profile's default options list to a GSList. */
+ defopts = NULL;
+ for (opt = profile->defaults_opts; opt->hwopt; opt++) {
+ /* New list with references to const data in the profile. */
+ defopts = g_slist_append(defopts, opt);
+ }
- if (des.idVendor == vid && des.idProduct == pid) {
- ctx = sdi->priv;
- ctx->usb = sr_usb_dev_inst_new(
- libusb_get_bus_number(devlist[i]),
- libusb_get_device_address(devlist[i]), NULL);
- found = TRUE;
+ /* Options given as argument to this function override the
+ * profile's default options.
+ */
+ for (ldef = defopts; ldef; ldef = ldef->next) {
+ defopt = ldef->data;
+ for (l = newopts; l; l = l->next) {
+ opt = l->data;
+ if (opt->hwopt == defopt->hwopt) {
+ /* Override the default, and drop it from the
+ * options list.
+ */
+ ldef->data = l->data;
+ newopts = g_slist_remove(newopts, opt);
break;
}
}
- libusb_free_device_list(devlist, 1);
+ }
+ /* Whatever is left in newopts wasn't in the default options. */
+ defopts = g_slist_concat(defopts, newopts);
+ g_slist_free(newopts);
+
+ if (profile->chip->scan)
+ /* The DMM chip driver wants to do its own scanning. */
+ devices = profile->chip->scan(defopts);
+ else
+ devices = default_scan(defopts);
+ g_slist_free(defopts);
+
+ if (devices) {
+ /* TODO: need to fix up sdi->index fields */
+ for (l = devices; l; l = l->next) {
+ /* The default connection-based scanner doesn't really
+ * know about profiles, so it never filled in the vendor
+ * or model. Do that now.
+ */
+ sdi = l->data;
+ devc = sdi->priv;
+ devc->profile = profile;
+ sdi->driver = gdi;
+ if (!sdi->vendor)
+ sdi->vendor = g_strdup(profile->vendor);
+ if (!sdi->model)
+ sdi->model = g_strdup(profile->model);
+ /* Add a copy of these new devices to the driver instances. */
+ drvc->instances = g_slist_append(drvc->instances, l->data);
+ }
}
-err:
- if (match)
- g_match_info_unref(match);
- g_regex_unref(reg);
-
- return found;
+ return devices;
}
-static int parse_conn_busaddr(struct sr_dev_inst *sdi, const char *conn)
+static GSList *hw_dev_list(void)
{
- struct context *ctx;
- libusb_device **devlist;
- struct libusb_device_descriptor des;
- GRegex *reg;
- GMatchInfo *match;
- int bus, addr, found, err, i;
- char *busstr, *addrstr;
+ struct drv_context *drvc;
- found = FALSE;
+ drvc = gdi->priv;
- reg = g_regex_new(DMM_CONN_USB_BUSADDR, 0, 0, NULL);
- if (g_regex_match(reg, conn, 0, &match)) {
- /* Extract bus. */
- if (!(busstr = g_match_info_fetch(match, 0))) {
- sr_err("failed to fetch bus from regex");
- goto err;
- }
- bus = strtoul(busstr, NULL, 16);
- g_free(busstr);
- if (bus > 64) {
- sr_err("invalid bus");
- goto err;
- }
+ return drvc->instances;
+}
- /* Extract address. */
- if (!(addrstr = g_match_info_fetch(match, 0))) {
- sr_err("failed to fetch address from regex");
- goto err;
- }
- addr = strtoul(addrstr, NULL, 16);
- g_free(addrstr);
- if (addr > 127) {
- sr_err("invalid address");
- goto err;
- }
+static int hw_dev_open(struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ int ret;
- /* Looks like a valid bus/address, but is it connected? */
- libusb_get_device_list(genericdmm_usb_context, &devlist);
- for (i = 0; devlist[i]; i++) {
- if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("genericdmm: failed to get device descriptor: %d", err);
- goto err;
- }
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
- if (libusb_get_bus_number(devlist[i]) == bus
- && libusb_get_device_address(devlist[i]) == addr) {
- ctx = sdi->priv;
- ctx->usb = sr_usb_dev_inst_new(bus, addr, NULL);
- found = TRUE;
- break;
- }
+ ret = SR_OK;
+ switch (devc->profile->transport) {
+ case DMM_TRANSPORT_USBHID:
+ ret = open_usb(sdi);
+ break;
+ case DMM_TRANSPORT_SERIAL:
+ sr_dbg("Opening serial port '%s'.", devc->serial->port);
+ devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
+ if (devc->serial->fd == -1) {
+ sr_err("Couldn't open serial port '%s'.",
+ devc->serial->port);
+ ret = SR_ERR;
}
- libusb_free_device_list(devlist, 1);
+ // serial_set_params(devc->serial->fd, 2400, 8, 0, 1, 2);
+ break;
+ default:
+ sr_err("No transport set.");
+ ret = SR_ERR;
}
-err:
- if (match)
- g_match_info_unref(match);
- g_regex_unref(reg);
-
- return found;
+ return ret;
}
-static int parse_conn_serial(struct sr_dev_inst *sdi, const char *conn)
+static int hw_dev_close(struct sr_dev_inst *sdi)
{
- int found;
+ struct dev_context *devc;
- found = FALSE;
+ if (!(devc = sdi->priv)) {
+ sr_err("%s: sdi->priv was NULL.", __func__);
+ return SR_ERR_BUG;
+ }
- /* TODO */
+ switch (devc->profile->transport) {
+ case DMM_TRANSPORT_USBHID:
+ /* TODO */
+ break;
+ case DMM_TRANSPORT_SERIAL:
+ if (devc->serial && devc->serial->fd != -1) {
+ serial_close(devc->serial->fd);
+ devc->serial->fd = -1;
+ sdi->status = SR_ST_INACTIVE;
+ }
+ break;
+ }
- return found;
+ return SR_OK;
}
-static int parse_conn(struct sr_dev_inst *sdi, const char *conn)
+static int hw_cleanup(void)
{
- if (parse_conn_vidpid(sdi, conn))
- return SR_OK;
-
- if (parse_conn_busaddr(sdi, conn))
- return SR_OK;
-
- if (parse_conn_serial(sdi, conn))
- return SR_OK;
+ clear_instances();
- sr_err("Invalid connection specification");
+ if (genericdmm_usb_context)
+ libusb_exit(genericdmm_usb_context);
- return SR_ERR;
+ return SR_OK;
}
-static int parse_serialcomm(struct sr_dev_inst *sdi, const char *conn)
+static int hw_info_get(int info_id, const void **data,
+ const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
- /* TODO */
- /* set ctx->serial_* */
+ (void)sdi;
+ (void)devc;
+
+ switch (info_id) {
+ case SR_DI_HWOPTS:
+ *data = hwopts;
+ break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
+ case SR_DI_NUM_PROBES:
+ *data = GINT_TO_POINTER(1);
+ break;
+ case SR_DI_PROBE_NAMES:
+ *data = probe_names;
+ break;
+ case SR_DI_CUR_SAMPLERATE:
+ /* TODO get rid of this */
+ *data = NULL;
+ return SR_ERR_ARG;
+ break;
+ default:
+ /* Unknown device info ID. */
+ return SR_ERR_ARG;
+ }
return SR_OK;
}
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value)
{
- struct sr_dev_inst *sdi;
- struct context *ctx;
- int i;
-
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: sdi was NULL.");
- return SR_ERR_BUG;
- }
+ struct dev_context *devc;
- if (!(ctx = sdi->priv)) {
- sr_err("genericdmm: sdi->priv was NULL.");
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
- sr_spew("genericdmm: dev_index %d, hwcap %d.", dev_index, hwcap);
-
switch (hwcap) {
case SR_HWCAP_LIMIT_MSEC:
+ /* TODO: not yet implemented */
if (*(const uint64_t *)value == 0) {
- sr_err("genericdmm: LIMIT_MSEC can't be 0.");
+ sr_err("LIMIT_MSEC can't be 0.");
return SR_ERR;
}
- ctx->limit_msec = *(const uint64_t *)value;
- sr_dbg("genericdmm: Setting LIMIT_MSEC to %" PRIu64 ".",
- ctx->limit_msec);
+ devc->limit_msec = *(const uint64_t *)value;
+ sr_dbg("Setting time limit to %" PRIu64 "ms.",
+ devc->limit_msec);
break;
case SR_HWCAP_LIMIT_SAMPLES:
- ctx->limit_samples = *(const uint64_t *)value;
- sr_dbg("genericdmm: Setting LIMIT_SAMPLES to %" PRIu64 ".",
- ctx->limit_samples);
- break;
- case SR_HWCAP_MODEL:
- for (i = 0; dev_profiles[i].model; i++) {
- if (!strcasecmp(dev_profiles[i].model, value)) {
- ctx->profile = &dev_profiles[i];
- /* Frontends access these fields directly, so we
- * need to copy them over. */
- sdi->vendor = g_strdup(dev_profiles[i].vendor);
- sdi->model = g_strdup(dev_profiles[i].model);
- /* This is the first time we actually know which
- * DMM chip we're talking to, so let's init
- * anything specific to it now */
- if (ctx->profile->chip->init)
- if (ctx->profile->chip->init(ctx) != SR_OK)
- return SR_ERR;
- break;
- }
- }
- if (!ctx->profile) {
- sr_err("unknown model %s", value);
- return SR_ERR;
- }
- break;
- case SR_HWCAP_CONN:
- if (parse_conn(sdi, value) != SR_OK)
- return SR_ERR_ARG;
- break;
- case SR_HWCAP_SERIALCOMM:
- if (parse_serialcomm(sdi, value) != SR_OK)
- return SR_ERR_ARG;
+ devc->limit_samples = *(const uint64_t *)value;
+ sr_dbg("Setting sample limit to %" PRIu64 ".",
+ devc->limit_samples);
break;
default:
- sr_err("genericdmm: Unknown capability: %d.", hwcap);
+ sr_err("Unknown capability: %d.", hwcap);
return SR_ERR;
break;
}
static int receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
- struct context *ctx;
+ struct dev_context *devc;
- if (!(sdi = cb_data))
- return FALSE;
+ (void)revents;
- if (!(ctx = sdi->priv))
- return FALSE;
+ if (!(sdi = cb_data))
+ return TRUE;
- if (revents != G_IO_IN) {
- sr_err("genericdmm: No data?");
- return FALSE;
- }
+ if (!(devc = sdi->priv))
+ return TRUE;
- switch (ctx->profile->transport) {
+ switch (devc->profile->transport) {
case DMM_TRANSPORT_USBHID:
- /* TODO */
+ if (devc->profile->chip->data)
+ devc->profile->chip->data(sdi);
break;
case DMM_TRANSPORT_SERIAL:
/* TODO */
+ fd = fd;
break;
}
+ if (devc->num_samples >= devc->limit_samples)
+ hw_dev_acquisition_stop(sdi, cb_data);
+
return TRUE;
}
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+ void *cb_data)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta;
- struct sr_dev_inst *sdi;
- struct context *ctx;
+ struct dev_context *devc;
- if (!(sdi = sr_dev_inst_get(genericdmm_dev_insts, dev_index))) {
- sr_err("genericdmm: sdi was NULL.");
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
- if (!(ctx = sdi->priv)) {
- sr_err("genericdmm: sdi->priv was NULL.");
- return SR_ERR_BUG;
- }
-
- sr_dbg("genericdmm: Starting acquisition.");
+ sr_dbg("Starting acquisition.");
- ctx->cb_data = cb_data;
+ devc->cb_data = cb_data;
/* Send header packet to the session bus. */
- sr_dbg("genericdmm: Sending SR_DF_HEADER.");
+ sr_dbg("Sending SR_DF_HEADER.");
packet.type = SR_DF_HEADER;
packet.payload = (uint8_t *)&header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
- sr_session_send(ctx->cb_data, &packet);
+ sr_session_send(devc->cb_data, &packet);
/* Send metadata about the SR_DF_ANALOG packets to come. */
- sr_dbg("genericdmm: Sending SR_DF_META_ANALOG.");
+ sr_dbg("Sending SR_DF_META_ANALOG.");
packet.type = SR_DF_META_ANALOG;
packet.payload = &meta;
meta.num_probes = 1;
- sr_session_send(ctx->cb_data, &packet);
+ sr_session_send(devc->cb_data, &packet);
/* Hook up a proxy handler to receive data from the device. */
- switch (ctx->profile->transport) {
+ switch (devc->profile->transport) {
case DMM_TRANSPORT_USBHID:
- /* TODO libusb FD setup */
+ /* Callously using stdin here. This works because no G_IO_* flags
+ * are set, but will certainly break when any other driver does
+ * this, and runs at the same time as genericdmm.
+ * We'll need a timeout-only source when revamping the whole
+ * driver source system.
+ */
+ sr_source_add(0, 0, devc->profile->poll_timeout,
+ receive_data, (void *)sdi);
break;
case DMM_TRANSPORT_SERIAL:
/* TODO serial FD setup */
- // sr_source_add(ctx->serial->fd, G_IO_IN, -1, receive_data, sdi);
+ // sr_source_add(devc->serial->fd, G_IO_IN, -1, receive_data, sdi);
break;
}
return SR_OK;
}
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+ void *cb_data)
{
struct sr_datafeed_packet packet;
/* Avoid compiler warnings. */
- (void)dev_index;
+ (void)sdi;
- sr_dbg("genericdmm: Stopping acquisition.");
+ sr_dbg("Stopping acquisition.");
/* Send end packet to the session bus. */
- sr_dbg("genericdmm: Sending SR_DF_END.");
+ sr_dbg("Sending SR_DF_END.");
packet.type = SR_DF_END;
sr_session_send(cb_data, &packet);
+ sr_source_remove(0);
+
return SR_OK;
}
.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,
- .dev_info_get = hw_dev_info_get,
- .dev_status_get = hw_dev_status_get,
- .hwcap_get_all = hw_hwcap_get_all,
+ .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,
};
projects / libsigrok.git / blobdiff