summaryrefslogtreecommitdiffstats
path: root/keymaster
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2015-11-17 12:53:22 -0600
committerZiyan <jaraidaniel@gmail.com>2016-01-17 22:41:00 +0100
commit66ee9365c5313d4a1bbb76561b3188566e44c025 (patch)
tree763f4211d876aeeb9a4c8e993f4228a67ca576e5 /keymaster
parentcb8261e6db2a6a13ea67b1848e1cab6b0e7091ec (diff)
downloaddevice_samsung_tuna-66ee9365c5313d4a1bbb76561b3188566e44c025.zip
device_samsung_tuna-66ee9365c5313d4a1bbb76561b3188566e44c025.tar.gz
device_samsung_tuna-66ee9365c5313d4a1bbb76561b3188566e44c025.tar.bz2
Update some hw_device_t structs.
version_major and version_minor are deprecated. Ensure we actually set the sensor api version.
Diffstat (limited to 'keymaster')
-rw-r--r--keymaster/keymaster_tuna.cpp22
1 files changed, 11 insertions, 11 deletions
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 = {},
},
};