X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=8b9392016a92c8df6e49ef7457b6411f3582bf58;hb=93a04e3be9cdaa276d9e7fe14da053483b567b74;hp=4ea5d475c39d87973ced6c864b44961d9f0228fb;hpb=8ff6afc95d2a9213b8a583e88e9e1b4eb59aad17;p=libsigrok.git diff --git a/sigrok-internal.h b/sigrok-internal.h index 4ea5d475..8b939201 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,15 @@ * 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 /*--- Macros ----------------------------------------------------------------*/ @@ -36,50 +40,94 @@ /* Size of a datastore chunk in units */ #define DATASTORE_CHUNKSIZE (512 * 1024) -/*--- hwplugin.c ------------------------------------------------------------*/ +#ifdef HAVE_LIBUSB_1_0 +struct sr_usb_device_instance { + uint8_t bus; + uint8_t address; + struct libusb_device_handle *devhdl; +}; +#endif + +struct sr_serial_device_instance { + char *port; + int fd; +}; + +#ifdef HAVE_LIBUSB_1_0 +/* USB-specific instances */ +SR_PRIV struct sr_usb_device_instance *sr_usb_dev_inst_new(uint8_t bus, + uint8_t address, struct libusb_device_handle *hdl); +SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_device_instance *usb); +#endif -int load_hwplugins(void); +/* Serial-specific instances */ +SR_PRIV struct sr_serial_device_instance *sr_serial_dev_inst_new( + const char *port, int fd); +SR_PRIV void sr_serial_dev_inst_free( + struct sr_serial_device_instance *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, ...); + +/*--- hwplugin.c ------------------------------------------------------------*/ + +SR_PRIV int sr_hw_load_all(void); +SR_PRIV void sr_hw_cleanup_all(void); + +/*--- session.c -------------------------------------------------------------*/ + +SR_PRIV int sr_session_bus(struct sr_device *device, + struct sr_datafeed_packet *packet); + +/* Generic device instances */ +SR_PRIV struct sr_device_instance *sr_dev_inst_new(int index, + int status, const char *vendor, const char *model, const char *version); +SR_PRIV struct sr_device_instance *sr_dev_inst_get( + GSList *device_instances, int device_index); +SR_PRIV void sr_dev_inst_free(struct sr_device_instance *sdi); + +SR_PRIV void sr_source_remove(int fd); +SR_PRIV void sr_source_add(int fd, int events, int timeout, + sr_receive_data_callback rcv_cb, void *user_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 speed, 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 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); +SR_PRIV int opendev3(struct sr_device_instance **sdi, libusb_device *dev, + struct libusb_device_descriptor *des, + uint16_t vid, uint16_t pid, int interface); #endif #endif