sr: Moved GTV_TO_MSEC to sigrok-internal.h

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 7cd28c488af1c55aa73955d8b70401efddc30556..e4876d3beb1e206e0979d7db0cb788f381a89b66 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -25,7 +25,6 @@
 #define NUM_TRIGGER_STAGES     4
 #define TRIGGER_TYPES          "01"
 #define FIRMWARE               FIRMWARE_DIR "/saleae-logic.fw"
-#define GTV_TO_MSEC(gtv)       (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
 
 /* delay in ms */
 #define MAX_RENUM_DELAY        3000

diff --git a/sigrok-internal.h b/sigrok-internal.h
index f0032e98622902858e7dd7693efc983379fdc837..c60b5da66265868ac7b14911af834324e498c225 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -53,6 +53,8 @@ struct sr_serial_dev_inst {
        int fd;
 };
 
+#define GTV_TO_MSEC(gtv)       (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
+
 #ifdef HAVE_LIBUSB_1_0
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,