From: Bert Vermeulen <redacted>
Date: Sun, 15 Jul 2012 02:31:58 +0000 (+0200)
Subject: demo: don't use deprecated hwcap_get_all() driver API call
X-Git-Tag: dsupstream~795
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=46c7a4daa772df5853e62f384b123bf1f3d96753;p=libsigrok.git

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 9c0e432d..e6e168fc 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -204,6 +204,9 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_INST:
 		*data = sdi;
 		break;
+	case SR_DI_HWCAPS:
+		*data = hwcaps;
+		break;
 	case SR_DI_NUM_PROBES:
 		*data = GINT_TO_POINTER(NUM_PROBES);
 		break;
@@ -234,11 +237,6 @@ static int hw_dev_status_get(int dev_index)
 	return SR_ST_ACTIVE;
 }
 
-static const int *hw_hwcap_get_all(void)
-{
-	return hwcaps;
-}
-
 static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
 	int ret;
@@ -526,7 +524,6 @@ SR_PRIV struct sr_dev_driver demo_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,