sigma: Use heap for datafeed packet and header.

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

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index bffe106c5bcb669e6811f97d9df330176f16991a..d30e056564a1c1e168fc38c8bbb38e9ee0fd802c 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -83,9 +83,9 @@ static const char *probe_names[NUM_PROBES + 1] = {
 };
 
 static struct sr_samplerates samplerates = {
-       SR_KHZ(200),
-       SR_MHZ(200),
-       SR_HZ(0),
+       0,
+       0,
+       0,
        supported_samplerates,
 };
 
@@ -123,7 +123,7 @@ static const char *firmware_files[] = {
        "asix-sigma-phasor.fw", /* Frequency counter */
 };
 
-static int hw_dev_acquisition_stop(int dev_index, void *session_data);
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
 
 static int sigma_read(void *buf, size_t size, struct context *ctx)
 {
@@ -147,7 +147,7 @@ static int sigma_write(void *buf, size_t size, struct context *ctx)
                sr_err("sigma: ftdi_write_data failed: %s",
                       ftdi_get_error_string(&ctx->ftdic));
        } else if ((size_t) ret != size) {
-               sr_err("sigma: ftdi_write_data did not complete write\n");
+               sr_err("sigma: ftdi_write_data did not complete write.");
        }
 
        return ret;
@@ -382,7 +382,7 @@ static int bin2bitbang(const char *filename,
                g_free(compressed_buf);
                g_free(firmware);
                sr_err("sigma: Could not unpack Sigma firmware. "
-                      "(Error %d)\n", ret);
+                      "(Error %d).", ret);
                return SR_ERR;
        }
 
@@ -411,7 +411,7 @@ static int bin2bitbang(const char *filename,
        if (offset != *buf_size) {
                g_free(*buf);
                sr_err("sigma: Error reading firmware %s "
-                      "offset=%ld, file_size=%ld, buf_size=%zd\n",
+                      "offset=%ld, file_size=%ld, buf_size=%zd.",
                       filename, offset, file_size, *buf_size);
 
                return SR_ERR;
@@ -711,12 +711,12 @@ static int hw_dev_close(int dev_index)
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("sigma: %s: sdi was NULL", __func__);
-               return SR_ERR; /* TODO: SR_ERR_ARG? */
+               return SR_ERR_BUG;
        }
 
        if (!(ctx = sdi->priv)) {
                sr_err("sigma: %s: sdi->priv was NULL", __func__);
-               return SR_ERR; /* TODO: SR_ERR_ARG? */
+               return SR_ERR_BUG;
        }
 
        /* TODO */
@@ -879,9 +879,9 @@ static int get_trigger_offset(uint16_t *samples, uint16_t last_sample,
  */
 static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                           uint16_t *lastsample, int triggerpos,
-                          uint16_t limit_chunk, void *session_data)
+                          uint16_t limit_chunk, void *cb_data)
 {
-       struct sr_dev_inst *sdi = session_data;
+       struct sr_dev_inst *sdi = cb_data;
        struct context *ctx = sdi->priv;
        uint16_t tsdiff, ts;
        uint16_t samples[65536 * ctx->samples_per_event];
@@ -935,7 +935,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        logic.length = tosend * sizeof(uint16_t);
                        logic.unitsize = 2;
                        logic.data = samples + sent;
-                       sr_session_send(ctx->session_id, &packet);
+                       sr_session_send(ctx->session_dev_id, &packet);
 
                        sent += tosend;
                }
@@ -978,7 +978,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                                logic.length = tosend * sizeof(uint16_t);
                                logic.unitsize = 2;
                                logic.data = samples;
-                               sr_session_send(ctx->session_id, &packet);
+                               sr_session_send(ctx->session_dev_id, &packet);
 
                                sent += tosend;
                        }
@@ -986,7 +986,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        /* Only send trigger if explicitly enabled. */
                        if (ctx->use_triggers) {
                                packet.type = SR_DF_TRIGGER;
-                               sr_session_send(ctx->session_id, &packet);
+                               sr_session_send(ctx->session_dev_id, &packet);
                        }
                }
 
@@ -999,7 +999,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        logic.length = tosend * sizeof(uint16_t);
                        logic.unitsize = 2;
                        logic.data = samples + sent;
-                       sr_session_send(ctx->session_id, &packet);
+                       sr_session_send(ctx->session_dev_id, &packet);
                }
 
                *lastsample = samples[n - 1];
@@ -1023,10 +1023,13 @@ static int receive_data(int fd, int revents, void *cb_data)
        (void)fd;
        (void)revents;
 
+       /* Get the current position. */
+       sigma_read_pos(&ctx->state.stoppos, &ctx->state.triggerpos, ctx);
+
        numchunks = (ctx->state.stoppos + 511) / 512;
 
        if (ctx->state.state == SIGMA_IDLE)
-               return FALSE;
+               return TRUE;
 
        if (ctx->state.state == SIGMA_CAPTURE) {
                /* Check if the timer has expired, or memory is full. */
@@ -1035,16 +1038,16 @@ static int receive_data(int fd, int revents, void *cb_data)
                        (tv.tv_usec - ctx->start_tv.tv_usec) / 1000;
 
                if (running_msec < ctx->limit_msec && numchunks < 32767)
-                       return FALSE;
+                       return TRUE; /* While capturing... */
+               else {
 
                hw_dev_acquisition_stop(sdi->index, sdi);
 
-               return FALSE;
        } else if (ctx->state.state == SIGMA_DOWNLOAD) {
                if (ctx->state.chunks_downloaded >= numchunks) {
                        /* End of samples. */
                        packet.type = SR_DF_END;
-                       sr_session_send(ctx->session_id, &packet);
+                       sr_session_send(ctx->session_dev_id, &packet);
 
                        ctx->state.state = SIGMA_IDLE;
 
@@ -1254,12 +1257,12 @@ static int build_basic_trigger(struct triggerlut *lut, struct context *ctx)
        return SR_OK;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
+       struct sr_datafeed_packet *packet;
+       struct sr_datafeed_header *header;
        struct clockselect_50 clockselect;
        int frac, triggerpin, ret;
        uint8_t triggerselect;
@@ -1349,33 +1352,45 @@ static int hw_dev_acquisition_start(int dev_index, void *session_data)
        gettimeofday(&ctx->start_tv, 0);
        sigma_set_register(WRITE_MODE, 0x0d, ctx);
 
-       ctx->session_id = session_data;
+       ctx->session_dev_id = cb_data;
 
-       /* Send header packet to the session bus. */
-       packet.type = SR_DF_HEADER;
-       packet.payload = &header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       header.samplerate = ctx->cur_samplerate;
-       header.num_logic_probes = ctx->num_probes;
-       sr_session_send(session_data, &packet);
+       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
+               sr_err("sigma: %s: packet malloc failed.", __func__);
+               return SR_ERR_MALLOC;
+       }
+
+       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
+               sr_err("sigma: %s: header malloc failed.", __func__);
+               return SR_ERR_MALLOC;
+       }
 
        /* Add capture source. */
        sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
 
+       /* Send header packet to the session bus. */
+       packet->type = SR_DF_HEADER;
+       packet->payload = header;
+       header->feed_version = 1;
+       gettimeofday(&header->starttime, NULL);
+       header->samplerate = ctx->cur_samplerate;
+       header->num_logic_probes = ctx->num_probes;
+       sr_session_send(ctx->session_dev_id, packet);
+       g_free(header);
+       g_free(packet);
+
        ctx->state.state = SIGMA_CAPTURE;
 
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(int dev_index, void *session_data)
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
        uint8_t modestatus;
 
        /* Avoid compiler warnings. */
-       (void)session_data;
+       (void)cb_data;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("sigma: %s: sdi was NULL", __func__);