sr: Make more symbols private via static/SR_PRIV.

[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 b6b914ce30a72064965d9f68b63b25d0b76b9b06..d93291ea4bb8ba1a9ab49910b7b2d3785a230b0c 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -23,7 +23,6 @@
  * ASIX SIGMA Logic Analyzer Driver
  */
 
-#include "config.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <ftdi.h>
@@ -40,6 +39,7 @@
 #define USB_MODEL_NAME                 "SIGMA"
 #define USB_MODEL_VERSION              ""
 #define TRIGGER_TYPES                  "rf10"
+#define NUM_PROBES                     16
 
 static GSList *device_instances = NULL;
 
@@ -57,6 +57,26 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
+static const char *probe_names[NUM_PROBES + 1] = {
+       "0",
+       "1",
+       "2",
+       "3",
+       "4",
+       "5",
+       "6",
+       "7",
+       "8",
+       "9",
+       "10",
+       "11",
+       "12",
+       "13",
+       "14",
+       "15",
+       NULL,
+};
+
 static struct sr_samplerates samplerates = {
        SR_KHZ(200),
        SR_MHZ(200),
@@ -735,7 +755,10 @@ static void *hw_get_device_info(int device_index, int device_info_id)
                info = sdi;
                break;
        case SR_DI_NUM_PROBES:
-               info = GINT_TO_POINTER(16);
+               info = GINT_TO_POINTER(NUM_PROBES);
+               break;
+       case SR_DI_PROBE_NAMES:
+               info = probe_names;
                break;
        case SR_DI_SAMPLERATES:
                info = &samplerates;
@@ -895,9 +918,6 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        tosend = MIN(2048, n - sent);
 
                        packet.type = SR_DF_LOGIC;
-                       /* TODO: fill in timeoffset and duration */
-                       packet.timeoffset = 0;
-                       packet.duration = 0;
                        packet.payload = &logic;
                        logic.length = tosend * sizeof(uint16_t);
                        logic.unitsize = 2;
@@ -943,9 +963,6 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
 
                        if (tosend > 0) {
                                packet.type = SR_DF_LOGIC;
-                               /* TODO: fill in timeoffset and duration */
-                               packet.timeoffset = 0;
-                               packet.duration = 0;
                                packet.payload = &logic;
                                logic.length = tosend * sizeof(uint16_t);
                                logic.unitsize = 2;
@@ -958,9 +975,6 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        /* Only send trigger if explicitly enabled. */
                        if (sigma->use_triggers) {
                                packet.type = SR_DF_TRIGGER;
-                               /* TODO: fill in timeoffset only */
-                               packet.timeoffset = 0;
-                               packet.duration = 0;
                                sr_session_bus(sigma->session_id, &packet);
                        }
                }
@@ -970,9 +984,6 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
 
                if (tosend > 0) {
                        packet.type = SR_DF_LOGIC;
-                       /* TODO: fill in timeoffset and duration */
-                       packet.timeoffset = 0;
-                       packet.duration = 0;
                        packet.payload = &logic;
                        logic.length = tosend * sizeof(uint16_t);
                        logic.unitsize = 2;
@@ -1388,7 +1399,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_data)
        sigma->state.state = SIGMA_DOWNLOAD;
 }
 
-struct sr_device_plugin asix_sigma_plugin_info = {
+SR_PRIV struct sr_device_plugin asix_sigma_plugin_info = {
        .name = "asix-sigma",
        .longname = "ASIX SIGMA",
        .api_version = 1,