siglent-sds: move model dependent request emission to after identification

[libsigrok.git] / src / hardware / baylibre-acme / protocol.c

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index a6ff339b77f3819b6e450eaf591fd36d0aac0ffb..89391d5482286e541873910e457be935b6e7818b 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -310,11 +310,11 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
 static int revB_addr_to_num(unsigned int addr)
 {
        switch (addr) {
-       case 0x44:      return 5;
-       case 0x45:      return 6;
-       case 0x42:      return 3;
-       case 0x43:      return 4;
-       default:        return addr - 0x3f;
+       case 0x44: return 5;
+       case 0x45: return 6;
+       case 0x42: return 3;
+       case 0x43: return 4;
+       default:   return addr - 0x3f;
        }
 }
 
@@ -703,7 +703,7 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
        uint64_t nrexpiration;
-       struct sr_datafeed_packet packet, framep;
+       struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
        struct sr_analog_encoding encoding;
        struct sr_analog_meaning meaning;
@@ -759,8 +759,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
         * accuracy.
         */
        for (i = 0; i < nrexpiration; i++) {
-               framep.type = SR_DF_FRAME_BEGIN;
-               sr_session_send(sdi, &framep);
+               std_session_send_df_frame_begin(sdi);
 
                /*
                 * Due to different units used in each channel we're sending
@@ -788,8 +787,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                        sr_session_send(sdi, &packet);
                }
 
-               framep.type = SR_DF_FRAME_END;
-               sr_session_send(sdi, &framep);
+               std_session_send_df_frame_end(sdi);
        }
 
        sr_sw_limits_update_samples_read(&devc->limits, 1);