build: Portability fixes.

[libsigrok.git] / input / binary.c

diff --git a/input/binary.c b/input/binary.c
index 809e9ebbc3dd2291fd77aa0275076078c69b57ce..e0d4c1dd43576e195addacfe400eab3f6e681ee8 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -26,17 +26,10 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "input/binary: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "input/binary"
 
 #define CHUNKSIZE             (512 * 1024)
-#define DEFAULT_NUM_PROBES    8
+#define DEFAULT_NUM_CHANNELS  8
 
 struct context {
        uint64_t samplerate;
@@ -52,9 +45,9 @@ static int format_match(const char *filename)
 
 static int init(struct sr_input *in, const char *filename)
 {
-       struct sr_probe *probe;
-       int num_probes, i;
-       char name[SR_MAX_PROBENAME_LEN + 1];
+       struct sr_channel *ch;
+       int num_channels, i;
+       char name[SR_MAX_CHANNELNAME_LEN + 1];
        char *param;
        struct context *ctx;
 
@@ -65,14 +58,14 @@ static int init(struct sr_input *in, const char *filename)
                return SR_ERR_MALLOC;
        }
 
-       num_probes = DEFAULT_NUM_PROBES;
+       num_channels = DEFAULT_NUM_CHANNELS;
        ctx->samplerate = 0;
 
        if (in->param) {
-               param = g_hash_table_lookup(in->param, "numprobes");
+               param = g_hash_table_lookup(in->param, "numchannels");
                if (param) {
-                       num_probes = strtoul(param, NULL, 10);
-                       if (num_probes < 1)
+                       num_channels = strtoul(param, NULL, 10);
+                       if (num_channels < 1)
                                return SR_ERR;
                }
 
@@ -87,12 +80,12 @@ static int init(struct sr_input *in, const char *filename)
        in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
        in->internal = ctx;
 
-       for (i = 0; i < num_probes; i++) {
-               snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
+       for (i = 0; i < num_channels; i++) {
+               snprintf(name, SR_MAX_CHANNELNAME_LEN, "%d", i);
                /* TODO: Check return value. */
-               if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, name)))
+               if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name)))
                        return SR_ERR;
-               in->sdi->probes = g_slist_append(in->sdi->probes, probe);
+               in->sdi->channels = g_slist_append(in->sdi->channels, ch);
        }
 
        return SR_OK;
@@ -105,7 +98,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        struct sr_datafeed_logic logic;
        struct sr_config *src;
        unsigned char buffer[CHUNKSIZE];
-       int fd, size, num_probes;
+       int fd, size, num_channels;
        struct context *ctx;
 
        ctx = in->internal;
@@ -113,10 +106,10 @@ static int loadfile(struct sr_input *in, const char *filename)
        if ((fd = open(filename, O_RDONLY)) == -1)
                return SR_ERR;
 
-       num_probes = g_slist_length(in->sdi->probes);
+       num_channels = g_slist_length(in->sdi->channels);
 
        /* Send header packet to the session bus. */
-       std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN);
+       std_session_send_df_header(in->sdi, LOG_PREFIX);
 
        if (ctx->samplerate) {
                packet.type = SR_DF_META;
@@ -131,7 +124,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        /* Chop up the input file into chunks & send it to the session bus. */
        packet.type = SR_DF_LOGIC;
        packet.payload = &logic;
-       logic.unitsize = (num_probes + 7) / 8;
+       logic.unitsize = (num_channels + 7) / 8;
        logic.data = buffer;
        while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
                logic.length = size;