diff options
| author | Arne Coucheron <arco68@gmail.com> | 2014-10-08 18:14:00 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-10-19 19:08:11 +0000 |
| commit | 604a63bc48413b6aae18d1cee31dd30536520ec9 (patch) | |
| tree | 019fbc15395db18d85a2c9b32a8fbdad8ad7d8ef | |
| parent | f9d7d79a96a1c477a56ae28231a3644e708374c8 (diff) | |
| download | device_samsung_espresso3g-604a63bc48413b6aae18d1cee31dd30536520ec9.zip device_samsung_espresso3g-604a63bc48413b6aae18d1cee31dd30536520ec9.tar.gz device_samsung_espresso3g-604a63bc48413b6aae18d1cee31dd30536520ec9.tar.bz2 | |
camera: Update HAL API versions and fix warning
Change-Id: If74287d25580ca3df476c588d074f8d3b0ebfa90
| -rw-r--r-- | camerawrapper/CameraWrapper.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/camerawrapper/CameraWrapper.cpp b/camerawrapper/CameraWrapper.cpp index f9ff088..ea33c48 100644 --- a/camerawrapper/CameraWrapper.cpp +++ b/camerawrapper/CameraWrapper.cpp @@ -45,23 +45,26 @@ static int camera_get_number_of_cameras(void); static int camera_get_camera_info(int camera_id, struct camera_info *info); static struct hw_module_methods_t camera_module_methods = { - open: camera_device_open + .open = camera_device_open, }; camera_module_t HAL_MODULE_INFO_SYM = { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: CAMERA_HARDWARE_MODULE_ID, - name: "Espresso Camera Wrapper", - author: "The CyanogenMod Project", - methods: &camera_module_methods, - dso: NULL, /* remove compilation warnings */ - reserved: {0}, /* remove compilation warnings */ + .common = { + .tag = HARDWARE_MODULE_TAG, + .module_api_version = CAMERA_MODULE_API_VERSION_1_0, + .hal_api_version = HARDWARE_HAL_API_VERSION, + .id = CAMERA_HARDWARE_MODULE_ID, + .name = "Espresso Camera Wrapper", + .author = "The CyanogenMod Project", + .methods = &camera_module_methods, + .dso = NULL, /* remove compilation warnings */ + .reserved = {0}, /* remove compilation warnings */ }, - get_number_of_cameras: camera_get_number_of_cameras, - get_camera_info: camera_get_camera_info, + .get_number_of_cameras = camera_get_number_of_cameras, + .get_camera_info = camera_get_camera_info, + .set_callbacks = NULL, /* remove compilation warnings */ + .get_vendor_tag_ops = NULL, /* remove compilation warnings */ + .reserved = {0}, /* remove compilation warnings */ }; typedef struct wrapper_camera_device { @@ -500,7 +503,7 @@ int camera_device_open(const hw_module_t* module, const char* name, memset(camera_ops, 0, sizeof(*camera_ops)); camera_device->base.common.tag = HARDWARE_DEVICE_TAG; - camera_device->base.common.version = 0; + camera_device->base.common.version = CAMERA_DEVICE_API_VERSION_1_0; camera_device->base.common.module = (hw_module_t *)(module); camera_device->base.common.close = camera_device_close; camera_device->base.ops = camera_ops; |