X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=c61044d6e36192e7a6f975aad925ef8b1beb950e;hb=ffedd0bf5d3abb1eae86db68e336285eddf41778;hp=02ba89d719866242c6216c21fe26b20982c8deae;hpb=57ab7d9f925c0f93ec711c4e6914881e5ff5dfd9;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index 02ba89d7..c61044d6 100644 --- a/hardware/zeroplus-logic-cube/zeroplus.c +++ b/hardware/zeroplus-logic-cube/zeroplus.c @@ -63,7 +63,7 @@ static model_t zeroplus_models[] = { {0x7016, "LAP-C(162000)", 16, 2048, 200}, }; -static int capabilities[] = { +static int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, SR_HWCAP_SAMPLERATE, SR_HWCAP_PROBECONFIG, @@ -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; @@ -163,10 +163,10 @@ struct zp { uint8_t trigger_value[NUM_TRIGGER_STAGES]; // uint8_t trigger_buffer[NUM_TRIGGER_STAGES]; - struct sr_usb_device_instance *usb; + struct sr_usb_dev_inst *usb; }; -static int hw_set_configuration(int device_index, int capability, void *value); +static int hw_set_configuration(int dev_index, int hwcap, void *value); static unsigned int get_memory_size(int type) { @@ -182,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; @@ -197,7 +197,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, } if ((err = libusb_get_device_descriptor(dev, des))) { - sr_err("failed to get device descriptor: %d", err); + sr_err("zp: failed to get device descriptor: %d", err); return -1; } @@ -211,26 +211,27 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, 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_err("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, &(zp->usb->devhdl)))) { (*sdi)->status = SR_ST_ACTIVE; - sr_info("opened device %d on %d.%d interface %d", + sr_info("zp: opened device %d on %d.%d interface %d", (*sdi)->index, zp->usb->bus, zp->usb->address, USB_INTERFACE); } else { - sr_err("failed to open device: %d", err); + sr_err("zp: failed to open device: %d", err); *sdi = NULL; } } @@ -238,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_dev(int dev_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, dev_index))) return NULL; libusb_get_device_list(usb_context, &devlist); @@ -268,7 +269,7 @@ 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_dev(struct sr_dev_inst *sdi) { struct zp *zp; @@ -280,7 +281,7 @@ static void close_device(struct sr_device_instance *sdi) if (!zp->usb->devhdl) return; - sr_info("closing device %d on %d.%d interface %d", sdi->index, + 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); @@ -290,7 +291,7 @@ static void close_device(struct sr_device_instance *sdi) 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; @@ -335,16 +336,16 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) * API callbacks */ -static int hw_init(const char *deviceinfo) +static int hw_init(const char *devinfo) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct libusb_device_descriptor des; libusb_device **devlist; int err, devcnt, i; struct zp *zp; /* Avoid compiler warnings. */ - (void)deviceinfo; + (void)devinfo; /* Allocate memory for our private driver context. */ if (!(zp = g_try_malloc(sizeof(struct zp)))) { @@ -363,7 +364,7 @@ static int hw_init(const char *deviceinfo) // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES); if (libusb_init(&usb_context) != 0) { - sr_err("Failed to initialize USB."); + sr_err("zp: Failed to initialize USB."); return 0; } @@ -374,7 +375,7 @@ static int hw_init(const char *deviceinfo) for (i = 0; devlist[i]; i++) { err = libusb_get_device_descriptor(devlist[i], &des); if (err != 0) { - sr_err("failed to get device descriptor: %d", err); + sr_err("zp: failed to get device descriptor: %d", err); continue; } @@ -385,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); - zp->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++; @@ -409,18 +409,18 @@ static int hw_init(const char *deviceinfo) return devcnt; } -static int hw_opendev(int device_index) +static int hw_opendev(int dev_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct zp *zp; int err; - if (!(sdi = zp_open_device(device_index))) { - sr_err("unable to open device"); + if (!(sdi = zp_open_dev(dev_index))) { + sr_err("zp: unable to open device"); return SR_ERR; } - /* TODO: Note: sdi is retrieved in zp_open_device(). */ + /* TODO: Note: sdi is retrieved in zp_open_dev(). */ if (!(zp = sdi->priv)) { sr_err("zp: %s: sdi->priv was NULL", __func__); @@ -436,7 +436,7 @@ static int hw_opendev(int device_index) err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE); if (err != 0) { - sr_err("Unable to claim interface: %d", err); + sr_err("zp: Unable to claim interface: %d", err); return SR_ERR; } @@ -462,7 +462,7 @@ static int hw_opendev(int device_index) if (zp->cur_samplerate == 0) { /* Samplerate hasn't been set. Default to the slowest one. */ - if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE, + if (hw_set_configuration(dev_index, SR_HWCAP_SAMPLERATE, &samplerates.list[0]) == SR_ERR) return SR_ERR; } @@ -470,17 +470,17 @@ static int hw_opendev(int device_index) return SR_OK; } -static int hw_closedev(int device_index) +static int hw_closedev(int dev_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, dev_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } /* TODO */ - close_device(sdi); + close_dev(sdi); return SR_OK; } @@ -488,18 +488,17 @@ static int hw_closedev(int device_index) static int hw_cleanup(void) { GSList *l; - - /* TODO: Error handling. */ - - /* 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_dev(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); @@ -508,13 +507,13 @@ static int hw_cleanup(void) return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static void *hw_get_dev_info(int dev_index, int dev_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, dev_index))) { sr_err("zp: %s: sdi was NULL", __func__); return NULL; } @@ -524,8 +523,8 @@ static void *hw_get_device_info(int device_index, int device_info_id) return NULL; } - switch (device_info_id) { - case SR_DI_INSTANCE: + switch (dev_info_id) { + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: @@ -553,23 +552,23 @@ static void *hw_get_device_info(int device_index, int device_info_id) return info; } -static int hw_get_status(int device_index) +static int hw_get_status(int dev_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, dev_index); if (sdi) return sdi->status; else return SR_ST_NOT_FOUND; } -static int *hw_get_capabilities(void) +static int *hw_hwcap_get_all(void) { - return capabilities; + return hwcaps; } -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; @@ -598,13 +597,13 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi, return SR_OK; } -static int hw_set_configuration(int device_index, int capability, void *value) +static int hw_set_configuration(int dev_index, int hwcap, 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, dev_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -614,7 +613,7 @@ static int hw_set_configuration(int device_index, int capability, void *value) return SR_ERR_ARG; } - switch (capability) { + switch (hwcap) { case SR_HWCAP_SAMPLERATE: tmp_u64 = value; return set_configuration_samplerate(sdi, *tmp_u64); @@ -629,9 +628,9 @@ static int hw_set_configuration(int device_index, int capability, void *value) } } -static int hw_start_acquisition(int device_index, gpointer session_data) +static int hw_start_acquisition(int dev_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; @@ -641,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, dev_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -655,12 +654,15 @@ static int hw_start_acquisition(int device_index, gpointer session_data) analyzer_configure(zp->usb->devhdl); analyzer_start(zp->usb->devhdl); - sr_info("Waiting for data"); + sr_info("zp: Waiting for data"); analyzer_wait_data(zp->usb->devhdl); - sr_info("Stop address = 0x%x", analyzer_get_stop_address(zp->usb->devhdl)); - sr_info("Now address = 0x%x", analyzer_get_now_address(zp->usb->devhdl)); - sr_info("Trigger address = 0x%x", analyzer_get_trigger_address(zp->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; @@ -681,7 +683,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) for (packet_num = 0; packet_num < (zp->memory_size * 4 / PACKET_SIZE); packet_num++) { res = analyzer_read_data(zp->usb->devhdl, buf, PACKET_SIZE); - sr_info("Tried to read %llx bytes, actually read %x bytes", + sr_info("zp: Tried to read %llx bytes, actually read %x bytes", PACKET_SIZE, res); packet.type = SR_DF_LOGIC; @@ -701,17 +703,17 @@ static int hw_start_acquisition(int device_index, gpointer session_data) return SR_OK; } -/* This stops acquisition on ALL devices, ignoring device_index. */ -static int hw_stop_acquisition(int device_index, gpointer session_device_id) +/* This stops acquisition on ALL devices, ignoring dev_index. */ +static int hw_stop_acquisition(int dev_index, gpointer session_dev_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); + sr_session_bus(session_dev_id, &packet); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR_BUG; } @@ -727,7 +729,7 @@ static int hw_stop_acquisition(int device_index, gpointer session_device_id) return SR_OK; } -SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = { +SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = { .name = "zeroplus-logic-cube", .longname = "Zeroplus Logic Cube LAP-C series", .api_version = 1, @@ -735,9 +737,9 @@ SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = { .cleanup = hw_cleanup, .opendev = hw_opendev, .closedev = hw_closedev, - .get_device_info = hw_get_device_info, + .get_dev_info = hw_get_dev_info, .get_status = hw_get_status, - .get_capabilities = hw_get_capabilities, + .hwcap_get_all = hw_hwcap_get_all, .set_configuration = hw_set_configuration, .start_acquisition = hw_start_acquisition, .stop_acquisition = hw_stop_acquisition,