X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=54b23e32913b45f7d3807f3644ea6f2b2ddce01e;hb=ecaa89af0e01f9c3f585e82eb849bf616bff22cf;hp=951d91d9542eb2c69afccbd6c7b5547ef03d5136;hpb=17bdda58686a208424520b64f9324eba259ff535;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 951d91d9..54b23e32 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -244,7 +244,6 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 		uint8_t address, struct libusb_device_handle *hdl);
-SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx);
 SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb);
 #endif
 
@@ -374,6 +373,7 @@ SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_devic
 SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
 		int timeout, sr_receive_data_callback_t cb, void *cb_data);
 SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial);
+SR_PRIV GSList *sr_serial_find_usb(uint16_t vendor_id, uint16_t product_id);
 #endif
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/
@@ -438,6 +438,7 @@ struct sr_scpi_dev_inst {
 	const char *name;
 	const char *prefix;
 	int priv_size;
+	GSList *(*scan)(struct drv_context *drvc);
 	int (*dev_inst_new)(void *priv, struct drv_context *drvc,
 		const char *resource, char **params, const char *serialcomm);
 	int (*open)(void *priv);
@@ -453,6 +454,8 @@ struct sr_scpi_dev_inst {
 	void *priv;
 };
 
+SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
+		struct sr_dev_inst *(*probe_device)(struct sr_scpi_dev_inst *scpi));
 SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
 		const char *resource, const char *serialcomm);
 SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi);