Mac OS X build fixes

[libsigrok.git] / hardware / openbench-logic-sniffer / ols.c

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index d4d17688c92bf72f298fe03057b857a11fb17630..e7daa016a9e6eef9ce9eba35c2e158c8b83a6d7e 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -180,6 +180,7 @@ static struct ols_device *ols_device_new(void)
        ols->trigger_at = -1;
        ols->probe_mask = 0xffffffff;
        ols->cur_samplerate = SR_KHZ(200);
+       ols->period_ps = 5000000;
 
        return ols;
 }
@@ -458,18 +459,23 @@ static int hw_opendev(int device_index)
        return SR_OK;
 }
 
-static void hw_closedev(int device_index)
+static int hw_closedev(int device_index)
 {
        struct sr_device_instance *sdi;
 
-       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
-               return;
+       if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+               sr_err("ols: %s: sdi was NULL", __func__);
+               return SR_ERR; /* TODO: SR_ERR_ARG? */
+       }
 
+       /* TODO */
        if (sdi->serial->fd != -1) {
                serial_close(sdi->serial->fd);
                sdi->serial->fd = -1;
                sdi->status = SR_ST_INACTIVE;
        }
+
+       return SR_OK;
 }
 
 static void hw_cleanup(void)
@@ -477,7 +483,7 @@ static void hw_cleanup(void)
        GSList *l;
        struct sr_device_instance *sdi;
 
-       /* Properly close all devices. */
+       /* Properly close and free all devices. */
        for (l = device_instances; l; l = l->next) {
                sdi = l->data;
                if (sdi->serial->fd != -1)
@@ -548,6 +554,7 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
                return SR_ERR_SAMPLERATE;
 
        ols->cur_samplerate = samplerate;
+       ols->period_ps = 1000000000000 / samplerate;
        if (samplerate > CLOCK_RATE) {
                ols->flag_reg |= FLAG_DEMUX;
                ols->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
@@ -605,9 +612,10 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        return ret;
 }
 
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *session_data)
 {
        struct sr_datafeed_packet packet;
+       struct sr_datafeed_logic logic;
        struct sr_device_instance *sdi;
        struct ols_device *ols;
        GSList *l;
@@ -635,7 +643,7 @@ static int receive_data(int fd, int revents, void *user_data)
                 * finished. We'll double that to 30ms to be sure...
                 */
                sr_source_remove(fd);
-               sr_source_add(fd, G_IO_IN, 30, receive_data, user_data);
+               sr_source_add(fd, G_IO_IN, 30, receive_data, session_data);
                ols->raw_sample_buf = g_try_malloc(ols->limit_samples * 4);
                if (!ols->raw_sample_buf) {
                        sr_err("ols: %s: ols->raw_sample_buf malloc failed",
@@ -754,41 +762,55 @@ static int receive_data(int fd, int revents, void *user_data)
                        if (ols->trigger_at > 0) {
                                /* there are pre-trigger samples, send those first */
                                packet.type = SR_DF_LOGIC;
-                               packet.length = ols->trigger_at * 4;
-                               packet.unitsize = 4;
-                               packet.payload = ols->raw_sample_buf;
-                               sr_session_bus(user_data, &packet);
+                               packet.timeoffset = 0;
+                               packet.duration = ols->trigger_at * ols->period_ps;
+                               packet.payload = &logic;
+                               logic.length = ols->trigger_at * 4;
+                               logic.unitsize = 4;
+                               logic.data = ols->raw_sample_buf;
+                               sr_session_bus(session_data, &packet);
                        }
 
+                       /* send the trigger */
                        packet.type = SR_DF_TRIGGER;
-                       packet.length = 0;
-                       sr_session_bus(user_data, &packet);
+                       packet.timeoffset = ols->trigger_at * ols->period_ps;
+                       packet.duration = 0;
+                       sr_session_bus(session_data, &packet);
 
+                       /* send post-trigger samples */
                        packet.type = SR_DF_LOGIC;
-                       packet.length = (ols->limit_samples * 4) - (ols->trigger_at * 4);
-                       packet.unitsize = 4;
-                       packet.payload = ols->raw_sample_buf + ols->trigger_at * 4;
-                       sr_session_bus(user_data, &packet);
+                       packet.timeoffset = ols->trigger_at * ols->period_ps;
+                       packet.duration = (ols->limit_samples - ols->trigger_at) * ols->period_ps;
+                       packet.payload = &logic;
+                       logic.length = (ols->limit_samples * 4) - (ols->trigger_at * 4);
+                       logic.unitsize = 4;
+                       logic.data = ols->raw_sample_buf + ols->trigger_at * 4;
+                       sr_session_bus(session_data, &packet);
                } else {
+                       /* no trigger was used */
                        packet.type = SR_DF_LOGIC;
-                       packet.length = ols->limit_samples * 4;
-                       packet.unitsize = 4;
-                       packet.payload = ols->raw_sample_buf;
-                       sr_session_bus(user_data, &packet);
+                       packet.timeoffset = 0;
+                       packet.duration = ols->limit_samples * ols->period_ps;
+                       packet.payload = &logic;
+                       logic.length = ols->limit_samples * 4;
+                       logic.unitsize = 4;
+                       logic.data = ols->raw_sample_buf;
+                       sr_session_bus(session_data, &packet);
                }
                g_free(ols->raw_sample_buf);
 
                serial_flush(fd);
                serial_close(fd);
                packet.type = SR_DF_END;
-               packet.length = 0;
-               sr_session_bus(user_data, &packet);
+               packet.timeoffset = ols->limit_samples * ols->period_ps;
+               packet.duration = 0;
+               sr_session_bus(session_data, &packet);
        }
 
        return TRUE;
 }
 
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int device_index, gpointer session_data)
 {
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
@@ -903,7 +925,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
                return SR_ERR;
 
        sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data,
-                     session_device_id);
+                     session_data);
 
        if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
                sr_err("ols: %s: packet malloc failed", __func__);
@@ -918,15 +940,13 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        /* Send header packet to the session bus. */
        packet->type = SR_DF_HEADER;
-       packet->length = sizeof(struct sr_datafeed_header);
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
        header->samplerate = ols->cur_samplerate;
-       header->protocol_id = SR_PROTO_RAW;
        header->num_logic_probes = NUM_PROBES;
        header->num_analog_probes = 0;
-       sr_session_bus(session_device_id, packet);
+       sr_session_bus(session_data, packet);
 
        g_free(header);
        g_free(packet);
@@ -942,7 +962,6 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        device_index = device_index;
 
        packet.type = SR_DF_END;
-       packet.length = 0;
        sr_session_bus(session_device_id, &packet);
 }
 
@@ -952,8 +971,8 @@ struct sr_device_plugin ols_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .open = hw_opendev,
-       .close = hw_closedev,
+       .opendev = hw_opendev,
+       .closedev = hw_closedev,
        .get_device_info = hw_get_device_info,
        .get_status = hw_get_status,
        .get_capabilities = hw_get_capabilities,