X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=95598192ab50a597ad8f949239a478273b70a5a1;hb=43fc7885d31c1f6af0715b583a9d153ba59eda5c;hp=9ebb207e6d6a2f5779ead62720715f3ee600cdf1;hpb=904299164f5718109fea2b23bc34e1522c548db4;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 9ebb207e..95598192 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -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; @@ -197,8 +197,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 +259,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... */ @@ -275,35 +275,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); @@ -379,6 +356,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; @@ -604,12 +584,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; @@ -668,45 +706,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); } } @@ -719,7 +720,7 @@ void receive_transfer(struct libusb_transfer *transfer) g_free(cur_buf); num_samples += cur_buflen; - if (num_samples > limit_samples) { + if ((unsigned int)num_samples > limit_samples) { /* End the acquisition. */ packet.type = DF_END; session_bus(user_data, &packet); @@ -794,6 +795,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);