X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=891476ec1d0784c56d901a8fe8a5ba9c467b2d54;hb=eee4890f2fac030ea77a31a3c6c478b4cb628011;hp=5fd8ff7eb6b60c797522cb98ab86e79f0b558c77;hpb=f6958dabcd0ce8e2613ee6b958bef7c80b9f9e18;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 5fd8ff7e..891476ec 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 @@ -44,7 +44,7 @@ #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) { @@ -159,6 +162,74 @@ int check_conf_profile(libusb_device *dev) return ret; } +static int opendev2(int device_index, struct sigrok_device_instance **sdi, + libusb_device *dev, struct libusb_device_descriptor *des, + int *skip) +{ + int err; + + if ((err = libusb_get_device_descriptor(dev, des))) { + g_warning("failed to get device descriptor: %d", err); + return -1; + } + + if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT) + return 0; + + if (*skip != device_index) { + /* Skip devices of this type that aren't the one we want. */ + *skip += 1; + return 0; + } + + /* + * Should check the bus here, since we know that already. But what are + * we going to do if it doesn't match after the right number of skips? + */ + if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) { + (*sdi)->usb->address = libusb_get_device_address(dev); + (*sdi)->status = ST_ACTIVE; + g_message("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); + *sdi = NULL; + } + + return 0; +} + +static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev, + struct libusb_device_descriptor *des) +{ + int err; + + if ((err = libusb_get_device_descriptor(dev, des))) { + g_warning("failed to get device descriptor: %d", err); + return -1; + } + + if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT) + return 0; + + if (libusb_get_bus_number(dev) == (*sdi)->usb->bus + && libusb_get_device_address(dev) == (*sdi)->usb->address) { + /* Found it. */ + if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) { + (*sdi)->status = ST_ACTIVE; + g_message("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); + *sdi = NULL; + } + } + + return 0; +} + struct sigrok_device_instance *sl_open_device(int device_index) { struct sigrok_device_instance *sdi; @@ -179,43 +250,9 @@ struct sigrok_device_instance *sl_open_device(int device_index) */ skip = 0; for (i = 0; devlist[i]; i++) { - if ((err = libusb_get_device_descriptor(devlist[i], &des))) { - g_warning("failed to get device descriptor: %d", - err); - continue; - } - - if (des.idVendor == USB_VENDOR - && des.idProduct == USB_PRODUCT) { - if (skip != device_index) { - /* - * Skip past devices of this type that - * aren't the one we want. - */ - skip++; - continue; - } - - /* - * Should check the bus here, since we know - * that already... but what are we going to do - * if it doesn't match after the right number - * of skips? - */ - if (!(err = libusb_open(devlist[i], - &(sdi->usb->devhdl)))) { - sdi->usb->address = libusb_get_device_address(devlist [i]); - sdi->status = ST_ACTIVE; - g_message("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); - sdi = NULL; - } - } + /* TODO: Error handling. */ + err = opendev2(device_index, &sdi, devlist[i], &des, + &skip); } } else if (sdi->status == ST_INACTIVE) { /* @@ -224,34 +261,8 @@ struct sigrok_device_instance *sl_open_device(int device_index) */ libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { - if ((err = - libusb_get_device_descriptor(devlist[i], &des))) { - g_warning("failed to get device descriptor: %d", - err); - continue; - } - - if (des.idVendor == USB_VENDOR - && des.idProduct == USB_PRODUCT) { - if (libusb_get_bus_number(devlist[i]) == - sdi->usb->bus - && libusb_get_device_address(devlist[i]) == - sdi->usb->address) { - /* Found it. */ - if (!(err = libusb_open(devlist[i], - &(sdi->usb->devhdl)))) { - sdi->status = ST_ACTIVE; - g_message("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); - sdi = NULL; - } - } - } + /* TODO: Error handling. */ + err = opendev3(&sdi, devlist[i], &des); } } else { /* Status must be ST_ACTIVE, i.e. already in use... */ @@ -267,35 +278,12 @@ struct sigrok_device_instance *sl_open_device(int device_index) int upload_firmware(libusb_device *dev) { - struct libusb_device_handle *hdl; - int err; - - g_message("uploading firmware to device on %d.%d", - libusb_get_bus_number(dev), libusb_get_device_address(dev)); - - err = libusb_open(dev, &hdl); - if (err != 0) { - g_warning("failed to open device: %d", err); - return 1; - } - - err = libusb_set_configuration(hdl, USB_CONFIGURATION); - if (err != 0) { - g_warning("Unable to set configuration: %d", err); - return 1; - } - - if ((ezusb_reset(hdl, 1)) < 0) - return 1; - - if (ezusb_install_firmware(hdl, FIRMWARE) != 0) - return 1; + int ret; - if ((ezusb_reset(hdl, 0)) < 0) + ret = ezusb_upload_firmware(dev, USB_CONFIGURATION, FIRMWARE); + if (ret != 0) return 1; - libusb_close(hdl); - /* Remember when the last firmware update was done. */ g_get_current_time(&firmware_updated); @@ -315,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; @@ -371,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; @@ -403,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++; } @@ -458,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; } @@ -551,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); @@ -596,12 +587,70 @@ 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, + struct datafeed_packet *packet, void *user_data, + int *trigger_offset) +{ + if ((cur_buf[i] & trigger_mask[trigger_stage]) + == trigger_value[trigger_stage]) { + /* Match on this trigger stage. */ + trigger_buffer[trigger_stage] = cur_buf[i]; + trigger_stage++; + if (trigger_stage == NUM_TRIGGER_STAGES + || trigger_mask[trigger_stage] == 0) { + /* Match on all trigger stages, we're done. */ + *trigger_offset = i + 1; + + /* + * TODO: Send pre-trigger buffer to session bus. + * Tell the frontend we hit the trigger here. + */ + packet->type = DF_TRIGGER; + packet->length = 0; + session_bus(user_data, packet); + + /* + * Send the samples that triggered it, since we're + * skipping past them. + */ + packet->type = DF_LOGIC8; + packet->length = trigger_stage; + packet->payload = trigger_buffer; + session_bus(user_data, packet); + // break; // FIXME??? + + trigger_stage = TRIGGER_FIRED; + } + return; + } + + /* + * We had a match before, but not in the next sample. However, we may + * have a match on this stage in the next bit -- trigger on 0001 will + * fail on seeing 00001, so we need to go back to stage 0 -- but at + * the next sample from the one that matched originally, which the + * counter increment at the end of the loop takes care of. + */ + if (trigger_stage > 0) { + i -= trigger_stage; + if (i < -1) + i = -1; /* Oops, went back past this buffer. */ + /* Reset trigger stage. */ + trigger_stage = 0; + } +} + void receive_transfer(struct libusb_transfer *transfer) { static int num_samples = 0; @@ -620,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; } @@ -648,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 { @@ -660,45 +708,8 @@ void receive_transfer(struct libusb_transfer *transfer) trigger_offset = 0; if (trigger_stage >= 0) { for (i = 0; i < cur_buflen; i++) { - if ((cur_buf[i] & trigger_mask[trigger_stage]) - == trigger_value[trigger_stage]) { - /* Match on this trigger stage. */ - trigger_buffer[trigger_stage] = cur_buf[i]; - trigger_stage++; - if (trigger_stage == NUM_TRIGGER_STAGES - || trigger_mask[trigger_stage] == 0) { - /* Match on all trigger stages, we're done */ - trigger_offset = i + 1; - - /* TODO: Send pre-trigger buffer to session bus. Tell the frontend we hit the trigger here. */ - packet.type = DF_TRIGGER; - packet.length = 0; - session_bus(user_data, &packet); - - /* Send the samples that triggered it, since we're skipping past them. */ - packet.type = DF_LOGIC8; - packet.length = trigger_stage; - packet.payload = trigger_buffer; - session_bus(user_data, &packet); - break; - - trigger_stage = TRIGGER_FIRED; - } - } else if (trigger_stage > 0) { - /* - * We had a match before, but not in the next sample. However, we may - * have a match on this stage in the next bit -- trigger on 0001 will - * fail on seeing 00001, so we need to go back to stage 0 -- but at - * the next sample from the one that matched originally, which the - * counter increment at the end of the loop takes care of. - */ - i -= trigger_stage; - if (i < -1) - /* Oops, went back past this buffer. */ - i = -1; - /* Reset trigger stage. */ - trigger_stage = 0; - } + trigger_helper(i, cur_buf, &packet, user_data, + &trigger_offset); } } @@ -711,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 { /* @@ -762,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); @@ -786,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);