diff options
Diffstat (limited to 'original-kernel-headers/media/msm_isp.h')
| -rw-r--r-- | original-kernel-headers/media/msm_isp.h | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/original-kernel-headers/media/msm_isp.h b/original-kernel-headers/media/msm_isp.h index 9fa5932..a0aede0 100644 --- a/original-kernel-headers/media/msm_isp.h +++ b/original-kernel-headers/media/msm_isp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -235,9 +235,9 @@ #define VFE_CMD_TEST_GEN_CFG 162 struct msm_isp_cmd { - int32_t id; + int32_t id; uint16_t length; - void *value; + void *value; }; #define VPE_CMD_DUMMY_0 0 @@ -255,14 +255,14 @@ struct msm_isp_cmd { #define VPE_CMD_ZOOM 13 #define VPE_CMD_MAX 14 -#define MSM_PP_CMD_TYPE_NOT_USED 0 /* not used */ -#define MSM_PP_CMD_TYPE_VPE 1 /* VPE cmd */ -#define MSM_PP_CMD_TYPE_MCTL 2 /* MCTL cmd */ +#define MSM_PP_CMD_TYPE_NOT_USED 0 /* not used */ +#define MSM_PP_CMD_TYPE_VPE 1 /* VPE cmd */ +#define MSM_PP_CMD_TYPE_MCTL 2 /* MCTL cmd */ -#define MCTL_CMD_DUMMY_0 0 /* not used */ -#define MCTL_CMD_GET_FRAME_BUFFER 1 /* reserve a free frame buffer */ -#define MCTL_CMD_PUT_FRAME_BUFFER 2 /* return the free frame buffer */ -#define MCTL_CMD_DIVERT_FRAME_PP_PATH 3 /* divert frame for pp */ +#define MCTL_CMD_DUMMY_0 0 /* not used */ +#define MCTL_CMD_GET_FRAME_BUFFER 1 /* reserve a free frame buffer */ +#define MCTL_CMD_PUT_FRAME_BUFFER 2 /* return the free frame buffer */ +#define MCTL_CMD_DIVERT_FRAME_PP_PATH 3 /* divert frame for pp */ /* event typese sending to MCTL PP module */ #define MCTL_PP_EVENT_NOTUSED 0 @@ -275,7 +275,6 @@ struct msm_isp_cmd { #define VPE_SCALER_CONFIG_LEN 260 #define VPE_DIS_OFFSET_CFG_LEN 12 - #define CAPTURE_WIDTH 1280 #define IMEM_Y_SIZE (CAPTURE_WIDTH*16) #define IMEM_CBCR_SIZE (CAPTURE_WIDTH*8) @@ -286,7 +285,6 @@ struct msm_isp_cmd { #define IMEM_Y_PONG_OFFSET (IMEM_CBCR_PING_OFFSET + IMEM_CBCR_SIZE) #define IMEM_CBCR_PONG_OFFSET (IMEM_Y_PONG_OFFSET + IMEM_Y_SIZE) - struct msm_vpe_op_mode_cfg { uint8_t op_mode_cfg[VPE_OPERATION_MODE_CFG_LEN]; }; @@ -325,14 +323,14 @@ struct msm_vpe_clock_rate { uint32_t rate; }; struct msm_pp_crop { - uint32_t src_x; - uint32_t src_y; - uint32_t src_w; - uint32_t src_h; - uint32_t dst_x; - uint32_t dst_y; - uint32_t dst_w; - uint32_t dst_h; + uint32_t src_x; + uint32_t src_y; + uint32_t src_w; + uint32_t src_h; + uint32_t dst_x; + uint32_t dst_y; + uint32_t dst_w; + uint32_t dst_h; uint8_t update_flag; }; #define MSM_MCTL_PP_VPE_FRAME_ACK (1<<0) @@ -340,7 +338,7 @@ struct msm_pp_crop { struct msm_mctl_pp_frame_cmd { uint32_t cookie; - uint8_t vpe_output_action; + uint8_t vpe_output_action; uint32_t src_buf_handle; uint32_t dest_buf_handle; struct msm_pp_crop crop; @@ -368,4 +366,3 @@ struct msm_frame_info { }; #endif /*__MSM_ISP_H__*/ - |