sr: Random cosmetics, fix/amend Doxygen comments.

[libsigrok.git] / input / chronovu_la8.c

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index c39f0169b0a66ac0a7e78107119930b7e250bbe4..9c75a9179208375e9bf89d47a4a1257fb3056399 100644 (file)
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -36,6 +36,7 @@
  * Max. value for divcount: 0xfe (2550ns sample period, 392.15kHz samplerate).
  *
  * @param divcount The divcount value as needed by the hardware.
+ *
  * @return The samplerate in Hz, or 0xffffffffffffffff upon errors.
  */
 static uint64_t divcount_to_samplerate(uint8_t divcount)
@@ -49,21 +50,21 @@ static uint64_t divcount_to_samplerate(uint8_t divcount)
 static int format_match(const char *filename)
 {
        if (!filename) {
-               sr_warn("la8input: %s: filename was NULL", __func__);
+               sr_err("la8 in: %s: filename was NULL", __func__);
                // return SR_ERR; /* FIXME */
                return FALSE;
        }
 
        if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-               sr_warn("la8input: %s: input file '%s' does not exist",
-                       __func__, filename);
+               sr_err("la8 in: %s: input file '%s' does not exist",
+                      __func__, filename);
                // return SR_ERR; /* FIXME */
                return FALSE;
        }
 
        if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
-               sr_warn("la8input: %s: input file '%s' not a regular file",
-                       __func__, filename);
+               sr_err("la8 in: %s: input file '%s' not a regular file",
+                      __func__, filename);
                // return SR_ERR; /* FIXME */
                return FALSE;
        }
@@ -83,7 +84,7 @@ static int init(struct sr_input *in)
        if (in->param && in->param[0]) {
                num_probes = strtoul(in->param, NULL, 10);
                if (num_probes < 1) {
-                       sr_warn("la8input: %s: strtoul failed", __func__);
+                       sr_err("la8 in: %s: strtoul failed", __func__);
                        return SR_ERR;
                }
        } else {
@@ -91,12 +92,12 @@ static int init(struct sr_input *in)
        }
 
        /* Create a virtual device. */
-       in->vdevice = sr_device_new(NULL, 0);
+       in->vdevice = sr_dev_new(NULL, 0);
 
        for (i = 0; i < num_probes; i++) {
                snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
                /* TODO: Check return value. */
-               sr_device_probe_add(in->vdevice, name);
+               sr_dev_probe_add(in->vdevice, name);
        }
 
        return SR_OK;
@@ -113,7 +114,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 
        /* TODO: Use glib functions! GIOChannel, g_fopen, etc. */
        if ((fd = open(filename, O_RDONLY)) == -1) {
-               sr_warn("la8input: %s: file open failed", __func__);
+               sr_err("la8 in: %s: file open failed", __func__);
                return SR_ERR;
        }
 
@@ -128,23 +129,22 @@ static int loadfile(struct sr_input *in, const char *filename)
                close(fd); /* FIXME */
                return SR_ERR;
        }
-       sr_dbg("la8input: %s: samplerate is %" PRIu64, __func__, samplerate);
+       sr_dbg("la8 in: %s: samplerate is %" PRIu64, __func__, samplerate);
 
        /* Send header packet to the session bus. */
-       sr_dbg("la8input: %s: sending SR_DF_HEADER packet", __func__);
+       sr_dbg("la8 in: %s: sending SR_DF_HEADER packet", __func__);
        packet.type = SR_DF_HEADER;
        packet.payload = &header;
        header.feed_version = 1;
        gettimeofday(&header.starttime, NULL);
        header.num_logic_probes = num_probes;
-       header.num_analog_probes = 0;
        header.samplerate = samplerate;
        sr_session_bus(in->vdevice, &packet);
 
        /* TODO: Handle trigger point. */
 
        /* Send data packets to the session bus. */
-       sr_dbg("la8input: %s: sending SR_DF_LOGIC data packets", __func__);
+       sr_dbg("la8 in: %s: sending SR_DF_LOGIC data packets", __func__);
        packet.type = SR_DF_LOGIC;
        packet.payload = &logic;
        logic.unitsize = (num_probes + 7) / 8;
@@ -160,7 +160,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        close(fd); /* FIXME */
 
        /* Send end packet to the session bus. */
-       sr_dbg("la8input: %s: sending SR_DF_END", __func__);
+       sr_dbg("la8 in: %s: sending SR_DF_END", __func__);
        packet.type = SR_DF_END;
        packet.payload = NULL;
        sr_session_bus(in->vdevice, &packet);
@@ -168,7 +168,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        return SR_OK;
 }
 
-struct sr_input_format input_chronovu_la8 = {
+SR_PRIV struct sr_input_format input_chronovu_la8 = {
        .id = "chronovu-la8",
        .description = "ChronoVu LA8",
        .format_match = format_match,