X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=f89d3ee2c29b96f27024246e7740bb6e07ad22e9;hb=c2616fb9faca19945154974884a0816359cec1df;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..f89d3ee2 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,17 @@ 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 +/** + * Check the USB configuration to determine if this is a Saleae Logic. + * + * @return 1 if the device's configuration profile match the Logic firmware's + * configuration, 0 otherwise. */ int check_conf_profile(libusb_device *dev) { @@ -159,74 +164,6 @@ 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(int device_index, 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; @@ -249,7 +186,8 @@ struct sigrok_device_instance *sl_open_device(int device_index) for (i = 0; devlist[i]; i++) { /* TODO: Error handling. */ err = opendev2(device_index, &sdi, devlist[i], &des, - &skip); + &skip, USB_VENDOR, USB_PRODUCT, + USB_INTERFACE); } } else if (sdi->status == ST_INACTIVE) { /* @@ -259,7 +197,8 @@ 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, USB_VENDOR, + USB_PRODUCT, USB_INTERFACE); } } else { /* Status must be ST_ACTIVE, i.e. already in use... */ @@ -292,7 +231,7 @@ static void close_device(struct sigrok_device_instance *sdi) if (sdi->usb->devhdl == NULL) return; - g_message("closing device %d on %d.%d interface %d", sdi->index, + g_message("saleae: 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); @@ -300,7 +239,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; @@ -320,16 +259,17 @@ static int configure_probes(GSList * probes) continue; probe_bit = 1 << (probe->index - 1); probe_mask |= probe_bit; - if (probe->trigger) { - stage = 0; - for (tc = probe->trigger; *tc; tc++) { - trigger_mask[stage] |= probe_bit; - if (*tc == '1') - trigger_value[stage] |= probe_bit; - stage++; - if (stage > NUM_TRIGGER_STAGES) - return SIGROK_ERR; - } + if (!(probe->trigger)) + continue; + + stage = 0; + for (tc = probe->trigger; *tc; tc++) { + trigger_mask[stage] |= probe_bit; + if (*tc == '1') + trigger_value[stage] |= probe_bit; + stage++; + if (stage > NUM_TRIGGER_STAGES) + return SIGROK_ERR; } } @@ -356,11 +296,13 @@ 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; } - libusb_set_debug(usb_context, 3); /* Find all Saleae Logic devices and upload firmware to all of them. */ devcnt = 0; @@ -388,16 +330,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++; } @@ -422,7 +364,7 @@ static int hw_opendev(int device_index) timediff = cur - upd; if (timediff < FIRMWARE_RENUM_DELAY) { timediff = FIRMWARE_RENUM_DELAY - timediff; - g_message("waiting %d ms for device to reset", + g_message("saleae: waiting %d ms for device to reset", timediff); g_usleep(timediff * 1000); firmware_updated.tv_sec = 0; @@ -443,7 +385,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,9 +478,9 @@ 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)", + g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)", samplerate, divider); buf[0] = 0x01; buf[1] = divider; @@ -568,7 +510,8 @@ static int hw_set_configuration(int device_index, int capability, void *value) } else if (capability == HWCAP_PROBECONFIG) { ret = configure_probes((GSList *) value); } else if (capability == HWCAP_LIMIT_SAMPLES) { - limit_samples = strtoull(value, NULL, 10); + tmp_u64 = value; + limit_samples = *tmp_u64; ret = SIGROK_OK; } else { ret = SIGROK_ERR; @@ -581,65 +524,17 @@ 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, - 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; @@ -658,11 +553,12 @@ 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; } - g_message("receive_transfer(): status %d received %d bytes", + g_message("saleae: receive_transfer(): status %d received %d bytes", transfer->status, transfer->actual_length); /* Save incoming transfer before reusing the transfer struct. */ @@ -686,9 +582,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,25 +592,70 @@ 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); + + 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_LOGIC; + packet.length = trigger_stage; + packet.unitsize = 1; + packet.payload = trigger_buffer; + session_bus(user_data, &packet); + + trigger_stage = TRIGGER_FIRED; + break; + } + 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; + } + + } } if (trigger_stage == TRIGGER_FIRED) { /* Send the incoming transfer to the session bus. */ - packet.type = DF_LOGIC8; + packet.type = DF_LOGIC; packet.length = cur_buflen - trigger_offset; + packet.unitsize = 1; packet.payload = cur_buf + trigger_offset; session_bus(user_data, &packet); 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 +702,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); @@ -774,7 +713,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) gettimeofday(&header->starttime, NULL); header->samplerate = cur_samplerate; header->protocol_id = PROTO_RAW; - header->num_probes = NUM_PROBES; + header->num_logic_probes = NUM_PROBES; + header->num_analog_probes = 0; session_bus(session_device_id, packet); g_free(header); g_free(packet); @@ -787,6 +727,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);