X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok-proto.h;h=83b84adc6ddb1cf731189c6f184fa24504f23c14;hb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;hp=e41dd9f4f4e25ae3c83127682c2dc3c9065ebe95;hpb=c49111295f0b2e50044923897d99ca84f65b75db;p=libsigrok.git diff --git a/sigrok-proto.h b/sigrok-proto.h index e41dd9f4..83b84adc 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -45,7 +45,7 @@ void sr_device_destroy(struct sr_device *dev); void sr_device_probe_clear(struct sr_device *device, int probenum); void sr_device_probe_add(struct sr_device *device, char *name); -struct sr_probe *probe_find(struct sr_device *device, int probenum); +struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum); void sr_device_probe_name(struct sr_device *device, int probenum, char *name); void sr_device_trigger_clear(struct sr_device *device); @@ -83,11 +83,11 @@ struct sr_serial_device_instance *sr_serial_device_instance_new( const char *port, int fd); void sr_serial_device_instance_free(struct sr_serial_device_instance *serial); -int find_hwcap(int *capabilities, int hwcap); -struct hwcap_option *find_hwcap_option(int hwcap); -void source_remove(int fd); -void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb, - void *user_data); +int sr_find_hwcap(int *capabilities, int hwcap); +struct sr_hwcap_option *sr_find_hwcap_option(int hwcap); +void sr_source_remove(int fd); +void sr_source_add(int fd, int events, int timeout, + receive_data_callback rcv_cb, void *user_data); /*--- session.c -------------------------------------------------------------*/ @@ -119,7 +119,6 @@ void sr_session_halt(void); void sr_session_stop(void); void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet); -void make_metadata(char *filename); int sr_session_save(char *filename); void sr_session_source_add(int fd, int events, int timeout, receive_data_callback callback, void *user_data);