X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fprotocol.c;h=bb98d61a4b4f467f4eafa5cfb5d487b6a20f79ac;hb=4494721714407631b2410f21b493134d265bf695;hp=c665d071ce691524742715f3f62d13e7b4c7bcf0;hpb=9f58023066653c3d350fc238c2d6c3b2a0c9de3c;p=libsigrok.git diff --git a/src/hardware/dreamsourcelab-dslogic/protocol.c b/src/hardware/dreamsourcelab-dslogic/protocol.c index c665d071..bb98d61a 100644 --- a/src/hardware/dreamsourcelab-dslogic/protocol.c +++ b/src/hardware/dreamsourcelab-dslogic/protocol.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include "protocol.h" @@ -336,8 +337,9 @@ static uint16_t enabled_channel_mask(const struct sr_dev_inst *sdi) /* * Get the session trigger and configure the FPGA structure * accordingly. + * @return @c true if any triggers are enabled, @c false otherwise. */ -static void set_trigger(const struct sr_dev_inst *sdi, struct fpga_config *cfg) +static bool set_trigger(const struct sr_dev_inst *sdi, struct fpga_config *cfg) { struct sr_trigger *trigger; struct sr_trigger_stage *stage; @@ -378,7 +380,7 @@ static void set_trigger(const struct sr_dev_inst *sdi, struct fpga_config *cfg) if (!(trigger = sr_session_trigger_get(sdi->session))) { sr_dbg("No session trigger found"); - return; + return false; } for (l = trigger->stages; l; l = l->next) { @@ -419,12 +421,14 @@ static void set_trigger(const struct sr_dev_inst *sdi, struct fpga_config *cfg) } cfg->trig_glb = (num_enabled_channels << 4) | (num_trigger_stages - 1); + + return num_trigger_stages != 0; } static int fpga_configure(const struct sr_dev_inst *sdi) { - struct dev_context *devc; - struct sr_usb_dev_inst *usb; + const struct dev_context *const devc = sdi->priv; + const struct sr_usb_dev_inst *const usb = sdi->conn; uint8_t c[3]; struct fpga_config cfg; uint16_t mode = 0; @@ -433,9 +437,6 @@ static int fpga_configure(const struct sr_dev_inst *sdi) sr_dbg("Configuring FPGA."); - usb = sdi->conn; - devc = sdi->priv; - WL32(&cfg.sync, DS_CFG_START); WL16(&cfg.mode_header, DS_CFG_MODE); WL16(&cfg.divider_header, DS_CFG_DIVIDER); @@ -461,12 +462,15 @@ static int fpga_configure(const struct sr_dev_inst *sdi) return SR_ERR; } + if (set_trigger(sdi, &cfg)) + mode |= DS_MODE_TRIG_EN; + if (devc->mode == DS_OP_INTERNAL_TEST) - mode = DS_MODE_INT_TEST; + mode |= DS_MODE_INT_TEST; else if (devc->mode == DS_OP_EXTERNAL_TEST) - mode = DS_MODE_EXT_TEST; + mode |= DS_MODE_EXT_TEST; else if (devc->mode == DS_OP_LOOPBACK_TEST) - mode = DS_MODE_LPB_TEST; + mode |= DS_MODE_LPB_TEST; if (devc->cur_samplerate == DS_MAX_LOGIC_SAMPLERATE * 2) mode |= DS_MODE_HALF_MODE; @@ -496,8 +500,6 @@ static int fpga_configure(const struct sr_dev_inst *sdi) /* Number of 16-sample units. */ WL32(&cfg.count, devc->limit_samples / 16); - set_trigger(sdi, &cfg); - len = sizeof(struct fpga_config); ret = libusb_bulk_transfer(usb->devhdl, 2 | LIBUSB_ENDPOINT_OUT, (unsigned char *)&cfg, len, &transferred, USB_TIMEOUT); @@ -566,7 +568,9 @@ SR_PRIV int dslogic_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) if ((sdi->status == SR_ST_INITIALIZING) || (sdi->status == SR_ST_INACTIVE)) { /* Check device by its physical USB bus/port address. */ - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); + if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) + continue; + if (strcmp(sdi->connection_id, connection_id)) /* This is not the one. */ continue; @@ -731,10 +735,12 @@ static void deinterleave_buffer(const uint8_t *src, size_t length, for (int bit = 0; bit != 64; bit++) { const uint64_t *word_ptr = src_ptr; sample = 0; - for (size_t channel = 0; channel != channel_count; + for (unsigned int channel = 0; channel != 16; channel++) { - if ((channel_mask & (1 << channel)) && - (*word_ptr++ & (1ULL << bit))) + const uint16_t m = channel_mask >> channel; + if (!m) + break; + if ((m & 1) && ((*word_ptr++ >> bit) & UINT64_C(1))) sample |= 1 << channel; } *dst_ptr++ = sample; @@ -770,7 +776,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) (DSLOGIC_ATOMIC_BYTES * channel_count); gboolean packet_has_error = FALSE; - struct sr_datafeed_packet packet; unsigned int num_samples; int trigger_offset; @@ -850,9 +855,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) devc->sent_samples += trigger_offset; /* Trigger position. */ devc->trigger_pos = 0; - packet.type = SR_DF_TRIGGER; - packet.payload = NULL; - sr_session_send(sdi, &packet); + std_session_send_df_trigger(sdi); /* Post trigger samples. */ num_samples -= trigger_offset; send_data(sdi, devc->deinterleave_buffer @@ -910,6 +913,8 @@ static size_t get_buffer_size(const struct sr_dev_inst *sdi) */ const size_t block_size = enabled_channel_count(sdi) * 512; const size_t s = 10 * to_bytes_per_ms(sdi); + if (!block_size) + return s; return ((s + block_size - 1) / block_size) * block_size; } @@ -1012,8 +1017,8 @@ static void LIBUSB_CALL trigger_receive(struct libusb_transfer *transfer) } else if (transfer->status == LIBUSB_TRANSFER_COMPLETED && transfer->actual_length == sizeof(struct dslogic_trigger_pos)) { tpos = (struct dslogic_trigger_pos *)transfer->buffer; - sr_info("tpos real_pos %d ram_saddr %d cnt %d", tpos->real_pos, - tpos->ram_saddr, tpos->remain_cnt); + sr_info("tpos real_pos %d ram_saddr %d cnt_h %d cnt_l %d", tpos->real_pos, + tpos->ram_saddr, tpos->remain_cnt_h, tpos->remain_cnt_l); devc->trigger_pos = tpos->real_pos; g_free(tpos); start_transfers(sdi);