diff options
author | Nick Kralevich <nnk@google.com> | 2013-10-31 20:20:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-31 20:20:22 +0000 |
commit | 9182ce4dc3c2b180c7dba83fb6253eea08d81022 (patch) | |
tree | f6d726334dad8439085cfcfb348f4fdedca42ab1 | |
parent | 2bfd180d5257d72f7c22c80741e6b03470f3aa60 (diff) | |
parent | 1cf8eeea133768499ab601ac81176906cde671dc (diff) | |
download | omap4xxx-9182ce4dc3c2b180c7dba83fb6253eea08d81022.tar.gz |
Merge "camera: do not use GNU old-style field designators"idea133-weekly-releaseidea133
-rw-r--r-- | camera/CameraHal_Module.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index cb4e804..b2120cf 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -42,23 +42,23 @@ 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: "TI OMAP CameraHal Module", - author: "TI", - methods: &camera_module_methods, - dso: NULL, /* remove compilation warnings */ - reserved: {0}, /* remove compilation warnings */ + .common = { + .tag = HARDWARE_MODULE_TAG, + .version_major = 1, + .version_minor = 0, + .id = CAMERA_HARDWARE_MODULE_ID, + .name = "TI OMAP CameraHal Module", + .author = "TI", + .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, }; typedef struct ti_camera_device { @@ -693,8 +693,3 @@ int camera_get_camera_info(int camera_id, struct camera_info *info) end: return rv; } - - - - - |