diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-08 14:20:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-08 14:20:16 +0200 |
| commit | 85a0db1c2f8d8d986bfb01f2e26eec63ef89bc4c (patch) | |
| tree | f841e053869ff9aa02fff50758d71edc265d2ed3 /src/vpu_reg.h | |
| parent | dd6ebe7daf5237c8e000cadcc13a03825b28f1f5 (diff) | |
| parent | 3eea7b43ffcdca9a30fd6c1867042ba87b753bbf (diff) | |
| download | libfsl-vpu-85a0db1c2f8d8d986bfb01f2e26eec63ef89bc4c.tar.gz libfsl-vpu-85a0db1c2f8d8d986bfb01f2e26eec63ef89bc4c.tar.xz | |
Merge remote branch 'remotes/origin/FSL-2.2.4'
Conflicts:
include/vpu_io.h
include/vpu_lib.h
src/vpu_codetable_mx27.h
src/vpu_io.c
src/vpu_lib.c
src/vpu_reg.h
src/vpu_util.c
src/vpu_util.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'src/vpu_reg.h')
| -rw-r--r-- | src/vpu_reg.h | 59 |
1 files changed, 38 insertions, 21 deletions
diff --git a/src/vpu_reg.h b/src/vpu_reg.h index 59c3289..49342bd 100644 --- a/src/vpu_reg.h +++ b/src/vpu_reg.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. * * Copyright (c) 2006, Chips & Media. All rights reserved. */ @@ -24,7 +24,7 @@ #ifndef __VPU__REG__H #define __VPU__REG__H -#define IMX27ADS /* Hardcode mx27 for now */ +#define IMX27ADS /*--------------------------------------------------------------------------- * HARDWARE REGISTER @@ -57,8 +57,21 @@ #define BIT_WR_PTR_2 0x134 #define BIT_RD_PTR_3 0x138 #define BIT_WR_PTR_3 0x13C +#define BIT_AXI_SRAM_USE 0x140 /* MX37 */ #define BIT_SEARCH_RAM_BASE_ADDR 0x140 #define BIT_SEARCH_RAM_SIZE 0x144 +#define BIT_MX37_IRAM_BASE_ADDR 0x144 + +#define BIT_FRM_DIS_FLG_0 0x150 +#define BIT_FRM_DIS_FLG_1 0x154 +#define BIT_FRM_DIS_FLG_2 0x158 +#define BIT_FRM_DIS_FLG_3 0x15C + +#define BIT_BIT_USE_SRAM_BASE 0x150 +#define BIT_IP_USE_SRAM_BASE 0x154 +#define BIT_DBK_USE_SRAM_BASE 0x158 +#define BIT_OVL_USE_SRAM_BASE 0x15C + #define BIT_BUSY_FLAG 0x160 #define BIT_RUN_COMMAND 0x164 @@ -96,7 +109,11 @@ #define RET_DEC_SEQ_INFO 0x1D4 #define RET_DEC_SEQ_CROP_LEFT_RIGHT 0x1D8 #define RET_DEC_SEQ_CROP_TOP_BOTTOM 0x1DC +#ifdef IMX37_3STACK +#define RET_DEC_SEQ_NEXT_FRAME_NUM 0x1BC +#else #define RET_DEC_SEQ_NEXT_FRAME_NUM 0x1E0 +#endif /*-------------------------------------------------------------------------- * [ENC SEQ INIT] COMMAND @@ -147,14 +164,7 @@ #define CMD_DEC_PIC_DBK_ADDR_CB 0x194 #define CMD_DEC_PIC_DBK_ADDR_CR 0x198 -#if defined(IMX27ADS) -#define CMD_DEC_PIC_ROT_STRIDE 0x190 -#define CMD_DEC_PIC_OPTION 0x194 -#define CMD_DEC_PIC_SKIP_NUM 0x198 -#define CMD_DEC_PIC_CHUNK_SIZE 0x19C -#define CMD_DEC_PIC_BB_START 0x1A0 -#define CMD_DEC_PIC_START_BYTE 0x1A4 -#elif defined(IMX31ADS) || defined(MXC30031ADS) +#if !defined(IMX27ADS) && !defined(IMX27PDK) #define CMD_DEC_PIC_ROT_STRIDE 0x19C #define CMD_DEC_PIC_OPTION 0x1A0 #define CMD_DEC_PIC_SKIP_NUM 0x1A4 @@ -162,7 +172,12 @@ #define CMD_DEC_PIC_BB_START 0x1AC #define CMD_DEC_PIC_START_BYTE 0x1B0 #else -#error you must define PLATFORM properly +#define CMD_DEC_PIC_ROT_STRIDE 0x190 +#define CMD_DEC_PIC_OPTION 0x194 +#define CMD_DEC_PIC_SKIP_NUM 0x198 +#define CMD_DEC_PIC_CHUNK_SIZE 0x19C +#define CMD_DEC_PIC_BB_START 0x1A0 +#define CMD_DEC_PIC_START_BYTE 0x1A4 #endif #define RET_DEC_PIC_FRAME_NUM 0x1C0 @@ -172,18 +187,20 @@ #define RET_DEC_PIC_POST 0x1D0 -#if defined(IMX27ADS) -#define RET_DEC_PIC_OPTION 0x1D0 -#define RET_DEC_PIC_SUCCESS 0x1D4 -#elif defined(IMX31ADS) || defined(MXC30031ADS) +#if !defined(IMX27ADS) && !defined(IMX27PDK) #define RET_DEC_PIC_OPTION 0x1D4 #define RET_DEC_PIC_SUCCESS 0x1D8 #else -#error you must define PLATFORM properly +#define RET_DEC_PIC_OPTION 0x1D0 +#define RET_DEC_PIC_SUCCESS 0x1D4 #endif #define RET_DEC_PIC_CUR_IDX 0x1DC +#ifdef IMX37_3STACK +#define RET_DEC_PIC_NEXT_IDX 0x1BC +#else #define RET_DEC_PIC_NEXT_IDX 0x1E0 +#endif /*--------------------------------------------------------------------------- * [ENC PIC RUN] COMMAND @@ -237,7 +254,7 @@ *-------------------------------------------------------------------------*/ #define RET_VER_NUM 0x1c0 -#if defined(IMX27ADS) +#if defined(IMX27ADS) || defined(IMX27PDK) #define CODE_BUF_SIZE (64 * 1024) #define FMO_SLICE_SAVE_BUF_SIZE (32) #define WORK_BUF_SIZE (288 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8) @@ -249,11 +266,11 @@ #define WORK_BUF_SIZE (190 * 1024) #define PARA_BUF2_SIZE (1728) #define PARA_BUF_SIZE (10 * 1024) -#elif defined(MXC30031ADS) +#elif defined(IMX37_3STACK) #define CODE_BUF_SIZE (96 * 1024) - #define FMO_SLICE_SAVE_BUF_SIZE (16) - #define WORK_BUF_SIZE ((512 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8)) - #define PARA_BUF2_SIZE (1728) + #define FMO_SLICE_SAVE_BUF_SIZE (32) /* Not used */ + #define WORK_BUF_SIZE (512 * 1024) + #define PARA_BUF2_SIZE (0) /* Not used */ #define PARA_BUF_SIZE (10 * 1024) #else #error you must define PLATFORM properly |