X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=8a96a88f96a484390754d7b6c0a6086f05fecb10;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=37d867eda6f3ca2a3be40ec765f821397c9ab1d0;hpb=c2bd92ec0867eff49ee58b557d6fb9aec2b63357;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 37d867ed..8a96a88f 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -20,29 +20,26 @@
 #ifndef SIGROK_SIGROK_PROTO_H
 #define SIGROK_SIGROK_PROTO_H
 
-int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
-		  char *data_in, uint64_t length_in, char **data_out,
-		  uint64_t *length_out);
-
-char *sigrok_samplerate_string(uint64_t samplerate);
-char *sigrok_period_string(uint64_t frequency);
-
 /*--- backend.c -------------------------------------------------------------*/
 
-int sigrok_init(void);
-void sigrok_cleanup(void);
+int sr_init(void);
+void sr_cleanup(void);
 
-/*--- debug.c ---------------------------------------------------------------*/
+/*--- datastore.c -----------------------------------------------------------*/
 
-void hexdump(unsigned char *address, int length);
+int datastore_new(int unitsize, struct datastore **ds);
+int datastore_destroy(struct datastore *ds);
+void datastore_put(struct datastore *ds, void *data, unsigned int length,
+		   int in_unitsize, int *probelist);
 
-struct input_format **input_list(void);
-struct output_format **output_list(void);
+/*--- device.c --------------------------------------------------------------*/
 
 void device_scan(void);
+int device_plugin_init(struct device_plugin *plugin);
 void device_close_all(void);
 GSList *device_list(void);
-struct device *device_new(struct device_plugin *plugin, int plugin_index, int num_probes);
+struct device *device_new(struct device_plugin *plugin, int plugin_index,
+			  int num_probes);
 void device_clear(struct device *device);
 void device_destroy(struct device *dev);
 
@@ -54,15 +51,23 @@ void device_probe_name(struct device *device, int probenum, char *name);
 void device_trigger_clear(struct device *device);
 void device_trigger_set(struct device *device, int probenum, char *trigger);
 
+/*--- filter.c --------------------------------------------------------------*/
+
+int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
+		  char *data_in, uint64_t length_in, char **data_out,
+		  uint64_t *length_out);
+
+/*--- hwplugin.c ------------------------------------------------------------*/
+
 int load_hwplugins(void);
 GSList *list_hwplugins(void);
 
 /* Generic device instances */
-struct sigrok_device_instance *sigrok_device_instance_new(int index,
+struct sr_device_instance *sr_device_instance_new(int index,
        int status, const char *vendor, const char *model, const char *version);
-struct sigrok_device_instance *get_sigrok_device_instance(
+struct sr_device_instance *get_sr_device_instance(
 			GSList *device_instances, int device_index);
-void sigrok_device_instance_free(struct sigrok_device_instance *sdi);
+void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
 struct usb_device_instance *usb_device_instance_new(uint8_t bus,
@@ -105,43 +110,27 @@ void session_datafeed_callback_add(datafeed_callback callback);
 
 /* Session control */
 int session_start(void);
+void session_run(void);
+void session_halt(void);
 void session_stop(void);
 void session_bus(struct device *device, struct datafeed_packet *packet);
 void make_metadata(char *filename);
 int session_save(char *filename);
+void session_source_add(int fd, int events, int timeout,
+	        receive_data_callback callback, void *user_data);
+void session_source_remove(int fd);
 
-/*--- hwcommon.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);
-
-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);
-
-/* libsigrok/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 ---------------------------------------------------------*/
 
-/*--- datastore.c -----------------------------------------------------------*/
+struct sr_input_format **sr_input_list(void);
 
-int datastore_new(int unitsize, struct datastore **ds);
-int datastore_destroy(struct datastore *ds);
-void datastore_put(struct datastore *ds, void *data, unsigned int length,
-		   int in_unitsize, int *probelist);
+/*--- output/output.c -------------------------------------------------------*/
+
+struct sr_output_format **sr_output_list(void);
+
+/*--- output/common.c -------------------------------------------------------*/
+
+char *sr_samplerate_string(uint64_t samplerate);
+char *sr_period_string(uint64_t frequency);
 
 #endif