X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=c265b1beaa747d9043199b6fc77f157efb73252e;hb=42cdeef6268a2fa28a42e472324c5122410847d0;hp=faeda45cfa236ff5e26d0b1cb5be8bd8f0757228;hpb=1f9813eb6cf2fa3b6511af46b19270feb9484c1e;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index faeda45c..c265b1be 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},
 };
@@ -42,9 +42,6 @@ SR_API struct sr_hwcap_option sr_hwcap_options[] = {
 #ifdef HAVE_LA_DEMO
 extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #endif
-#ifdef HAVE_LA_SALEAE_LOGIC
-extern SR_PRIV struct sr_dev_driver saleae_logic_driver_info;
-#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -71,9 +68,6 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_DEMO
 	&demo_driver_info,
 #endif
-#ifdef HAVE_LA_SALEAE_LOGIC
-	&saleae_logic_driver_info,
-#endif
 #ifdef HAVE_LA_OLS
 	&ols_driver_info,
 #endif
@@ -307,15 +301,15 @@ SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
 	return NULL;
 }
 
-/* unnecessary level of indirection follows. */
+/* Unnecessary level of indirection follows. */
 
-SR_PRIV void sr_source_remove(int fd)
+SR_PRIV int sr_source_remove(int fd)
 {
-	sr_session_source_remove(fd);
+	return sr_session_source_remove(fd);
 }
 
-SR_PRIV void sr_source_add(int fd, int events, int timeout,
-		   sr_receive_data_callback_t cb, void *cb_data)
+SR_PRIV int sr_source_add(int fd, int events, int timeout,
+			  sr_receive_data_callback_t cb, void *cb_data)
 {
-	sr_session_source_add(fd, events, timeout, cb, cb_data);
+	return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }