X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwdriver.c;h=cbe3f23610d881a43ad324562bb6551b60d079b2;hb=6c6781b6a7559b66645ec4dbebaf6dca0246cb5e;hp=dc314823999089fd7842f645ea4468d024ae27ad;hpb=c496ac97a83aa33dd2add8074c454b7dc1b08fe6;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index dc314823..cbe3f236 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -34,7 +34,7 @@
 SR_API struct sr_hwcap_option sr_hwcap_options[] = {
 	{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
 	{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
-	{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
+	{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "pattern"},
 	{SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
 	{0, 0, NULL, NULL},
 };
@@ -99,14 +99,11 @@ static struct sr_dev_driver *drivers_list[] = {
 };
 
 /**
- * Return the list of loaded hardware drivers.
- *
- * The list of drivers is initialized from sr_init(), and can only be reset
- * by calling sr_exit().
+ * Return the list of supported hardware drivers.
  *
  * @return Pointer to the NULL-terminated list of hardware driver pointers.
  */
-SR_API struct sr_dev_driver **sr_hw_list(void)
+SR_API struct sr_dev_driver **sr_driver_list(void)
 {
 	return drivers_list;
 }
@@ -121,7 +118,7 @@ SR_API struct sr_dev_driver **sr_hw_list(void)
  *
  * @return The number of devices found and instantiated by the driver.
  */
-SR_API int sr_hw_init(struct sr_dev_driver *driver)
+SR_API int sr_driver_init(struct sr_dev_driver *driver)
 {
 	int num_devs, num_probes, i, j;
 	int num_initialized_devs = 0;
@@ -156,7 +153,7 @@ SR_PRIV void sr_hw_cleanup_all(void)
 	int i;
 	struct sr_dev_driver **drivers;
 
-	drivers = sr_hw_list();
+	drivers = sr_driver_list();
 	for (i = 0; drivers[i]; i++) {
 		if (drivers[i]->cleanup)
 			drivers[i]->cleanup();
@@ -268,7 +265,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
  *         FALSE otherwise. Also, if 'driver' is NULL or the respective driver
  *         returns an invalid capability list, FALSE is returned.
  */
-SR_API gboolean sr_hw_has_hwcap(struct sr_dev_driver *driver, int hwcap)
+SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
 {
 	int *hwcaps, i;
 
@@ -318,7 +315,7 @@ 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)
+		   sr_receive_data_callback_t cb, void *cb_data)
 {
-	sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
+	sr_session_source_add(fd, events, timeout, cb, cb_data);
 }