X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=722aed6f50bcd8f8fd7a42c5ae356118e48803ce;hb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;hp=6966ff83f103dba8cbe9870ab045fb265679775c;hpb=c31e9ef49b84b61a353168956882140e2b5a93bb;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index 6966ff83..722aed6f 100644 --- a/hardware/zeroplus-logic-cube/zeroplus.c +++ b/hardware/zeroplus-logic-cube/zeroplus.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -110,8 +110,8 @@ static const char *probe_names[] = { NULL, }; -/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ -static GSList *device_instances = NULL; +/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */ +static GSList *dev_insts = NULL; static libusb_context *usb_context = NULL; @@ -155,7 +155,6 @@ static struct sr_samplerates samplerates = { struct zp { uint64_t cur_samplerate; - uint64_t period_ps; uint64_t limit_samples; int num_channels; /* TODO: This isn't initialized before it's needed :( */ uint64_t memory_size; @@ -163,6 +162,8 @@ struct zp { uint8_t trigger_mask[NUM_TRIGGER_STAGES]; uint8_t trigger_value[NUM_TRIGGER_STAGES]; // uint8_t trigger_buffer[NUM_TRIGGER_STAGES]; + + struct sr_usb_dev_inst *usb; }; static int hw_set_configuration(int device_index, int capability, void *value); @@ -181,7 +182,7 @@ static unsigned int get_memory_size(int type) return 0; } -static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, +static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev, struct libusb_device_descriptor *des) { struct zp *zp; @@ -196,40 +197,41 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, } if ((err = libusb_get_device_descriptor(dev, des))) { - sr_warn("failed to get device descriptor: %d", err); + sr_err("zp: failed to get device descriptor: %d", err); return -1; } if (des->idVendor != USB_VENDOR) return 0; - if (libusb_get_bus_number(dev) == (*sdi)->usb->bus - && libusb_get_device_address(dev) == (*sdi)->usb->address) { + if (libusb_get_bus_number(dev) == zp->usb->bus + && libusb_get_device_address(dev) == zp->usb->address) { for (i = 0; i < ARRAY_SIZE(zeroplus_models); i++) { if (!(des->idProduct == zeroplus_models[i].pid)) continue; - sr_info("Found PID=%04X (%s)", des->idProduct, - zeroplus_models[i].model_name); + sr_info("zp: Found ZeroPlus device 0x%04x (%s)", + des->idProduct, zeroplus_models[i].model_name); zp->num_channels = zeroplus_models[i].channels; zp->memory_size = zeroplus_models[i].sample_depth * 1024; break; } if (zp->num_channels == 0) { - sr_warn("Unknown ZeroPlus device %04X", des->idProduct); + sr_err("zp: Unknown ZeroPlus device 0x%04x", + des->idProduct); return -2; } /* Found it. */ - if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) { + if (!(err = libusb_open(dev, &(zp->usb->devhdl)))) { (*sdi)->status = SR_ST_ACTIVE; - sr_info("opened device %d on %d.%d interface %d", - (*sdi)->index, (*sdi)->usb->bus, - (*sdi)->usb->address, USB_INTERFACE); + sr_info("zp: opened device %d on %d.%d interface %d", + (*sdi)->index, zp->usb->bus, + zp->usb->address, USB_INTERFACE); } else { - sr_warn("failed to open device: %d", err); + sr_err("zp: failed to open device: %d", err); *sdi = NULL; } } @@ -237,14 +239,14 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, return 0; } -static struct sr_device_instance *zp_open_device(int device_index) +static struct sr_dev_inst *zp_open_device(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; libusb_device **devlist; struct libusb_device_descriptor des; int err, i; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) return NULL; libusb_get_device_list(usb_context, &devlist); @@ -267,20 +269,29 @@ static struct sr_device_instance *zp_open_device(int device_index) return sdi; } -static void close_device(struct sr_device_instance *sdi) +static void close_device(struct sr_dev_inst *sdi) { - if (!sdi->usb->devhdl) + struct zp *zp; + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return; /* FIXME */ + } + + if (!zp->usb->devhdl) return; - sr_info("closing device %d on %d.%d interface %d", sdi->index, - sdi->usb->bus, sdi->usb->address, USB_INTERFACE); - libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE); - libusb_close(sdi->usb->devhdl); - sdi->usb->devhdl = NULL; + sr_info("zp: closing device %d on %d.%d interface %d", sdi->index, + zp->usb->bus, zp->usb->address, USB_INTERFACE); + libusb_release_interface(zp->usb->devhdl, USB_INTERFACE); + libusb_reset_device(zp->usb->devhdl); + libusb_close(zp->usb->devhdl); + zp->usb->devhdl = NULL; + /* TODO: Call libusb_exit() here or only in hw_cleanup()? */ sdi->status = SR_ST_INACTIVE; } -static int configure_probes(struct sr_device_instance *sdi, GSList *probes) +static int configure_probes(struct sr_dev_inst *sdi, GSList *probes) { struct zp *zp; struct sr_probe *probe; @@ -327,7 +338,7 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) static int hw_init(const char *deviceinfo) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct libusb_device_descriptor des; libusb_device **devlist; int err, devcnt, i; @@ -344,7 +355,6 @@ static int hw_init(const char *deviceinfo) /* Set some sane defaults. */ zp->cur_samplerate = 0; - zp->period_ps = 0; zp->limit_samples = 0; zp->num_channels = 32; /* TODO: This isn't initialized before it's needed :( */ zp->memory_size = 0; @@ -354,18 +364,18 @@ static int hw_init(const char *deviceinfo) // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES); if (libusb_init(&usb_context) != 0) { - sr_warn("Failed to initialize USB."); + sr_err("zp: Failed to initialize USB."); return 0; } /* Find all ZeroPlus analyzers and add them to device list. */ devcnt = 0; - libusb_get_device_list(usb_context, &devlist); + libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */ for (i = 0; devlist[i]; i++) { err = libusb_get_device_descriptor(devlist[i], &des); if (err != 0) { - sr_warn("failed to get device descriptor: %d", err); + sr_err("zp: failed to get device descriptor: %d", err); continue; } @@ -376,20 +386,19 @@ static int hw_init(const char *deviceinfo) * the zeroplus range? */ /* Register the device with libsigrok. */ - sdi = sr_device_instance_new(devcnt, + if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE, USB_VENDOR_NAME, - USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) { - sr_err("zp: %s: sr_device_instance_new failed", + USB_MODEL_NAME, USB_MODEL_VERSION))) { + sr_err("zp: %s: sr_dev_inst_new failed", __func__); return 0; } sdi->priv = zp; - device_instances = - g_slist_append(device_instances, sdi); - sdi->usb = sr_usb_device_instance_new( + dev_insts = + g_slist_append(dev_insts, sdi); + zp->usb = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); devcnt++; @@ -402,12 +411,12 @@ static int hw_init(const char *deviceinfo) static int hw_opendev(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct zp *zp; int err; if (!(sdi = zp_open_device(device_index))) { - sr_warn("unable to open device"); + sr_err("zp: unable to open device"); return SR_ERR; } @@ -418,13 +427,21 @@ static int hw_opendev(int device_index) return SR_ERR_ARG; } - err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE); + err = libusb_set_configuration(zp->usb->devhdl, USB_CONFIGURATION); + if (err < 0) { + sr_err("zp: Unable to set USB configuration %d: %d", + USB_CONFIGURATION, err); + return SR_ERR; + } + + err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE); if (err != 0) { - sr_warn("Unable to claim interface: %d", err); + sr_err("zp: Unable to claim interface: %d", err); return SR_ERR; } - analyzer_reset(sdi->usb->devhdl); - analyzer_initialize(sdi->usb->devhdl); + + analyzer_reset(zp->usb->devhdl); + analyzer_initialize(zp->usb->devhdl); analyzer_set_memory_size(MEMORY_SIZE_512K); // analyzer_set_freq(g_freq, g_freq_scale); @@ -455,9 +472,9 @@ static int hw_opendev(int device_index) static int hw_closedev(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -468,32 +485,35 @@ static int hw_closedev(int device_index) return SR_OK; } -static void hw_cleanup(void) +static int hw_cleanup(void) { GSList *l; - - /* Properly close all devices... */ - for (l = device_instances; l; l = l->next) - close_device((struct sr_device_instance *)l->data); - - /* ...and free all their memory. */ - for (l = device_instances; l; l = l->next) - g_free(l->data); - g_slist_free(device_instances); - device_instances = NULL; + struct sr_dev_inst *sdi; + + for (l = dev_insts; l; l = l->next) { + sdi = l->data; + /* Properly close all devices... */ + close_device(sdi); + /* ...and free all their memory. */ + sr_dev_inst_free(sdi); + } + g_slist_free(dev_insts); + dev_insts = NULL; if (usb_context) libusb_exit(usb_context); usb_context = NULL; + + return SR_OK; } static void *hw_get_device_info(int device_index, int device_info_id) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct zp *zp; void *info; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return NULL; } @@ -534,9 +554,9 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; - sdi = sr_get_device_instance(device_instances, device_index); + sdi = sr_dev_inst_get(dev_insts, device_index); if (sdi) return sdi->status; else @@ -548,7 +568,7 @@ static int *hw_get_capabilities(void) return capabilities; } -static int set_configuration_samplerate(struct sr_device_instance *sdi, +static int set_configuration_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate) { struct zp *zp; @@ -573,18 +593,17 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi, analyzer_set_freq(samplerate, FREQ_SCALE_HZ); zp->cur_samplerate = samplerate; - zp->period_ps = 1000000000000 / samplerate; return SR_OK; } static int hw_set_configuration(int device_index, int capability, void *value) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; uint64_t *tmp_u64; struct zp *zp; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -611,7 +630,7 @@ static int hw_set_configuration(int device_index, int capability, void *value) static int hw_start_acquisition(int device_index, gpointer session_data) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; struct sr_datafeed_header header; @@ -621,7 +640,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) unsigned char *buf; struct zp *zp; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -632,15 +651,18 @@ static int hw_start_acquisition(int device_index, gpointer session_data) } /* push configured settings to device */ - analyzer_configure(sdi->usb->devhdl); + analyzer_configure(zp->usb->devhdl); - analyzer_start(sdi->usb->devhdl); - sr_info("Waiting for data"); - analyzer_wait_data(sdi->usb->devhdl); + analyzer_start(zp->usb->devhdl); + sr_info("zp: Waiting for data"); + analyzer_wait_data(zp->usb->devhdl); - sr_info("Stop address = 0x%x", analyzer_get_stop_address(sdi->usb->devhdl)); - sr_info("Now address = 0x%x", analyzer_get_now_address(sdi->usb->devhdl)); - sr_info("Trigger address = 0x%x", analyzer_get_trigger_address(sdi->usb->devhdl)); + sr_info("zp: Stop address = 0x%x", + analyzer_get_stop_address(zp->usb->devhdl)); + sr_info("zp: Now address = 0x%x", + analyzer_get_now_address(zp->usb->devhdl)); + sr_info("zp: Trigger address = 0x%x", + analyzer_get_trigger_address(zp->usb->devhdl)); packet.type = SR_DF_HEADER; packet.payload = &header; @@ -648,7 +670,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data) gettimeofday(&header.starttime, NULL); header.samplerate = zp->cur_samplerate; header.num_logic_probes = zp->num_channels; - header.num_analog_probes = 0; sr_session_bus(session_data, &packet); if (!(buf = g_try_malloc(PACKET_SIZE))) { @@ -657,17 +678,15 @@ static int hw_start_acquisition(int device_index, gpointer session_data) } samples_read = 0; - analyzer_read_start(sdi->usb->devhdl); + analyzer_read_start(zp->usb->devhdl); /* Send the incoming transfer to the session bus. */ for (packet_num = 0; packet_num < (zp->memory_size * 4 / PACKET_SIZE); packet_num++) { - res = analyzer_read_data(sdi->usb->devhdl, buf, PACKET_SIZE); - sr_info("Tried to read %llx bytes, actually read %x bytes", + res = analyzer_read_data(zp->usb->devhdl, buf, PACKET_SIZE); + sr_info("zp: Tried to read %llx bytes, actually read %x bytes", PACKET_SIZE, res); packet.type = SR_DF_LOGIC; - packet.timeoffset = samples_read * zp->period_ps; - packet.duration = res / 4 * zp->period_ps; packet.payload = &logic; logic.length = PACKET_SIZE; logic.unitsize = 4; @@ -675,7 +694,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) sr_session_bus(session_data, &packet); samples_read += res / 4; } - analyzer_read_stop(sdi->usb->devhdl); + analyzer_read_stop(zp->usb->devhdl); g_free(buf); packet.type = SR_DF_END; @@ -685,22 +704,32 @@ static int hw_start_acquisition(int device_index, gpointer session_data) } /* This stops acquisition on ALL devices, ignoring device_index. */ -static void hw_stop_acquisition(int device_index, gpointer session_device_id) +static int hw_stop_acquisition(int device_index, gpointer session_device_id) { struct sr_datafeed_packet packet; - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; + struct zp *zp; packet.type = SR_DF_END; sr_session_bus(session_device_id, &packet); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return; /* TODO: Cry? */ + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); + return SR_ERR_BUG; + } - analyzer_reset(sdi->usb->devhdl); + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_BUG; + } + + analyzer_reset(zp->usb->devhdl); /* TODO: Need to cancel and free any queued up transfers. */ + + return SR_OK; } -struct sr_device_plugin zeroplus_logic_cube_plugin_info = { +SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = { .name = "zeroplus-logic-cube", .longname = "Zeroplus Logic Cube LAP-C series", .api_version = 1,