X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=58f31acfaef37c191b8d4d7d4ecba436cff1a3b1;hb=af812219f655b286f5a2a0146846d9b97e25435c;hp=65e83aea362cea20bce7dab7ec6acfacd0d9aebb;hpb=9a5c6dcf498b8dfebb8beb848ee6db6b59b173e5;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 65e83aea..58f31acf 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -231,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); @@ -259,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; } } @@ -302,7 +303,6 @@ static int hw_init(char *deviceinfo) 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; @@ -364,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; @@ -480,7 +480,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, 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; @@ -510,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; @@ -534,59 +535,6 @@ static int receive_data(int fd, int revents, void *user_data) 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; @@ -610,7 +558,7 @@ void receive_transfer(struct libusb_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. */ @@ -644,8 +592,54 @@ 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, &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_LOGIC8; + packet.length = trigger_stage; + 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; + } + + } }