X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=b3b78d2a03ce8c429604f5958cc284cb0b2feedd;hb=d658e348a89c5dd3d248abdbbdf5423465a2d344;hp=768d0f74a1fd4593113ab681d43f282dd9e9a0fa;hpb=08cfe6a2b755367eba4098195557f4e8e426eea4;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 768d0f74..b3b78d2a 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -23,8 +23,8 @@ #include #include #include +#include #include "config.h" -#include "sigrok.h" #define USB_VENDOR 0x0925 #define USB_PRODUCT 0x3881 @@ -37,14 +37,14 @@ #define NUM_PROBES 8 #define NUM_TRIGGER_STAGES 4 #define TRIGGER_TYPES "01" -#define FIRMWARE FIRMWARE_DIR "/saleae-logic.firmware" +#define FIRMWARE FIRMWARE_DIR "/saleae-logic.fw" /* delay in ms */ #define FIRMWARE_RENUM_DELAY 2000 #define NUM_SIMUL_TRANSFERS 10 #define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) -/* software trigger implementation: positive values indicate trigger stage */ +/* Software trigger implementation: positive values indicate trigger stage. */ #define TRIGGER_FIRED -1 /* There is only one model Saleae Logic, and this is what it supports: */ @@ -66,7 +66,7 @@ static GSList *device_instances = NULL; * upgrade -- this is like a global lock. No device will open until a proper * delay after the last device was upgraded. */ -GTimeVal firmware_updated = { 0 }; +GTimeVal firmware_updated = { 0, 0 }; static libusb_context *usb_context = NULL; @@ -98,12 +98,15 @@ 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 }; + int trigger_stage = TRIGGER_FIRED; static int hw_set_configuration(int device_index, int capability, void *value); +static void hw_stop_acquisition(int device_index, gpointer session_device_id); -/* returns 1 if the device's configuration profile match the Logic firmware's - * configuration, 0 otherwise +/* + * Returns 1 if the device's configuration profile match the Logic firmware's + * configuration, 0 otherwise. */ int check_conf_profile(libusb_device *dev) { @@ -197,8 +200,8 @@ static int opendev2(int device_index, struct sigrok_device_instance **sdi, return 0; } -static int opendev3(int device_index, struct sigrok_device_instance **sdi, - libusb_device *dev, struct libusb_device_descriptor *des) +static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev, + struct libusb_device_descriptor *des) { int err; @@ -259,7 +262,7 @@ struct sigrok_device_instance *sl_open_device(int device_index) libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { /* TODO: Error handling. */ - err = opendev3(device_index, &sdi, devlist[i], &des); + err = opendev3(&sdi, devlist[i], &des); } } else { /* Status must be ST_ACTIVE, i.e. already in use... */ @@ -300,7 +303,7 @@ static void close_device(struct sigrok_device_instance *sdi) sdi->status = ST_INACTIVE; } -static int configure_probes(GSList * probes) +static int configure_probes(GSList *probes) { struct probe *probe; GSList *l; @@ -356,6 +359,9 @@ static int hw_init(char *deviceinfo) libusb_device **devlist; int err, devcnt, i; + /* QUICK HACK */ + deviceinfo = deviceinfo; + if (libusb_init(&usb_context) != 0) { g_warning("Failed to initialize USB."); return 0; @@ -388,16 +394,16 @@ static int hw_init(char *deviceinfo) * or uploading the firmware again. */ if (upload_firmware(devlist[i]) > 0) - g_warning("firmware upload failed for device %d", devcnt); + g_warning("firmware upload failed for " + "device %d", devcnt); sdi->usb = usb_device_instance_new - (libusb_get_bus_number(devlist[i]), 0, NULL); + (libusb_get_bus_number(devlist[i]), 0, NULL); } else { /* Already has the firmware, so fix the new address. */ sdi->usb = usb_device_instance_new (libusb_get_bus_number(devlist[i]), - libusb_get_device_address(devlist[i]), - NULL); + libusb_get_device_address(devlist[i]), NULL); } devcnt++; } @@ -443,7 +449,7 @@ static int hw_opendev(int device_index) if (cur_samplerate == 0) { /* Samplerate hasn't been set; default to the slowest one. */ if (hw_set_configuration(device_index, HWCAP_SAMPLERATE, - &supported_samplerates[0]) == SIGROK_ERR) + &supported_samplerates[0]) == SIGROK_ERR) return SIGROK_ERR; } @@ -536,7 +542,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, if (supported_samplerates[i] == 0) return SIGROK_ERR_SAMPLERATE; - divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1; + divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1; g_message("setting samplerate to %" PRIu64 " Hz (divider %d)", samplerate, divider); @@ -581,13 +587,18 @@ static int receive_data(int fd, int revents, void *user_data) { struct timeval tv; + /* QUICK HACK */ + fd = fd; + revents = revents; + user_data = user_data; + tv.tv_sec = tv.tv_usec = 0; libusb_handle_events_timeout(usb_context, &tv); return TRUE; } -static void trigger_helper(int i, unsigned char *cur_buf, int cur_buflen, +static void trigger_helper(int i, unsigned char *cur_buf, struct datafeed_packet *packet, void *user_data, int *trigger_offset) { @@ -658,7 +669,8 @@ void receive_transfer(struct libusb_transfer *transfer) * transfer that come in. */ if (num_samples == -1) { - libusb_free_transfer(transfer); + if (transfer) + libusb_free_transfer(transfer); return; } @@ -686,9 +698,7 @@ void receive_transfer(struct libusb_transfer *transfer) * The FX2 gave up. End the acquisition, the frontend * will work out that the samplecount is short. */ - packet.type = DF_END; - session_bus(user_data, &packet); - num_samples = -1; + hw_stop_acquisition(-1, user_data); } return; } else { @@ -698,8 +708,8 @@ void receive_transfer(struct libusb_transfer *transfer) trigger_offset = 0; if (trigger_stage >= 0) { for (i = 0; i < cur_buflen; i++) { - trigger_helper(i, cur_buf, cur_buflen, &packet, - user_data, &trigger_offset); + trigger_helper(i, cur_buf, &packet, user_data, + &trigger_offset); } } @@ -712,11 +722,8 @@ void receive_transfer(struct libusb_transfer *transfer) g_free(cur_buf); num_samples += cur_buflen; - if (num_samples > limit_samples) { - /* End the acquisition. */ - packet.type = DF_END; - session_bus(user_data, &packet); - num_samples = -1; + if ((unsigned int)num_samples > limit_samples) { + hw_stop_acquisition(-1, user_data); } } else { /* @@ -763,7 +770,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) lupfd = libusb_get_pollfds(usb_context); for (i = 0; lupfd[i]; i++) - source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data, + source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data, NULL); free(lupfd); @@ -787,6 +794,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) { struct datafeed_packet packet; + /* QUICK HACK */ + device_index = device_index; + packet.type = DF_END; session_bus(session_device_id, &packet);