kingst-la2016: unbreak streaming mode for LA5032

The Kingst LA series models share the same streaming mode memory layout.
All channels' chunks are 16 bits wide. The previous version worked for
16-channel devices, this change unbreaks the 32-channel device LA5032.

This fixes the streaming aspect of bug #1805.

Reported-By: Roman Shishkin <redacted>

diff --git a/src/hardware/kingst-la2016/protocol.c b/src/hardware/kingst-la2016/protocol.c
index 472fca7298270331c110c15fdcc48397ff1a76b9..8748980a5d90cd8839d8cfb2254597158eb16cb8 100644 (file)
--- a/src/hardware/kingst-la2016/protocol.c
+++ b/src/hardware/kingst-la2016/protocol.c
@@ -1461,30 +1461,15 @@ static void stream_data(struct sr_dev_inst *sdi,
 
        /* TODO Add soft trigger support when in stream mode? */
 
-       /*
-        * TODO Are memory cells always as wide as the channel count?
-        * Are they always 16bits wide? Verify for 32 channel devices.
-        */
-       bit_count = devc->model->channel_count;
-       if (bit_count == 32) {
-               data_length /= sizeof(uint32_t);
-       } else if (bit_count == 16) {
-               data_length /= sizeof(uint16_t);
-       } else {
-               /*
-                * Unhandled case. Acquisition should not start.
-                * The statement silences the compiler.
-                */
-               return;
-       }
+       /* All channels' chunks carry 16 samples for one channel. */
+       bit_count = 16;
+       data_length /= sizeof(uint16_t);
+
        rp = data_buffer;
        sample_value = 0;
        while (data_length--) {
                /* Get another entity. */
-               if (bit_count == 32)
-                       sample_value = read_u32le_inc(&rp);
-               else if (bit_count == 16)
-                       sample_value = read_u16le_inc(&rp);
+               sample_value = read_u16le_inc(&rp);
 
                /* Map the entity's bits to a channel's samples. */
                ch_mask = stream->channel_masks[stream->channel_index];