X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fapi.c;h=47bea85d77d040e7d88972bebf3741709a91f105;hp=c919dbf04f78363c9a4de89ecdd0a49ff1d4d9ae;hb=2622b4297fd4cc4bed5c06bb6ae0aaa8b40e0ece;hpb=b2b6dd55ec41ec5220988a82b1177e39d123176d diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c index c919dbf0..47bea85d 100644 --- a/src/hardware/kingst-la2016/api.c +++ b/src/hardware/kingst-la2016/api.c @@ -60,8 +60,8 @@ static const int32_t trigger_matches[] = { }; static const char *channel_names[] = { - "0", "1", "2", "3", "4", "5", "6", "7", "8", - "9", "10", "11", "12", "13", "14", "15", + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "10", "11", "12", "13", "14", "15", }; static const uint64_t samplerates[] = { @@ -151,14 +151,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) usb = NULL; for (l = conn_devices; l; l = l->next) { usb = l->data; - if (usb->bus == libusb_get_bus_number(devlist[i]) - && usb->address == libusb_get_device_address(devlist[i])) + if (usb->bus == libusb_get_bus_number(devlist[i]) && + usb->address == libusb_get_device_address(devlist[i])) break; } - if (!l) + if (!l) { /* This device matched none of the ones that * matched the conn specification. */ continue; + } } libusb_get_device_descriptor(devlist[i], &des); @@ -340,7 +341,7 @@ static int dev_open(struct sr_dev_inst *sdi) timediff_us = g_get_monotonic_time() - devc->fw_updated; timediff_ms = timediff_us / 1000; - + if ((ret = la2016_dev_open(sdi)) == SR_OK) break; sr_spew("Waited %" PRIi64 "ms.", timediff_ms); @@ -350,8 +351,9 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; } sr_info("Device came back after %" PRIi64 "ms.", timediff_ms); - } else + } else { ret = la2016_dev_open(sdi); + } if (ret != SR_OK) { sr_err("Unable to open device."); @@ -381,7 +383,8 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_usb_dev_inst *usb; @@ -398,10 +401,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s if (!sdi->conn) return SR_ERR_ARG; usb = sdi->conn; - if (usb->address == 255) + if (usb->address == 255) { /* Device still needs to re-enumerate after firmware * upload, so we don't know its (future) address. */ return SR_ERR; + } *data = g_variant_new_printf("%d.%d", usb->bus, usb->address); break; case SR_CONF_SAMPLERATE: @@ -423,7 +427,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s case SR_CONF_LOGIC_THRESHOLD_CUSTOM: *data = g_variant_new_double(devc->threshold_voltage); break; - + default: return SR_ERR_NA; } @@ -431,7 +435,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; double low, high; @@ -477,7 +482,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -507,17 +513,19 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsigned int num_tfers) +static void send_chunk(struct sr_dev_inst *sdi, + const uint8_t *packets, unsigned int num_tfers) { struct dev_context *devc; struct sr_datafeed_logic logic; struct sr_datafeed_packet sr_packet; - transfer_packet_t *packet; - acq_packet_t *p; - unsigned int max_samples, n_samples, total_samples, free_n_samples, ptotal; + unsigned int max_samples, n_samples, total_samples, free_n_samples; unsigned int i, j, k; int do_signal_trigger; uint16_t *wp; + const uint8_t *rp; + uint16_t state; + uint8_t repetitions; devc = sdi->priv; @@ -529,51 +537,40 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi max_samples = devc->convbuffer_size / 2; n_samples = 0; - wp = (uint16_t*)devc->convbuffer; + wp = (uint16_t *)devc->convbuffer; total_samples = 0; do_signal_trigger = 0; if (devc->had_triggers_configured && devc->reading_behind_trigger == 0 && devc->info.n_rep_packets_before_trigger == 0) { - sr_packet.type = SR_DF_TRIGGER; - sr_packet.payload = NULL; - sr_session_send(sdi, &sr_packet); + std_session_send_df_trigger(sdi); devc->reading_behind_trigger = 1; - - do_signal_trigger = 0; - sr_packet.type = SR_DF_LOGIC; - sr_packet.payload = &logic; } + rp = packets; for (i = 0; i < num_tfers; i++) { - transfer_packet_host(packets[i]); - packet = packets + i; - ptotal = 0; - for (k = 0; k < ARRAY_SIZE(packet->packet); k++) { + for (k = 0; k < NUM_PACKETS_IN_CHUNK; k++) { free_n_samples = max_samples - n_samples; if (free_n_samples < 256 || do_signal_trigger) { logic.length = n_samples * 2; sr_session_send(sdi, &sr_packet); n_samples = 0; - wp = (uint16_t*)devc->convbuffer; + wp = (uint16_t *)devc->convbuffer; if (do_signal_trigger) { - sr_packet.type = SR_DF_TRIGGER; - sr_packet.payload = NULL; - sr_session_send(sdi, &sr_packet); - + std_session_send_df_trigger(sdi); do_signal_trigger = 0; - sr_packet.type = SR_DF_LOGIC; - sr_packet.payload = &logic; } } - p = packet->packet + k; - for (j = 0; j < p->repetitions; j++) - *(wp++) = p->state; - n_samples += p->repetitions; - total_samples += p->repetitions; - ptotal += p->repetitions; - devc->total_samples += p->repetitions; + + state = read_u16le_inc(&rp); + repetitions = read_u8_inc(&rp); + for (j = 0; j < repetitions; j++) + *wp++ = state; + + n_samples += repetitions; + total_samples += repetitions; + devc->total_samples += repetitions; if (!devc->reading_behind_trigger) { - devc->n_reps_until_trigger --; + devc->n_reps_until_trigger--; if (devc->n_reps_until_trigger == 0) { devc->reading_behind_trigger = 1; do_signal_trigger = 1; @@ -583,14 +580,13 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi } } } + (void)read_u8_inc(&rp); /* Skip sequence number. */ } if (n_samples) { logic.length = n_samples * 2; sr_session_send(sdi, &sr_packet); if (do_signal_trigger) { - sr_packet.type = SR_DF_TRIGGER; - sr_packet.payload = NULL; - sr_session_send(sdi, &sr_packet); + std_session_send_df_trigger(sdi); } } sr_dbg("send_chunk done after %d samples", total_samples); @@ -614,7 +610,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) sr_err("bulk transfer timeout!"); devc->transfer_finished = 1; } - send_chunk(sdi, (transfer_packet_t*)transfer->buffer, transfer->actual_length / sizeof(transfer_packet_t)); + send_chunk(sdi, transfer->buffer, transfer->actual_length / TRANSFER_PACKET_LENGTH); devc->n_bytes_to_read -= transfer->actual_length; if (devc->n_bytes_to_read) { @@ -624,7 +620,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) libusb_fill_bulk_transfer( transfer, usb->devhdl, 0x86, transfer->buffer, to_read, - receive_transfer, (void*)sdi, DEFAULT_TIMEOUT_MS); + receive_transfer, (void *)sdi, DEFAULT_TIMEOUT_MS); if ((ret = libusb_submit_transfer(transfer)) == 0) return; @@ -641,7 +637,6 @@ static int handle_event(int fd, int revents, void *cb_data) const struct sr_dev_inst *sdi; struct dev_context *devc; struct drv_context *drvc; - struct sr_datafeed_packet packet; struct timeval tv; (void)fd; @@ -666,8 +661,7 @@ static int handle_event(int fd, int revents, void *cb_data) return FALSE; } sr_dbg("retrieval is started..."); - packet.type = SR_DF_FRAME_BEGIN; - sr_session_send(sdi, &packet); + std_session_send_df_frame_begin(sdi); return TRUE; } @@ -677,8 +671,7 @@ static int handle_event(int fd, int revents, void *cb_data) if (devc->transfer_finished) { sr_dbg("transfer is finished!"); - packet.type = SR_DF_FRAME_END; - sr_session_send(sdi, &packet); + std_session_send_df_frame_end(sdi); usb_source_remove(sdi->session, drvc->sr_ctx); std_session_send_df_end(sdi); @@ -688,6 +681,8 @@ static int handle_event(int fd, int revents, void *cb_data) g_free(devc->convbuffer); devc->convbuffer = NULL; + devc->transfer = NULL; + sr_dbg("transfer is now finished"); } @@ -712,7 +707,7 @@ static int configure_channels(const struct sr_dev_inst *sdi) struct sr_channel *ch = (struct sr_channel*)l->data; if (ch->enabled == FALSE) continue; - devc->cur_channels |= 1 << (ch->index); + devc->cur_channels |= 1 << ch->index; devc->num_channels++; } @@ -755,7 +750,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) } devc->have_trigger = 0; - usb_source_add(sdi->session, drvc->sr_ctx, 50, handle_event, (void*)sdi); + usb_source_add(sdi->session, drvc->sr_ctx, 50, handle_event, (void *)sdi); std_session_send_df_header(sdi);