kingst-la2016: Eliminate non-portable packed structs for USB transfer layout

[libsigrok.git] / src / hardware / kingst-la2016 / api.c

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 6706c11c881701429bcaeff40fc1d888047c04e5..53089320101bbea2c7b6e5a06501ff60e9ed1cb1 100644 (file)
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -109,8 +109,6 @@ static const char *logic_threshold[] = {
 
 #define MAX_NUM_LOGIC_THRESHOLD_ENTRIES ARRAY_SIZE(logic_threshold)
 
-#define array_length(a) (sizeof(a) / sizeof((a)[0]))
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
@@ -509,17 +507,18 @@ 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;
 
@@ -536,21 +535,13 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi
        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_length(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;
@@ -558,22 +549,19 @@ static void send_chunk(struct sr_dev_inst *sdi, transfer_packet_t *packets, unsi
                                n_samples = 0;
                                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 --;
                                if (devc->n_reps_until_trigger == 0) {
@@ -585,14 +573,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);
@@ -616,7 +603,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) {
@@ -643,7 +630,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;
@@ -668,8 +654,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;
        }
@@ -679,8 +664,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);