libsigrok: Introduce sr_dbg/sr_info/sr_warn/sr_err.

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index b99523f820bc696ca8f80a68854a9d854f4375f3..72dbe1a40666115f21adafecc99b6c5c86e84e1d 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -68,28 +68,28 @@ static GSList *device_instances = NULL;
  * upgrade -- this is like a global lock. No device will open until a proper
  * delay after the last device was upgraded.
  */
-GTimeVal firmware_updated = { 0, 0 };
+static GTimeVal firmware_updated = { 0, 0 };
 
 static libusb_context *usb_context = NULL;
 
 static uint64_t supported_samplerates[] = {
-       KHZ(200),
-       KHZ(250),
-       KHZ(500),
-       MHZ(1),
-       MHZ(2),
-       MHZ(4),
-       MHZ(8),
-       MHZ(12),
-       MHZ(16),
-       MHZ(24),
+       SR_KHZ(200),
+       SR_KHZ(250),
+       SR_KHZ(500),
+       SR_MHZ(1),
+       SR_MHZ(2),
+       SR_MHZ(4),
+       SR_MHZ(8),
+       SR_MHZ(12),
+       SR_MHZ(16),
+       SR_MHZ(24),
        0,
 };
 
-static struct samplerates samplerates = {
-       KHZ(200),
-       MHZ(24),
-       0,
+static struct sr_samplerates samplerates = {
+       SR_KHZ(200),
+       SR_MHZ(24),
+       SR_HZ(0),
        supported_samplerates,
 };
 
@@ -101,7 +101,7 @@ static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 };
 
-int trigger_stage = TRIGGER_FIRED;
+static int trigger_stage = TRIGGER_FIRED;
 
 static int hw_set_configuration(int device_index, int capability, void *value);
 static void hw_stop_acquisition(int device_index, gpointer session_device_id);
@@ -112,7 +112,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id);
  * @return 1 if the device's configuration profile match the Logic firmware's
  *         configuration, 0 otherwise.
  */
-int check_conf_profile(libusb_device *dev)
+static int check_conf_profile(libusb_device *dev)
 {
        struct libusb_device_descriptor des;
        struct libusb_config_descriptor *conf_dsc = NULL;
@@ -166,7 +166,7 @@ int check_conf_profile(libusb_device *dev)
        return ret;
 }
 
-struct sr_device_instance *sl_open_device(int device_index)
+static struct sr_device_instance *sl_open_device(int device_index)
 {
        struct sr_device_instance *sdi;
        libusb_device **devlist;
@@ -214,7 +214,7 @@ struct sr_device_instance *sl_open_device(int device_index)
        return sdi;
 }
 
-int upload_firmware(libusb_device *dev)
+static int upload_firmware(libusb_device *dev)
 {
        int ret;
 
@@ -233,8 +233,8 @@ static void close_device(struct sr_device_instance *sdi)
        if (sdi->usb->devhdl == NULL)
                return;
 
-       g_message("saleae: closing device %d on %d.%d interface %d", sdi->index,
-                 sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
+       sr_info("saleae: closing device %d on %d.%d interface %d", sdi->index,
+               sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
        libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE);
        libusb_close(sdi->usb->devhdl);
        sdi->usb->devhdl = NULL;
@@ -291,7 +291,7 @@ static int configure_probes(GSList *probes)
  * API callbacks
  */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct libusb_device_descriptor des;
@@ -302,7 +302,7 @@ static int hw_init(char *deviceinfo)
        deviceinfo = deviceinfo;
 
        if (libusb_init(&usb_context) != 0) {
-               g_warning("Failed to initialize USB.");
+               sr_warn("Failed to initialize USB.");
                return 0;
        }
 
@@ -312,7 +312,7 @@ static int hw_init(char *deviceinfo)
        for (i = 0; devlist[i]; i++) {
                err = libusb_get_device_descriptor(devlist[i], &des);
                if (err != 0) {
-                       g_warning("failed to get device descriptor: %d", err);
+                       sr_warn("failed to get device descriptor: %d", err);
                        continue;
                }
 
@@ -332,8 +332,8 @@ static int hw_init(char *deviceinfo)
                         * or uploading the firmware again.
                         */
                        if (upload_firmware(devlist[i]) > 0)
-                               g_warning("firmware upload failed for "
-                                         "device %d", devcnt);
+                               sr_warn("firmware upload failed for device %d",
+                                       devcnt);
 
                        sdi->usb = sr_usb_device_instance_new
                                (libusb_get_bus_number(devlist[i]), 0, NULL);
@@ -366,21 +366,21 @@ static int hw_opendev(int device_index)
                timediff = cur - upd;
                if (timediff < FIRMWARE_RENUM_DELAY) {
                        timediff = FIRMWARE_RENUM_DELAY - timediff;
-                       g_message("saleae: waiting %d ms for device to reset",
-                                 timediff);
+                       sr_info("saleae: waiting %d ms for device to reset",
+                               timediff);
                        g_usleep(timediff * 1000);
                        firmware_updated.tv_sec = 0;
                }
        }
 
        if (!(sdi = sl_open_device(device_index))) {
-               g_warning("unable to open device");
+               sr_warn("unable to open device");
                return SR_ERR;
        }
 
        err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
-               g_warning("Unable to claim interface: %d", err);
+               sr_warn("Unable to claim interface: %d", err);
                return SR_ERR;
        }
 
@@ -482,14 +482,14 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
 
        divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
 
-       g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)",
-                 samplerate, divider);
+       sr_info("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)",
+               samplerate, divider);
        buf[0] = 0x01;
        buf[1] = divider;
        ret = libusb_bulk_transfer(sdi->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT,
                                   buf, 2, &result, 500);
        if (ret != 0) {
-               g_warning("failed to set samplerate: %d", ret);
+               sr_warn("failed to set samplerate: %d", ret);
                return SR_ERR;
        }
        cur_samplerate = samplerate;
@@ -560,8 +560,8 @@ void receive_transfer(struct libusb_transfer *transfer)
                return;
        }
 
-       g_message("saleae: receive_transfer(): status %d received %d bytes",
-                 transfer->status, transfer->actual_length);
+       sr_info("saleae: receive_transfer(): status %d received %d bytes",
+               transfer->status, transfer->actual_length);
 
        /* Save incoming transfer before reusing the transfer struct. */
        cur_buf = transfer->buffer;
@@ -574,7 +574,7 @@ void receive_transfer(struct libusb_transfer *transfer)
        transfer->length = 4096;
        if (libusb_submit_transfer(transfer) != 0) {
                /* TODO: Stop session? */
-               g_warning("eek");
+               sr_warn("eek");
        }
 
        if (cur_buflen == 0) {
@@ -609,7 +609,7 @@ void receive_transfer(struct libusb_transfer *transfer)
                                         */
                                        packet.type = SR_DF_TRIGGER;
                                        packet.length = 0;
-                                       session_bus(user_data, &packet);
+                                       sr_session_bus(user_data, &packet);
 
                                        /*
                                         * Send the samples that triggered it, since we're
@@ -619,7 +619,7 @@ void receive_transfer(struct libusb_transfer *transfer)
                                        packet.length = trigger_stage;
                                        packet.unitsize = 1;
                                        packet.payload = trigger_buffer;
-                                       session_bus(user_data, &packet);
+                                       sr_session_bus(user_data, &packet);
 
                                        trigger_stage = TRIGGER_FIRED;
                                        break;
@@ -652,7 +652,7 @@ void receive_transfer(struct libusb_transfer *transfer)
                packet.length = cur_buflen - trigger_offset;
                packet.unitsize = 1;
                packet.payload = cur_buf + trigger_offset;
-               session_bus(user_data, &packet);
+               sr_session_bus(user_data, &packet);
                g_free(cur_buf);
 
                num_samples += cur_buflen;
@@ -704,8 +704,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        lupfd = libusb_get_pollfds(usb_context);
        for (i = 0; lupfd[i]; i++)
-               source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
-                          NULL);
+               sr_source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
+                             NULL);
        free(lupfd);
 
        packet->type = SR_DF_HEADER;
@@ -717,7 +717,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        header->protocol_id = SR_PROTO_RAW;
        header->num_logic_probes = NUM_PROBES;
        header->num_analog_probes = 0;
-       session_bus(session_device_id, packet);
+       sr_session_bus(session_device_id, packet);
        g_free(header);
        g_free(packet);
 
@@ -733,7 +733,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        device_index = device_index;
 
        packet.type = SR_DF_END;
-       session_bus(session_device_id, &packet);
+       sr_session_bus(session_device_id, &packet);
 
        receive_transfer(NULL);