X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=d0b8b806b7adad8f84f80489484664978ed3b90a;hb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;hp=cd50c45d063d62479508765a2b964d97f6a92ecd;hpb=185ae2c5c9ada0353b43e3736e838bbc8e370cb4;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index cd50c45d..d0b8b806 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) 2012 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 @@ -197,7 +197,7 @@ 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; } @@ -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_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, &(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_warn("failed to open device: %d", err); + sr_err("zp: failed to open device: %d", err); *sdi = NULL; } } @@ -245,7 +246,7 @@ static struct sr_device_instance *zp_open_device(int device_index) struct libusb_device_descriptor des; int err, i; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) return NULL; libusb_get_device_list(usb_context, &devlist); @@ -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); @@ -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_warn("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_warn("failed to get device descriptor: %d", err); + sr_err("zp: failed to get device descriptor: %d", err); continue; } @@ -385,7 +386,7 @@ static int hw_init(const char *deviceinfo) * the zeroplus range? */ /* Register the device with libsigrok. */ - sdi = sr_device_instance_new(devcnt, + sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE, USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); if (!sdi) { @@ -398,7 +399,7 @@ static int hw_init(const char *deviceinfo) device_instances = g_slist_append(device_instances, sdi); - zp->usb = sr_usb_device_instance_new( + zp->usb = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); devcnt++; @@ -416,7 +417,7 @@ static int hw_opendev(int device_index) 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; } @@ -429,14 +430,14 @@ static int hw_opendev(int device_index) err = libusb_set_configuration(zp->usb->devhdl, USB_CONFIGURATION); if (err < 0) { - sr_warn("zp: Unable to set USB configuration %d: %d", - USB_CONFIGURATION, err); + 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; } @@ -474,7 +475,7 @@ static int hw_closedev(int device_index) { struct sr_device_instance *sdi; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -485,23 +486,26 @@ static int hw_closedev(int device_index) return SR_OK; } -static void hw_cleanup(void) +static int hw_cleanup(void) { GSList *l; + struct sr_device_instance *sdi; - /* 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); + for (l = device_instances; 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(device_instances); device_instances = 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) @@ -510,7 +514,7 @@ static void *hw_get_device_info(int device_index, int device_info_id) struct zp *zp; void *info; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return NULL; } @@ -553,7 +557,7 @@ static int hw_get_status(int device_index) { struct sr_device_instance *sdi; - sdi = sr_get_device_instance(device_instances, device_index); + sdi = sr_dev_inst_get(device_instances, device_index); if (sdi) return sdi->status; else @@ -600,7 +604,7 @@ static int hw_set_configuration(int device_index, int capability, void *value) uint64_t *tmp_u64; struct zp *zp; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -637,7 +641,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(device_instances, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; } @@ -651,12 +655,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; @@ -664,7 +671,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))) { @@ -678,7 +684,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; @@ -699,7 +705,7 @@ 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; @@ -708,21 +714,23 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) packet.type = SR_DF_END; sr_session_bus(session_device_id, &packet); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("zp: %s: sdi was NULL", __func__); - return; /* FIXME */ + return SR_ERR_BUG; } if (!(zp = sdi->priv)) { sr_err("zp: %s: sdi->priv was NULL", __func__); - return; /* FIXME */ + 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,