X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-internal.h;h=1a297f9988a2ceccd546943881fbecb58fee513a;hb=bb7ef79377ae617e1275373e0b631beb7f909d73;hp=d5b7d072a87e735997859196060d0533558abc4e;hpb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;p=libsigrok.git

diff --git a/sigrok-internal.h b/sigrok-internal.h
index d5b7d072..1a297f99 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -81,14 +81,13 @@ SR_PRIV void sr_hw_cleanup_all(void);
 
 /*--- session.c -------------------------------------------------------------*/
 
-SR_PRIV int sr_session_bus(struct sr_device *device,
+SR_PRIV int sr_session_bus(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 device_index);
+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 void sr_source_remove(int fd);
@@ -121,7 +120,7 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 /*--- hardware/common/misc.c ------------------------------------------------*/
 
 #ifdef HAVE_LIBUSB_1_0
-SR_PRIV int opendev2(int device_index, struct sr_dev_inst **sdi,
+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,