BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sr: Moved GTV_TO_MSEC to sigrok-internal.h

This commit is contained in:
Joel Holdsworth 2012-02-26 12:18:05 +00:00
parent b1eeb67e92
commit 7f6a3b43ad
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hardware/saleae-logic/saleae-logic.h
View File

@ -25,7 +25,6 @@
#define NUM_TRIGGER_STAGES 4 #define NUM_TRIGGER_STAGES 4
#define TRIGGER_TYPES "01" #define TRIGGER_TYPES "01"
#define FIRMWARE FIRMWARE_DIR "/saleae-logic.fw" #define FIRMWARE FIRMWARE_DIR "/saleae-logic.fw"
#define GTV_TO_MSEC(gtv) (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
/* delay in ms */ /* delay in ms */
#define MAX_RENUM_DELAY 3000 #define MAX_RENUM_DELAY 3000

2
sigrok-internal.h
View File

@ -53,6 +53,8 @@ struct sr_serial_dev_inst {
int fd; int fd;
}; };
#define GTV_TO_MSEC(gtv) (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBUSB_1_0
/* USB-specific instances */ /* USB-specific instances */
SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,