From: Joel Holdsworth <redacted>
Date: Sun, 26 Feb 2012 12:18:05 +0000 (+0000)
Subject: sr: Moved GTV_TO_MSEC to sigrok-internal.h
X-Git-Tag: libsigrok-0.1.0~91
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7f6a3b43ad9e26a2928672927960bcc02a2c7510;p=libsigrok.git

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 7cd28c48..e4876d3b 100644
--- 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 f0032e98..c60b5da6 100644
--- 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,