asix-sigma: Drop duplicate error message prefixes.

[libsigrok.git] / src / hardware / asix-sigma / protocol.c

diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c
index 93d2623951e565f099ab68cc02e4af8ac66ccf32..3c29aad9f3a33dfc75615a5e2535f4018fb5d06e 100644 (file)
--- a/src/hardware/asix-sigma/protocol.c
+++ b/src/hardware/asix-sigma/protocol.c
@@ -134,18 +134,6 @@ static int sigma_read_register(uint8_t reg, uint8_t *data, size_t len,
        return sigma_read(data, len, devc);
 }
 
-static uint8_t sigma_get_register(uint8_t reg, struct dev_context *devc)
-{
-       uint8_t value;
-
-       if (1 != sigma_read_register(reg, &value, 1, devc)) {
-               sr_err("sigma_get_register: 1 byte expected");
-               return 0;
-       }
-
-       return value;
-}
-
 static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos,
                          struct dev_context *devc)
 {
@@ -1016,10 +1004,6 @@ static int download_capture(struct sr_dev_inst *sdi)
        devc = sdi->priv;
        dl_events_in_line = 64 * 7;
 
-       dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
-       if (!dram_line)
-               return FALSE;
-
        sr_info("Downloading sample data.");
        devc->state.state = SIGMA_DOWNLOAD;
 
@@ -1031,7 +1015,10 @@ static int download_capture(struct sr_dev_inst *sdi)
         */
        sigma_set_register(WRITE_MODE, WMR_FORCESTOP | WMR_SDRAMWRITEEN, devc);
        do {
-               modestatus = sigma_get_register(READ_MODE, devc);
+               if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
+                       sr_err("failed while waiting for RMR_POSTTRIGGERED bit");
+                       return FALSE;
+               }
        } while (!(modestatus & RMR_POSTTRIGGERED));
 
        /* Set SDRAM Read Enable. */
@@ -1041,7 +1028,10 @@ static int download_capture(struct sr_dev_inst *sdi)
        sigma_read_pos(&stoppos, &triggerpos, devc);
 
        /* Check if trigger has fired. */
-       modestatus = sigma_get_register(READ_MODE, devc);
+       if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
+               sr_err("failed to read READ_MODE register");
+               return FALSE;
+       }
        trg_line = ~0;
        trg_event = ~0;
        if (modestatus & RMR_TRIGGERED) {
@@ -1069,6 +1059,9 @@ static int download_capture(struct sr_dev_inst *sdi)
        } else {
                dl_first_line = 0;
        }
+       dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
+       if (!dram_line)
+               return FALSE;
        dl_lines_done = 0;
        while (dl_lines_total > dl_lines_done) {
                /* We can download only up-to 32 DRAM lines in one go! */