]> sigrok.org Git - libsigrok.git/commitdiff
fx2lafw: don't use deprecated hwcap_get_all() driver API call
authorBert Vermeulen <redacted>
Fri, 13 Jul 2012 00:31:16 +0000 (02:31 +0200)
committerBert Vermeulen <redacted>
Fri, 3 Aug 2012 08:27:37 +0000 (10:27 +0200)
hardware/fx2lafw/fx2lafw.c

index bdc6b42366f5e887ae006a1575a6061ee20e2924..cc31041e7980d02fb4b37a73462921ff52daff41 100644 (file)
@@ -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,