X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=875291ee9a63de5574fee21165e3a56cb11c0409;hb=340cfac0f0629aa3ee84a0a4db53381d04079fe3;hp=0c3d25bc803ca29e2dc7d157423f237460c043f7;hpb=5a2326a71b3a7d3bc6b367a7a3dfa6f137f5f0ec;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index 0c3d25bc..875291ee 100644 --- a/hardware/zeroplus-logic-cube/zeroplus.c +++ b/hardware/zeroplus-logic-cube/zeroplus.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include "config.h" #include #include #include @@ -24,7 +25,7 @@ #include #include #include -#include "config.h" +#include #include "analyzer.h" #define USB_VENDOR 0x0c12 @@ -51,7 +52,7 @@ typedef struct { * Note -- 16032, 16064 and 16128 *usually* -- but not always -- have the * same 128K sample depth. */ -model_t zeroplus_models[] = { +static model_t zeroplus_models[] = { {0x7009, "LAP-C(16064)", 16, 64, 100}, {0x700A, "LAP-C(16128)", 16, 128, 200}, {0x700B, "LAP-C(32128)", 32, 128, 200}, @@ -87,37 +88,39 @@ 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 samplerates samplerates = { - 0, 0, 0, +static struct sr_samplerates samplerates = { + 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; -int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */ -uint64_t memory_size = 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 }; @@ -147,7 +150,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, int err; if ((err = libusb_get_device_descriptor(dev, des))) { - g_warning("failed to get device descriptor: %d", err); + sr_warn("failed to get device descriptor: %d", err); return -1; } @@ -161,27 +164,26 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, if (!(des->idProduct == zeroplus_models[i].pid)) continue; - g_message("Found PID=%04X (%s)", des->idProduct, - zeroplus_models[i].model_name); + sr_info("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; break; } if (num_channels == 0) { - g_warning("Unknown ZeroPlus device %04X", - des->idProduct); + sr_warn("Unknown ZeroPlus device %04X", des->idProduct); return -2; } /* Found it. */ if (!(err = libusb_open(dev, &((*sdi)->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, (*sdi)->usb->bus, + (*sdi)->usb->address, USB_INTERFACE); } else { - g_warning("failed to open device: %d", err); + sr_warn("failed to open device: %d", err); *sdi = NULL; } } @@ -189,7 +191,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, return 0; } -struct sr_device_instance *zp_open_device(int device_index) +static struct sr_device_instance *zp_open_device(int device_index) { struct sr_device_instance *sdi; libusb_device **devlist; @@ -224,8 +226,8 @@ static void close_device(struct sr_device_instance *sdi) if (!sdi->usb->devhdl) return; - g_message("closing device %d on %d.%d interface %d", sdi->index, - sdi->usb->bus, sdi->usb->address, USB_INTERFACE); + 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; @@ -234,7 +236,7 @@ static void close_device(struct sr_device_instance *sdi) static int configure_probes(GSList *probes) { - struct probe *probe; + struct sr_probe *probe; GSList *l; int probe_bit, stage, i; char *tc; @@ -247,7 +249,7 @@ static int configure_probes(GSList *probes) stage = -1; for (l = probes; l; l = l->next) { - probe = (struct probe *)l->data; + probe = (struct sr_probe *)l->data; if (probe->enabled == FALSE) continue; probe_bit = 1 << (probe->index - 1); @@ -273,7 +275,7 @@ static int configure_probes(GSList *probes) * API callbacks */ -static int hw_init(char *deviceinfo) +static int hw_init(const char *deviceinfo) { struct sr_device_instance *sdi; struct libusb_device_descriptor des; @@ -284,7 +286,7 @@ static int hw_init(char *deviceinfo) deviceinfo = deviceinfo; if (libusb_init(&usb_context) != 0) { - g_warning("Failed to initialize USB."); + sr_warn("Failed to initialize USB."); return 0; } @@ -295,7 +297,7 @@ static int hw_init(char *deviceinfo) 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_warn("failed to get device descriptor: %d", err); continue; } @@ -329,13 +331,13 @@ static int hw_opendev(int device_index) int err; if (!(sdi = zp_open_device(device_index))) { - g_warning("unable to open device"); + sr_warn("unable to open device"); return SR_ERR; } err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE); if (err != 0) { - g_warning("Unable to claim interface: %d", err); + sr_warn("Unable to claim interface: %d", err); return SR_ERR; } analyzer_reset(sdi->usb->devhdl); @@ -368,12 +370,19 @@ static int hw_opendev(int device_index) 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("lap-c: %s: sdi was NULL", __func__); + return SR_ERR; /* TODO: SR_ERR_ARG? */ + } + + /* TODO */ + close_device(sdi); + + return SR_OK; } static void hw_cleanup(void) @@ -443,11 +452,11 @@ static int *hw_get_capabilities(void) /* TODO: This will set the same samplerate for all devices. */ static int set_configuration_samplerate(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); + sr_info("%s(%" PRIu64 ")", __FUNCTION__, 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); @@ -495,15 +504,15 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) analyzer_configure(sdi->usb->devhdl); analyzer_start(sdi->usb->devhdl); - g_message("Waiting for data"); + sr_info("Waiting for data"); analyzer_wait_data(sdi->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(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)); packet.type = SR_DF_HEADER; packet.length = sizeof(struct sr_datafeed_header); @@ -514,32 +523,34 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) header.protocol_id = SR_PROTO_RAW; header.num_logic_probes = num_channels; header.num_analog_probes = 0; - session_bus(session_device_id, &packet); + sr_session_bus(session_device_id, &packet); + + if (!(buf = g_try_malloc(PACKET_SIZE))) { + sr_err("lap-c: %s: buf malloc failed", __func__); + return SR_ERR_MALLOC; + } - buf = g_malloc(PACKET_SIZE); - if (!buf) - return SR_ERR; analyzer_read_start(sdi->usb->devhdl); /* Send the incoming transfer to the session bus. */ for (packet_num = 0; packet_num < (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); + sr_info("Tried to read %llx bytes, actually read %x bytes", + PACKET_SIZE, res); #endif packet.type = SR_DF_LOGIC; packet.length = PACKET_SIZE; packet.unitsize = 4; packet.payload = buf; - session_bus(session_device_id, &packet); + sr_session_bus(session_device_id, &packet); } analyzer_read_stop(sdi->usb->devhdl); g_free(buf); packet.type = SR_DF_END; - session_bus(session_device_id, &packet); + sr_session_bus(session_device_id, &packet); return SR_OK; } @@ -551,7 +562,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) struct sr_device_instance *sdi; packet.type = SR_DF_END; - session_bus(session_device_id, &packet); + sr_session_bus(session_device_id, &packet); if (!(sdi = sr_get_device_instance(device_instances, device_index))) return; /* TODO: Cry? */ @@ -561,17 +572,17 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) } 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, + .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, };