From b6ef314434e48fad7a460b727cc376d59c042f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 14 Feb 2022 18:50:11 +0100 Subject: [PATCH] tests/tod-drivers: Move FpDeviceFeature definitions to base-fp-device They're public enums, so put there in the expected file. --- tests/tod-drivers/base-fp-device.h | 25 +++++++++++++++++++++++++ tests/tod-drivers/base-fpi-device.h | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/tod-drivers/base-fp-device.h b/tests/tod-drivers/base-fp-device.h index 5d3bbc26..45cdb98f 100644 --- a/tests/tod-drivers/base-fp-device.h +++ b/tests/tod-drivers/base-fp-device.h @@ -86,6 +86,31 @@ typedef enum { FP_DEVICE_ERROR_TODV1_90_4_REMOVED = 0x100, } FpDeviceErrorTODV1_90_4; +typedef enum /*< flags >*/ { + FP_DEVICE_FEATURE_TODV1_92_0_NONE = 0, + FP_DEVICE_FEATURE_TODV1_92_0_CAPTURE = 1 << 0, + FP_DEVICE_FEATURE_TODV1_92_0_IDENTIFY = 1 << 1, + FP_DEVICE_FEATURE_TODV1_92_0_VERIFY = 1 << 2, + FP_DEVICE_FEATURE_TODV1_92_0_STORAGE = 1 << 3, + FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_LIST = 1 << 4, + FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_DELETE = 1 << 5, + FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_CLEAR = 1 << 6, + FP_DEVICE_FEATURE_TODV1_92_0_DUPLICATES_CHECK = 1 << 7, +} FpDeviceFeatureTODV1_92_0; + +typedef enum /*< flags >*/ { + FP_DEVICE_FEATURE_TODV1_94_0_NONE = 0, + FP_DEVICE_FEATURE_TODV1_94_0_CAPTURE = 1 << 0, + FP_DEVICE_FEATURE_TODV1_94_0_IDENTIFY = 1 << 1, + FP_DEVICE_FEATURE_TODV1_94_0_VERIFY = 1 << 2, + FP_DEVICE_FEATURE_TODV1_94_0_STORAGE = 1 << 3, + FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_LIST = 1 << 4, + FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_DELETE = 1 << 5, + FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_CLEAR = 1 << 6, + FP_DEVICE_FEATURE_TODV1_94_0_DUPLICATES_CHECK = 1 << 7, + FP_DEVICE_FEATURE_TODV1_94_0_ALWAYS_ON = 1 << 8, +} FpDeviceFeatureTODV1_94_0; + typedef enum { FP_DEVICE_ERROR_TODV1_94_0_GENERAL, FP_DEVICE_ERROR_TODV1_94_0_NOT_SUPPORTED, diff --git a/tests/tod-drivers/base-fpi-device.h b/tests/tod-drivers/base-fpi-device.h index 0e847611..222ff088 100644 --- a/tests/tod-drivers/base-fpi-device.h +++ b/tests/tod-drivers/base-fpi-device.h @@ -110,31 +110,6 @@ typedef enum { FPI_DEVICE_ACTION_TODV1_92_0_CLEAR_STORAGE } FpiDeviceActionTODV1_92_0; -typedef enum /*< flags >*/ { - FP_DEVICE_FEATURE_TODV1_92_0_NONE = 0, - FP_DEVICE_FEATURE_TODV1_92_0_CAPTURE = 1 << 0, - FP_DEVICE_FEATURE_TODV1_92_0_IDENTIFY = 1 << 1, - FP_DEVICE_FEATURE_TODV1_92_0_VERIFY = 1 << 2, - FP_DEVICE_FEATURE_TODV1_92_0_STORAGE = 1 << 3, - FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_LIST = 1 << 4, - FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_DELETE = 1 << 5, - FP_DEVICE_FEATURE_TODV1_92_0_STORAGE_CLEAR = 1 << 6, - FP_DEVICE_FEATURE_TODV1_92_0_DUPLICATES_CHECK = 1 << 7, -} FpDeviceFeatureTODV1_92_0; - -typedef enum /*< flags >*/ { - FP_DEVICE_FEATURE_TODV1_94_0_NONE = 0, - FP_DEVICE_FEATURE_TODV1_94_0_CAPTURE = 1 << 0, - FP_DEVICE_FEATURE_TODV1_94_0_IDENTIFY = 1 << 1, - FP_DEVICE_FEATURE_TODV1_94_0_VERIFY = 1 << 2, - FP_DEVICE_FEATURE_TODV1_94_0_STORAGE = 1 << 3, - FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_LIST = 1 << 4, - FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_DELETE = 1 << 5, - FP_DEVICE_FEATURE_TODV1_94_0_STORAGE_CLEAR = 1 << 6, - FP_DEVICE_FEATURE_TODV1_94_0_DUPLICATES_CHECK = 1 << 7, - FP_DEVICE_FEATURE_TODV1_94_0_ALWAYS_ON = 1 << 8, -} FpDeviceFeatureTODV1_94_0; - typedef enum { FPI_DEVICE_UDEV_SUBTYPE_TODV1_92_0_SPIDEV = 1 << 0, FPI_DEVICE_UDEV_SUBTYPE_TODV1_92_0_HIDRAW = 1 << 1,