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

Move more non-public headers to sigrok-internal.h.

This commit is contained in:
Uwe Hermann 2011-01-19 01:16:19 +01:00
parent 01bd1ed396
commit 058b70353d
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include <sigrok.h> #include <sigrok.h>
#include <sigrok-internal.h>
#include "config.h" #include "config.h"
#define USB_VENDOR 0x0925 #define USB_VENDOR 0x0925

18
sigrok-internal.h
View File

@ -20,6 +20,8 @@
#ifndef SIGROK_SIGROK_INTERNAL_H #ifndef SIGROK_SIGROK_INTERNAL_H
#define SIGROK_SIGROK_INTERNAL_H #define SIGROK_SIGROK_INTERNAL_H
/*--- hardware/common/serial.c ----------------------------------------------*/
GSList *list_serial_ports(void); GSList *list_serial_ports(void);
int serial_open(const char *pathname, int flags); int serial_open(const char *pathname, int flags);
int serial_close(int fd); int serial_close(int fd);
@ -31,4 +33,20 @@ void serial_restore_params(int fd, void *backup);
int serial_set_params(int fd, int speed, int bits, int parity, int stopbits, int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
int flowcontrol); int flowcontrol);
/*--- hardware/common/ezusb.c -----------------------------------------------*/
int ezusb_reset(struct libusb_device_handle *hdl, int set_clear);
int ezusb_install_firmware(libusb_device_handle *hdl, char *filename);
int ezusb_upload_firmware(libusb_device *dev, int configuration,
const char *filename);
/*--- hardware/common/misc.c ------------------------------------------------*/
int opendev2(int device_index, struct sigrok_device_instance **sdi,
libusb_device *dev, struct libusb_device_descriptor *des,
int *skip, uint16_t vid, uint16_t pid, int interface);
int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
struct libusb_device_descriptor *des,
uint16_t vid, uint16_t pid, int interface);
#endif #endif

17
sigrok-proto.h
View File

@ -114,23 +114,6 @@ void session_bus(struct device *device, struct datafeed_packet *packet);
void make_metadata(char *filename); void make_metadata(char *filename);
int session_save(char *filename); int session_save(char *filename);
/*--- hardware/common/ezusb.c -----------------------------------------------*/
int ezusb_reset(struct libusb_device_handle *hdl, int set_clear);
int ezusb_install_firmware(libusb_device_handle *hdl, char *filename);
int ezusb_upload_firmware(libusb_device *dev, int configuration,
const char *filename);
/*--- hardware/common/misc.c ------------------------------------------------*/
/* TODO: Should not be public. */
int opendev2(int device_index, struct sigrok_device_instance **sdi,
libusb_device *dev, struct libusb_device_descriptor *des,
int *skip, uint16_t vid, uint16_t pid, int interface);
int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
struct libusb_device_descriptor *des,
uint16_t vid, uint16_t pid, int interface);
/*--- input/input.c ---------------------------------------------------------*/ /*--- input/input.c ---------------------------------------------------------*/
struct input_format **input_list(void); struct input_format **input_list(void);