diff options
| author | Rick Tillery <rtillery@ti.com> | 2012-08-16 14:31:33 -0500 |
|---|---|---|
| committer | Craig Stout <craig.stout@ti.com> | 2012-09-05 13:21:40 -0700 |
| commit | 92741d12c2ceb9a8e8e5121931a466b5615b8671 (patch) | |
| tree | e8d1ca6ebdcf2f19543bb08e8cb348b2c9357c9c | |
| parent | e4fcd5307140f86b919f55f8b608ad0bf38e3217 (diff) | |
| download | hardware_ti_omap4-92741d12c2ceb9a8e8e5121931a466b5615b8671.zip hardware_ti_omap4-92741d12c2ceb9a8e8e5121931a466b5615b8671.tar.gz hardware_ti_omap4-92741d12c2ceb9a8e8e5121931a466b5615b8671.tar.bz2 | |
Fixed errors in mask constants; Added BVFLAG_TESTPARAMS_NOP
Change-Id: I0f2da701ae58cc68f4b2fd349c303b39117b1e5a
Signed-off-by: Rick Tillery <rtillery@ti.com>
| -rw-r--r-- | bltsville/include/bltsville.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/bltsville/include/bltsville.h b/bltsville/include/bltsville.h index 96baebb..632628e 100644 --- a/bltsville/include/bltsville.h +++ b/bltsville/include/bltsville.h @@ -92,7 +92,9 @@ struct bvrect { #define BVFLAG_SRC2_AUXDSTRECT 0x00400000 /* src2auxdstrect used */ #define BVFLAG_MASK_AUXDSTRECT 0x00800000 /* maskauxdstrect used */ -/**** Bits 31-24 reserved ****/ + +#define BVFLAG_TESTPARAMS_NOP 0x01000000 /* test params only - no BLT */ +/**** Bits 25-31 reserved ****/ /* * BVIMPL_* - BLTsville implementations may be combined under managers to @@ -123,7 +125,7 @@ struct bvrect { #define BVSCALEDEF_IMPLICIT (0 << BVSCALEDEF_CLASS_SHIFT) #define BVSCALEDEF_EXPLICIT (1 << BVSCALEDEF_CLASS_SHIFT) /* 2-3 reserved */ -#define BVSCALEDEF_CLASS_MASK (3 << BVSCALEDEF_CLASS_MASK) +#define BVSCALEDEF_CLASS_MASK (3 << BVSCALEDEF_CLASS_SHIFT) /**** IMPLICIT definitions ****/ /*** Bits 21-16 indicate the quality (speed) desired ***/ @@ -132,8 +134,8 @@ struct bvrect { #define BVSCALEDEF_GOOD (0x15 << BVSCALEDEF_QUALITY_SHIFT) #define BVSCALEDEF_BETTER (0x2A << BVSCALEDEF_QUALITY_SHIFT) #define BVSCALEDEF_BEST (0x3F << BVSCALEDEF_QUALITY_SHIFT) -#define BVSCALEDEF_QUALITY_MASK (0x3F << BVSCALEDEF_QUALITY_MASK) -/* Bits 15-12 are reserved */ +#define BVSCALEDEF_QUALITY_MASK (0x3F << BVSCALEDEF_QUALITY_SHIFT) +/* Bits 12-15 are reserved */ /*** Bits 11-8 indicate the desired technique ***/ #define BVSCALEDEF_TECHNIQUE_SHIFT 8 #define BVSCALEDEF_DONT_CARE (0x0 << BVSCALEDEF_TECHNIQUE_SHIFT) @@ -141,17 +143,17 @@ struct bvrect { #define BVSCALEDEF_POINT_SAMPLE (0x2 << BVSCALEDEF_TECHNIQUE_SHIFT) #define BVSCALEDEF_INTERPOLATED (0x3 << BVSCALEDEF_TECHNIQUE_SHIFT) #define BVSCALEDEF_TECHNIQUE_MASK (0xF << BVSCALEDEF_TECHNIQUE_SHIFT) -/* Bits 7-2 reserved */ +/* Bits 2-7 reserved */ /*** Bits 1-0 indicate the type of image ***/ #define BVSCALEDEF_TYPE_SHIFT 0 /* 0 don't know */ #define BVSCALEDEF_PHOTO (1 << BVSCALEDEF_TYPE_SHIFT) #define BVSCALEDEF_DRAWING (2 << BVSCALEDEF_TYPE_SHIFT) /* 3 reserved */ -#define BVSCALEDEF_TYPE_MASK (3 << BVSCALEDEF_TYPE_MASK) +#define BVSCALEDEF_TYPE_MASK (3 << BVSCALEDEF_TYPE_SHIFT) /**** EXPLICIT definitions ****/ -/* Bits 21-16 reserved */ +/* Bits 16-21 reserved */ #define BVSCALEDEF_HORZ_SHIFT 8 #define BVSCALEDEF_HORZ_MASK (0xFF << BVSCALEDEF_HORZ_SHIFT) @@ -303,7 +305,7 @@ enum bvscalemode { #define BVDITHERDEF_VENDOR_GENERIC (0xFF << BVDITHERDEF_VENDOR_SHIFT) /***** VENDOR_GENERIC definitions *****/ -/* Bits 23-18 reserved */ +/* Bits 18-23 reserved */ /**** Bits 17-16 indicate the type of image - 0 = don't know ****/ #define BVDITHERDEF_TYPE_SHIFT 16 #define BVDITHERDEF_PHOTO (0x01 << BVDITHERDEF_TYPE_SHIFT) @@ -482,7 +484,7 @@ struct bvtileparams { #define BVBATCH_TILE_SRC1 0x00400000 /* tile params for src 1 changed */ #define BVBATCH_TILE_SRC2 0x00800000 /* tile params for src 2 changed */ #define BVBATCH_TILE_MASK 0x00100000 /* tile params for mask changed */ -/* Bits 30-21 reserved */ +/* Bits 21-30 reserved */ #define BVBATCH_ENDNOP 0x80000000 /* just end batch, don't do BLT; only with BVFLAG_BATCH_END */ |