diff options
| author | Brian Daugherty <bdaugher@quicinc.com> | 2009-07-15 13:13:06 -0600 |
|---|---|---|
| committer | Brian Daugherty <bdaugher@quicinc.com> | 2009-07-15 13:13:06 -0600 |
| commit | a0771c87b71908a5c4ac3b7334039b29743c7fe1 (patch) | |
| tree | 7e0beafc3918cb4f5da5f74f2ac048c87edf63ff | |
| parent | 99b4135a1ba5d6f50d8862cd55c2f183dd1b4884 (diff) | |
| parent | 6be573a9f3f7e646587778296af44590ce900860 (diff) | |
| download | bionic-a0771c87b71908a5c4ac3b7334039b29743c7fe1.zip bionic-a0771c87b71908a5c4ac3b7334039b29743c7fe1.tar.gz bionic-a0771c87b71908a5c4ac3b7334039b29743c7fe1.tar.bz2 | |
Merge commit 'au-01.08.00.230' into donut-release
| -rw-r--r-- | libc/bionic/pthread.c | 2 | ||||
| -rw-r--r-- | libc/kernel/common/linux/msm_mdp.h | 11 | ||||
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 6 | ||||
| -rw-r--r-- | linker/Android.mk | 2 | ||||
| -rw-r--r-- | linker/linker.h | 4 |
5 files changed, 20 insertions, 5 deletions
diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index ec3c459..017466c 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -55,7 +55,7 @@ void _thread_created_hook(pid_t thread_id) __attribute__((noinline)); #define PTHREAD_ATTR_FLAG_USER_STACK 0x00000002 #define DEFAULT_STACKSIZE (1024 * 1024) -#define STACKBASE 0x10000000 +#define STACKBASE 0x60000000 static uint8_t * gStackBase = (uint8_t *)STACKBASE; diff --git a/libc/kernel/common/linux/msm_mdp.h b/libc/kernel/common/linux/msm_mdp.h index 03128be..723caf4 100644 --- a/libc/kernel/common/linux/msm_mdp.h +++ b/libc/kernel/common/linux/msm_mdp.h @@ -21,6 +21,8 @@ #define MSMFB_SUSPEND_SW_REFRESHER _IOW(MSMFB_IOCTL_MAGIC, 128, unsigned int) #define MSMFB_RESUME_SW_REFRESHER _IOW(MSMFB_IOCTL_MAGIC, 129, unsigned int) #define MSMFB_CURSOR _IOW(MSMFB_IOCTL_MAGIC, 130, struct fb_cursor) +#define MSMFB_SET_LUT _IOW(MSMFB_IOCTL_MAGIC, 131, struct fb_cmap) +#define MSMFB_HISTOGRAM _IOWR(MSMFB_IOCTL_MAGIC, 132, struct mdp_histogram) #define MDP_IMGTYPE2_START 0x10000 enum { @@ -91,5 +93,12 @@ struct mdp_blit_req_list { struct mdp_blit_req req[]; }; -#endif +struct mdp_histogram { + uint32_t frame_cnt; + uint32_t bin_cnt; + uint32_t *r; + uint32_t *g; + uint32_t *b; +}; +#endif diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h index 56507ed..355522a 100644 --- a/libc/kernel/common/media/msm_camera.h +++ b/libc/kernel/common/media/msm_camera.h @@ -63,6 +63,8 @@ #define MSM_CAM_IOCTL_FLASH_LED_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 22, enum msm_camera_led_state_t *) +#define MSM_CAM_IOCTL_AF_CTRL _IOR(MSM_CAM_IOCTL_MAGIC, 23, struct msm_ctrl_cmt_t *) +#define MSM_CAM_IOCTL_AF_CTRL_DONE _IOW(MSM_CAM_IOCTL_MAGIC, 24, struct msm_ctrl_cmt_t *) #define MAX_SENSOR_NUM 3 #define MAX_SENSOR_NAME 32 @@ -238,6 +240,10 @@ enum msm_v4l2_ctrl_t { MSM_V4L2_MAX }; +#define PP_SNAP 0x01 +#define PP_RAW_SNAP ((0x01)<<1) +#define PP_PREV ((0x01)<<2) + struct crop_info_t { void *info; int len; diff --git a/linker/Android.mk b/linker/Android.mk index 48141be..cc97690 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES:= \ debugger.c \ ba.c -LINKER_TEXT_BASE := 0xB0000100 +LINKER_TEXT_BASE := 0x70000100 # The maximum size set aside for the linker, from # LINKER_TEXT_BASE rounded down to a megabyte. diff --git a/linker/linker.h b/linker/linker.h index d80c761..bb41075 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -147,8 +147,8 @@ struct soinfo extern soinfo libdl_info; /* these must all be powers of two */ -#define LIBBASE 0x80000000 -#define LIBLAST 0x90000000 +#define LIBBASE 0x10000000 +#define LIBLAST 0x20000000 #define LIBINC 0x00100000 |