From: Bert Vermeulen <redacted>
Date: Fri, 13 Jul 2012 00:31:16 +0000 (+0200)
Subject: fx2lafw: don't use deprecated hwcap_get_all() driver API call
X-Git-Tag: dsupstream~827
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=a27999e65768dcf38366e1844b97b3b8ea243dd2;p=libsigrok.git

fx2lafw: don't use deprecated hwcap_get_all() driver API call
---

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index bdc6b423..cc31041e 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -618,7 +618,14 @@ static int hw_info_get(int dev_info_id, const void **data,
 
 	switch (dev_info_id) {
 	case SR_DI_INST:
-		return sdi;
+		*data = sdi;
+		break;
+	case SR_DI_HWOPTS:
+		*data = NULL;
+		break;
+	case SR_DI_HWCAPS:
+		*data = hwcaps;
+		break;
 	case SR_DI_NUM_PROBES:
 		if (sdi) {
 			ctx = sdi->priv;
@@ -662,11 +669,6 @@ static int hw_dev_status_get(int dev_index)
 	return sdi->status;
 }
 
-static const int *hw_hwcap_get_all(void)
-{
-	return hwcaps;
-}
-
 static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
 	struct sr_dev_inst *sdi;
@@ -1057,7 +1059,6 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
 	.dev_close = hw_dev_close,
 	.info_get = hw_info_get,
 	.dev_status_get = hw_dev_status_get,
-	.hwcap_get_all = hw_hwcap_get_all,
 	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,