X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=9892df0f055e16f8a8ad76e860398f6790ba4997;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=8651e779b959ff537498fbc9039541ced70c3e28;hpb=4cea9eb20dc8d816a67c57d111a3a4529d452e4d;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index 8651e779..9892df0f 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 @@ -17,15 +17,16 @@ * along with this program. If not, see . */ -#include "config.h" #include #include +#include #include #include #include #include -#include -#include +#include "config.h" +#include "sigrok.h" +#include "sigrok-internal.h" #include "analyzer.h" #define USB_VENDOR 0x0c12 @@ -73,6 +74,42 @@ static int capabilities[] = { 0, }; +static const char *probe_names[] = { + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "14", + "15", + "16", + "17", + "18", + "19", + "20", + "21", + "22", + "23", + "24", + "25", + "26", + "27", + "28", + "29", + "30", + "31", + NULL, +}; + /* List of struct sr_device_instance, maintained by opendev()/closedev(). */ static GSList *device_instances = NULL; @@ -88,42 +125,46 @@ static libusb_context *usb_context = NULL; * that high. */ static uint64_t supported_samplerates[] = { - 100, - 500, - KHZ(1), - KHZ(5), - KHZ(25), - KHZ(50), - KHZ(100), - KHZ(200), - KHZ(400), - KHZ(800), - MHZ(1), - MHZ(10), - MHZ(25), - MHZ(50), - MHZ(80), - MHZ(100), - MHZ(150), - MHZ(200), + SR_HZ(100), + SR_HZ(500), + SR_KHZ(1), + SR_KHZ(5), + SR_KHZ(25), + SR_KHZ(50), + SR_KHZ(100), + SR_KHZ(200), + SR_KHZ(400), + SR_KHZ(800), + SR_MHZ(1), + SR_MHZ(10), + SR_MHZ(25), + SR_MHZ(50), + SR_MHZ(80), + SR_MHZ(100), + SR_MHZ(150), + SR_MHZ(200), 0, }; static struct sr_samplerates samplerates = { - 0, 0, 0, + SR_HZ(0), + SR_HZ(0), + SR_HZ(0), supported_samplerates, }; -/* TODO: All of these should go in a device-specific struct. */ -static uint64_t cur_samplerate = 0; -static uint64_t limit_samples = 0; -static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */ -static uint64_t memory_size = 0; -static uint8_t probe_mask = 0; -static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 }; -static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 }; - -// static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 }; +struct zp { + uint64_t cur_samplerate; + uint64_t limit_samples; + int num_channels; /* TODO: This isn't initialized before it's needed :( */ + uint64_t memory_size; + uint8_t probe_mask; + uint8_t trigger_mask[NUM_TRIGGER_STAGES]; + uint8_t trigger_value[NUM_TRIGGER_STAGES]; + // uint8_t trigger_buffer[NUM_TRIGGER_STAGES]; + + struct sr_usb_device_instance *usb; +}; static int hw_set_configuration(int device_index, int capability, void *value); @@ -144,45 +185,52 @@ static unsigned int get_memory_size(int type) static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, struct libusb_device_descriptor *des) { + struct zp *zp; unsigned int i; int err; + /* Note: sdi is non-NULL, the caller already checked this. */ + + if (!(zp = (*sdi)->priv)) { + sr_err("zp: %s: (*sdi)->priv was NULL", __func__); + return -1; + } + if ((err = libusb_get_device_descriptor(dev, des))) { - g_warning("failed to get device descriptor: %d", err); + sr_err("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; - g_message("Found PID=%04X (%s)", des->idProduct, - zeroplus_models[i].model_name); - num_channels = zeroplus_models[i].channels; - memory_size = zeroplus_models[i].sample_depth * 1024; + sr_info("Found PID=%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 (num_channels == 0) { - g_warning("Unknown ZeroPlus device %04X", - des->idProduct); + if (zp->num_channels == 0) { + sr_err("Unknown ZeroPlus device %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; - g_message("opened device %d on %d.%d interface %d", - (*sdi)->index, (*sdi)->usb->bus, - (*sdi)->usb->address, USB_INTERFACE); + sr_info("opened device %d on %d.%d interface %d", + (*sdi)->index, zp->usb->bus, + zp->usb->address, USB_INTERFACE); } else { - g_warning("failed to open device: %d", err); + sr_err("failed to open device: %d", err); *sdi = NULL; } } @@ -222,28 +270,41 @@ static struct sr_device_instance *zp_open_device(int device_index) static void close_device(struct sr_device_instance *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; - g_message("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("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(GSList *probes) +static int configure_probes(struct sr_device_instance *sdi, GSList *probes) { + struct zp *zp; struct sr_probe *probe; GSList *l; int probe_bit, stage, i; char *tc; - probe_mask = 0; + /* Note: sdi and sdi->priv are non-NULL, the caller checked this. */ + zp = sdi->priv; + + zp->probe_mask = 0; for (i = 0; i < NUM_TRIGGER_STAGES; i++) { - trigger_mask[i] = 0; - trigger_value[i] = 0; + zp->trigger_mask[i] = 0; + zp->trigger_value[i] = 0; } stage = -1; @@ -252,14 +313,14 @@ static int configure_probes(GSList *probes) if (probe->enabled == FALSE) continue; probe_bit = 1 << (probe->index - 1); - probe_mask |= probe_bit; + zp->probe_mask |= probe_bit; if (probe->trigger) { stage = 0; for (tc = probe->trigger; *tc; tc++) { - trigger_mask[stage] |= probe_bit; + zp->trigger_mask[stage] |= probe_bit; if (*tc == '1') - trigger_value[stage] |= probe_bit; + zp->trigger_value[stage] |= probe_bit; stage++; if (stage > NUM_TRIGGER_STAGES) return SR_ERR; @@ -280,23 +341,40 @@ static int hw_init(const char *deviceinfo) struct libusb_device_descriptor des; libusb_device **devlist; int err, devcnt, i; + struct zp *zp; /* Avoid compiler warnings. */ - deviceinfo = deviceinfo; + (void)deviceinfo; + + /* Allocate memory for our private driver context. */ + if (!(zp = g_try_malloc(sizeof(struct zp)))) { + sr_err("zp: %s: struct zp malloc failed", __func__); + return 0; + } + + /* Set some sane defaults. */ + zp->cur_samplerate = 0; + zp->limit_samples = 0; + zp->num_channels = 32; /* TODO: This isn't initialized before it's needed :( */ + zp->memory_size = 0; + zp->probe_mask = 0; + memset(zp->trigger_mask, 0, NUM_TRIGGER_STAGES); + memset(zp->trigger_value, 0, NUM_TRIGGER_STAGES); + // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES); if (libusb_init(&usb_context) != 0) { - g_warning("Failed to initialize USB."); + sr_err("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) { - g_warning("failed to get device descriptor: %d", err); + sr_err("failed to get device descriptor: %d", err); continue; } @@ -306,14 +384,21 @@ static int hw_init(const char *deviceinfo) * TODO: Any way to detect specific model/version in * the zeroplus range? */ + /* Register the device with libsigrok. */ sdi = sr_device_instance_new(devcnt, SR_ST_INACTIVE, USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) + if (!sdi) { + sr_err("zp: %s: sr_device_instance_new failed", + __func__); return 0; + } + + sdi->priv = zp; + device_instances = g_slist_append(device_instances, sdi); - sdi->usb = sr_usb_device_instance_new( + zp->usb = sr_usb_device_instance_new( libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); devcnt++; @@ -327,20 +412,36 @@ static int hw_init(const char *deviceinfo) static int hw_opendev(int device_index) { struct sr_device_instance *sdi; + struct zp *zp; int err; if (!(sdi = zp_open_device(device_index))) { - g_warning("unable to open device"); + sr_err("unable to open device"); + return SR_ERR; + } + + /* TODO: Note: sdi is retrieved in zp_open_device(). */ + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } + + 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(sdi->usb->devhdl, USB_INTERFACE); + err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE); if (err != 0) { - g_warning("Unable to claim interface: %d", err); + sr_err("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); @@ -359,22 +460,29 @@ static int hw_opendev(int device_index) #endif analyzer_set_compression(COMPRESSION_NONE); - if (cur_samplerate == 0) { + if (zp->cur_samplerate == 0) { /* Samplerate hasn't been set. Default to the slowest one. */ if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE, - &samplerates.low) == SR_ERR) + &samplerates.list[0]) == SR_ERR) return SR_ERR; } return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int device_index) { struct sr_device_instance *sdi; - if ((sdi = sr_get_device_instance(device_instances, device_index))) - close_device(sdi); + if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); + return SR_ERR; /* TODO: SR_ERR_ARG? */ + } + + /* TODO */ + close_device(sdi); + + return SR_OK; } static void hw_cleanup(void) @@ -399,17 +507,28 @@ static void hw_cleanup(void) static void *hw_get_device_info(int device_index, int device_info_id) { struct sr_device_instance *sdi; - void *info = NULL; + struct zp *zp; + void *info; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); return NULL; + } + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return NULL; + } switch (device_info_id) { case SR_DI_INSTANCE: info = sdi; break; case SR_DI_NUM_PROBES: - info = GINT_TO_POINTER(num_channels); + info = GINT_TO_POINTER(zp->num_channels); + break; + case SR_DI_PROBE_NAMES: + info = probe_names; break; case SR_DI_SAMPLERATES: info = &samplerates; @@ -418,7 +537,12 @@ static void *hw_get_device_info(int device_index, int device_info_id) info = TRIGGER_TYPES; break; case SR_DI_CUR_SAMPLERATE: - info = &cur_samplerate; + info = &zp->cur_samplerate; + break; + default: + /* Unknown device info ID, return NULL. */ + sr_err("zp: %s: Unknown device info ID", __func__); + info = NULL; break; } @@ -441,18 +565,31 @@ static int *hw_get_capabilities(void) return capabilities; } -/* TODO: This will set the same samplerate for all devices. */ -static int set_configuration_samplerate(uint64_t samplerate) +static int set_configuration_samplerate(struct sr_device_instance *sdi, + uint64_t samplerate) { - g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate); - if (samplerate > MHZ(1)) - analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ); - else if (samplerate > KHZ(1)) - analyzer_set_freq(samplerate / KHZ(1), FREQ_SCALE_KHZ); + struct zp *zp; + + if (!sdi) { + sr_err("zp: %s: sdi was NULL", __func__); + return SR_ERR_ARG; + } + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } + + sr_info("zp: Setting samplerate to %" PRIu64 "Hz.", samplerate); + + if (samplerate > SR_MHZ(1)) + analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ); + else if (samplerate > SR_KHZ(1)) + analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ); else analyzer_set_freq(samplerate, FREQ_SCALE_HZ); - cur_samplerate = samplerate; + zp->cur_samplerate = samplerate; return SR_OK; } @@ -461,86 +598,101 @@ static int hw_set_configuration(int device_index, int capability, void *value) { struct sr_device_instance *sdi; uint64_t *tmp_u64; + struct zp *zp; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; + } + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } switch (capability) { case SR_HWCAP_SAMPLERATE: tmp_u64 = value; - return set_configuration_samplerate(*tmp_u64); + return set_configuration_samplerate(sdi, *tmp_u64); case SR_HWCAP_PROBECONFIG: - return configure_probes((GSList *) value); + return configure_probes(sdi, (GSList *)value); case SR_HWCAP_LIMIT_SAMPLES: tmp_u64 = value; - limit_samples = *tmp_u64; + zp->limit_samples = *tmp_u64; return SR_OK; default: return SR_ERR; } } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_start_acquisition(int device_index, gpointer session_data) { struct sr_device_instance *sdi; struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; struct sr_datafeed_header header; + uint64_t samples_read; int res; unsigned int packet_num; unsigned char *buf; + struct zp *zp; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); return SR_ERR; + } + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } /* push configured settings to device */ - analyzer_configure(sdi->usb->devhdl); + analyzer_configure(zp->usb->devhdl); - analyzer_start(sdi->usb->devhdl); - g_message("Waiting for data"); - analyzer_wait_data(sdi->usb->devhdl); + analyzer_start(zp->usb->devhdl); + sr_info("Waiting for data"); + analyzer_wait_data(zp->usb->devhdl); - g_message("Stop address = 0x%x", - analyzer_get_stop_address(sdi->usb->devhdl)); - g_message("Now address = 0x%x", - analyzer_get_now_address(sdi->usb->devhdl)); - g_message("Trigger address = 0x%x", - analyzer_get_trigger_address(sdi->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)); packet.type = SR_DF_HEADER; - packet.length = sizeof(struct sr_datafeed_header); - packet.payload = (unsigned char *)&header; + packet.payload = &header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); - header.samplerate = cur_samplerate; - header.protocol_id = SR_PROTO_RAW; - header.num_logic_probes = num_channels; - header.num_analog_probes = 0; - sr_session_bus(session_device_id, &packet); + header.samplerate = zp->cur_samplerate; + header.num_logic_probes = zp->num_channels; + sr_session_bus(session_data, &packet); - buf = g_malloc(PACKET_SIZE); - if (!buf) - return SR_ERR; - analyzer_read_start(sdi->usb->devhdl); + if (!(buf = g_try_malloc(PACKET_SIZE))) { + sr_err("zp: %s: buf malloc failed", __func__); + return SR_ERR_MALLOC; + } + + samples_read = 0; + analyzer_read_start(zp->usb->devhdl); /* Send the incoming transfer to the session bus. */ - for (packet_num = 0; packet_num < (memory_size * 4 / PACKET_SIZE); + for (packet_num = 0; packet_num < (zp->memory_size * 4 / PACKET_SIZE); packet_num++) { - res = analyzer_read_data(sdi->usb->devhdl, buf, PACKET_SIZE); -#if 0 - g_message("Tried to read %llx bytes, actually read %x bytes", - PACKET_SIZE, res); -#endif + res = analyzer_read_data(zp->usb->devhdl, buf, PACKET_SIZE); + sr_info("Tried to read %llx bytes, actually read %x bytes", + PACKET_SIZE, res); packet.type = SR_DF_LOGIC; - packet.length = PACKET_SIZE; - packet.unitsize = 4; - packet.payload = buf; - sr_session_bus(session_device_id, &packet); + packet.payload = &logic; + logic.length = PACKET_SIZE; + logic.unitsize = 4; + logic.data = buf; + 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; - sr_session_bus(session_device_id, &packet); + sr_session_bus(session_data, &packet); return SR_OK; } @@ -550,29 +702,37 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) { struct sr_datafeed_packet packet; struct sr_device_instance *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_get_device_instance(device_instances, device_index))) { + sr_err("zp: %s: sdi was NULL", __func__); + return; /* FIXME */ + } + + if (!(zp = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return; /* FIXME */ + } - analyzer_reset(sdi->usb->devhdl); + analyzer_reset(zp->usb->devhdl); /* TODO: Need to cancel and free any queued up transfers. */ } -struct sr_device_plugin zeroplus_logic_cube_plugin_info = { - "zeroplus-logic-cube", - "Zeroplus Logic Cube LAP-C series", - 1, - hw_init, - hw_cleanup, - hw_opendev, - hw_closedev, - hw_get_device_info, - hw_get_status, - hw_get_capabilities, - hw_set_configuration, - hw_start_acquisition, - hw_stop_acquisition, +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, + .init = hw_init, + .cleanup = hw_cleanup, + .opendev = hw_opendev, + .closedev = hw_closedev, + .get_device_info = hw_get_device_info, + .get_status = hw_get_status, + .get_capabilities = hw_get_capabilities, + .set_configuration = hw_set_configuration, + .start_acquisition = hw_start_acquisition, + .stop_acquisition = hw_stop_acquisition, };