X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=fde076bb931ab4bbf09ff62f9649ac3409ad054f;hb=ebb781a69f1128fab5a9eedd39a548cba8ceccbb;hp=4ec9339c2900e90cc9866258af85d27455445f64;hpb=69890f7399f086c38670961dc72166f00de89af6;p=libsigrok.git diff --git a/sigrok-internal.h b/sigrok-internal.h index 4ec9339c..fde076bb 100644 --- a/sigrok-internal.h +++ b/sigrok-internal.h @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,11 +17,12 @@ * along with this program. If not, see . */ -#ifndef SIGROK_SIGROK_INTERNAL_H -#define SIGROK_SIGROK_INTERNAL_H +#ifndef LIBSIGROK_SIGROK_INTERNAL_H +#define LIBSIGROK_SIGROK_INTERNAL_H #include #include +#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #ifdef HAVE_LIBUSB_1_0 #include #endif @@ -39,75 +40,91 @@ /* Size of a datastore chunk in units */ #define DATASTORE_CHUNKSIZE (512 * 1024) -/*--- hwplugin.c ------------------------------------------------------------*/ - -int load_hwplugins(void); - #ifdef HAVE_LIBUSB_1_0 -struct sr_usb_device_instance { +struct sr_usb_dev_inst { uint8_t bus; uint8_t address; struct libusb_device_handle *devhdl; }; #endif -struct sr_serial_device_instance { +struct sr_serial_dev_inst { char *port; int fd; }; #ifdef HAVE_LIBUSB_1_0 /* USB-specific instances */ -struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus, +SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, uint8_t address, struct libusb_device_handle *hdl); -void sr_usb_device_instance_free(struct sr_usb_device_instance *usb); +SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb); #endif /* Serial-specific instances */ -struct sr_serial_device_instance *sr_serial_device_instance_new( +SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new( const char *port, int fd); -void sr_serial_device_instance_free(struct sr_serial_device_instance *serial); +SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); /*--- log.c -----------------------------------------------------------------*/ -int sr_log(int loglevel, const char *format, ...); -int sr_spew(const char *format, ...); -int sr_dbg(const char *format, ...); -int sr_info(const char *format, ...); -int sr_warn(const char *format, ...); -int sr_err(const char *format, ...); +SR_PRIV int sr_log(int loglevel, const char *format, ...); +SR_PRIV int sr_spew(const char *format, ...); +SR_PRIV int sr_dbg(const char *format, ...); +SR_PRIV int sr_info(const char *format, ...); +SR_PRIV int sr_warn(const char *format, ...); +SR_PRIV int sr_err(const char *format, ...); + +/*--- hwdriver.c ------------------------------------------------------------*/ + +SR_PRIV void sr_hw_cleanup_all(void); + +/*--- session.c -------------------------------------------------------------*/ + +SR_PRIV int sr_session_send(struct sr_dev *dev, + struct sr_datafeed_packet *packet); + +/* Generic device instances */ +SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, + const char *vendor, const char *model, const char *version); +SR_PRIV struct sr_dev_inst *sr_dev_inst_get(GSList *dev_insts, int dev_index); +SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi); + +SR_PRIV int sr_source_remove(int fd); +SR_PRIV int sr_source_add(int fd, int events, int timeout, + sr_receive_data_callback_t cb, void *cb_data); /*--- hardware/common/serial.c ----------------------------------------------*/ -GSList *list_serial_ports(void); -int serial_open(const char *pathname, int flags); -int serial_close(int fd); -int serial_flush(int fd); -int serial_write(int fd, const void *buf, size_t count); -int serial_read(int fd, void *buf, size_t count); -void *serial_backup_params(int fd); -void serial_restore_params(int fd, void *backup); -int serial_set_params(int fd, int speed, int bits, int parity, int stopbits, - int flowcontrol); +SR_PRIV GSList *list_serial_ports(void); +SR_PRIV int serial_open(const char *pathname, int flags); +SR_PRIV int serial_close(int fd); +SR_PRIV int serial_flush(int fd); +SR_PRIV int serial_write(int fd, const void *buf, size_t count); +SR_PRIV int serial_read(int fd, void *buf, size_t count); +SR_PRIV void *serial_backup_params(int fd); +SR_PRIV void serial_restore_params(int fd, void *backup); +SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity, + int stopbits, int flowcontrol); /*--- hardware/common/ezusb.c -----------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 -int ezusb_reset(struct libusb_device_handle *hdl, int set_clear); -int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename); -int ezusb_upload_firmware(libusb_device *dev, int configuration, - const char *filename); +SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear); +SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl, + const char *filename); +SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration, + const char *filename); #endif /*--- hardware/common/misc.c ------------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 -int opendev2(int device_index, struct sr_device_instance **sdi, - libusb_device *dev, struct libusb_device_descriptor *des, - int *skip, uint16_t vid, uint16_t pid, int interface); -int opendev3(struct sr_device_instance **sdi, libusb_device *dev, - struct libusb_device_descriptor *des, - uint16_t vid, uint16_t pid, int interface); +SR_PRIV int opendev2(int dev_index, struct sr_dev_inst **sdi, + libusb_device *dev, struct libusb_device_descriptor *des, + int *skip, uint16_t vid, uint16_t pid, int interface); +SR_PRIV int opendev3(struct sr_dev_inst **sdi, libusb_device *dev, + struct libusb_device_descriptor *des, + uint16_t vid, uint16_t pid, int interface); #endif #endif