From 66ee9365c5313d4a1bbb76561b3188566e44c025 Mon Sep 17 00:00:00 2001 From: Kyle Repinski Date: Tue, 17 Nov 2015 12:53:22 -0600 Subject: Update some hw_device_t structs. version_major and version_minor are deprecated. Ensure we actually set the sensor api version. --- keymaster/keymaster_tuna.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'keymaster') diff --git a/keymaster/keymaster_tuna.cpp b/keymaster/keymaster_tuna.cpp index ce97478..4385f23 100644 --- a/keymaster/keymaster_tuna.cpp +++ b/keymaster/keymaster_tuna.cpp @@ -949,20 +949,20 @@ static int tee_open(const hw_module_t* module, const char* name, } static struct hw_module_methods_t keystore_module_methods = { - open: tee_open, + .open = tee_open, }; struct keystore_module HAL_MODULE_INFO_SYM __attribute__ ((visibility ("default"))) = { - common: { - tag: HARDWARE_MODULE_TAG, - module_api_version: KEYMASTER_MODULE_API_VERSION_0_3, - hal_api_version: HARDWARE_HAL_API_VERSION, - id: KEYSTORE_HARDWARE_MODULE_ID, - name: "Keymaster TEE HAL", - author: "The Android Open Source Project", - methods: &keystore_module_methods, - dso: 0, - reserved: {}, + .common = { + .tag = HARDWARE_MODULE_TAG, + .module_api_version = KEYMASTER_MODULE_API_VERSION_0_3, + .hal_api_version = HARDWARE_HAL_API_VERSION, + .id = KEYSTORE_HARDWARE_MODULE_ID, + .name = "Keymaster TEE HAL", + .author = "The Android Open Source Project", + .methods = &keystore_module_methods, + .dso = 0, + .reserved = {}, }, }; -- cgit v1.1