diff options
author | Zhang Bo <bo.zhang@nxp.com> | 2017-05-16 19:11:15 +0800 |
---|---|---|
committer | Zhang Bo <bo.zhang@nxp.com> | 2017-05-17 10:02:27 +0800 |
commit | 801cca972070470e4b6e8cd4b6d3790e89025bb5 (patch) | |
tree | e1671f2be8cbd1e8a870f2368b50c43acabea938 | |
parent | ba19adcd1287854c9d17cdad2b1036e79071f3d7 (diff) | |
download | imx-v4.1-801cca972070470e4b6e8cd4b6d3790e89025bb5.tar.gz |
MA-9597 [Android] change the pxp_dma.h in kernel to resolve the compile fail issue
replace the "bool" with "unsigned char" in this pxp_dma.h. So the updated file
in device/fsl/common/kernel-headers/linux/pxp_dma.h will not cause compile error
in sabresd-7d board.
Change-Id: Iba210eb3d034ca54c35ee092ea20609ad568a7eb
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>
-rw-r--r-- | include/uapi/linux/pxp_dma.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/include/uapi/linux/pxp_dma.h b/include/uapi/linux/pxp_dma.h index 4fb2aebc6fb5..ed55826526c0 100644 --- a/include/uapi/linux/pxp_dma.h +++ b/include/uapi/linux/pxp_dma.h @@ -25,7 +25,6 @@ #ifndef __KERNEL__ typedef unsigned long dma_addr_t; -typedef unsigned char bool; #endif /* PXP Pixel format definitions */ @@ -221,15 +220,15 @@ struct pxp_layer_param { * (these are ignored for S0 and output * layers, and only apply for OL layer) */ - bool combine_enable; + unsigned char combine_enable; unsigned int color_key_enable; unsigned int color_key; - bool global_alpha_enable; + unsigned char global_alpha_enable; /* global alpha is either override or multiply */ - bool global_override; + unsigned char global_override; unsigned char global_alpha; - bool alpha_invert; - bool local_alpha_enable; + unsigned char alpha_invert; + unsigned char local_alpha_enable; int comp_mask; struct pxp_alpha alpha; @@ -276,8 +275,8 @@ struct pxp_proc_data { /* LUT transformation on Y data */ int lut_transform; unsigned char *lut_map; /* 256 entries */ - bool lut_map_updated; /* Map recently changed */ - bool combine_enable; + unsigned char lut_map_updated; /* Map recently changed */ + unsigned char combine_enable; enum pxp_op_type op_type; @@ -306,14 +305,14 @@ struct pxp_proc_data { * valid value 0-63 * set to the lut used for next update */ - bool partial_update; - bool alpha_en; - bool lut_update; - bool reagl_en; /* enable reagl/-d */ - bool reagl_d_en; /* enable reagl or reagl-d */ - bool detection_only; + unsigned char partial_update; + unsigned char alpha_en; + unsigned char lut_update; + unsigned char reagl_en; /* enable reagl/-d */ + unsigned char reagl_d_en; /* enable reagl or reagl-d */ + unsigned char detection_only; int lut; - bool lut_cleanup; + unsigned char lut_cleanup; unsigned int lut_status_1; unsigned int lut_status_2; |