diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-12-08 05:41:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:08 -0500 |
| commit | f4b85dc0a1a6a6af9e67b7993fc833051222f40b (patch) | |
| tree | ada6aefeadb54fd4fde7e088e8480c88c0833e07 | |
| parent | 4971bb70c0b0d0810e0c2b66927de2422ff82119 (diff) | |
[PATCH] video: pm3fb macros fix
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/video/pm3fb.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/video/pm3fb.h b/include/video/pm3fb.h index ac021379ac40..94c7d2da90ea 100644 --- a/include/video/pm3fb.h +++ b/include/video/pm3fb.h | |||
| @@ -607,16 +607,16 @@ | |||
| 607 | #define PM3FBDestReadModeOr 0xac98 | 607 | #define PM3FBDestReadModeOr 0xac98 |
| 608 | #define PM3FBDestReadMode_ReadDisable 0<<0 | 608 | #define PM3FBDestReadMode_ReadDisable 0<<0 |
| 609 | #define PM3FBDestReadMode_ReadEnable 1<<0 | 609 | #define PM3FBDestReadMode_ReadEnable 1<<0 |
| 610 | #define PM3FBDestReadMode_StripePitch(sp) (((sp)&0x7)<<2 | 610 | #define PM3FBDestReadMode_StripePitch(sp) (((sp)&0x7)<<2) |
| 611 | #define PM3FBDestReadMode_StripeHeight(sh) (((sh)&0x7)<<7 | 611 | #define PM3FBDestReadMode_StripeHeight(sh) (((sh)&0x7)<<7) |
| 612 | #define PM3FBDestReadMode_Enable0 1<<8 | 612 | #define PM3FBDestReadMode_Enable0 1<<8 |
| 613 | #define PM3FBDestReadMode_Enable1 1<<9 | 613 | #define PM3FBDestReadMode_Enable1 1<<9 |
| 614 | #define PM3FBDestReadMode_Enable2 1<<10 | 614 | #define PM3FBDestReadMode_Enable2 1<<10 |
| 615 | #define PM3FBDestReadMode_Enable3 1<<11 | 615 | #define PM3FBDestReadMode_Enable3 1<<11 |
| 616 | #define PM3FBDestReadMode_Layout0(l) (((l)&0x3)<<12 | 616 | #define PM3FBDestReadMode_Layout0(l) (((l)&0x3)<<12) |
| 617 | #define PM3FBDestReadMode_Layout1(l) (((l)&0x3)<<14 | 617 | #define PM3FBDestReadMode_Layout1(l) (((l)&0x3)<<14) |
| 618 | #define PM3FBDestReadMode_Layout2(l) (((l)&0x3)<<16 | 618 | #define PM3FBDestReadMode_Layout2(l) (((l)&0x3)<<16) |
| 619 | #define PM3FBDestReadMode_Layout3(l) (((l)&0x3)<<18 | 619 | #define PM3FBDestReadMode_Layout3(l) (((l)&0x3)<<18) |
| 620 | #define PM3FBDestReadMode_Origin0 1<<20 | 620 | #define PM3FBDestReadMode_Origin0 1<<20 |
| 621 | #define PM3FBDestReadMode_Origin1 1<<21 | 621 | #define PM3FBDestReadMode_Origin1 1<<21 |
| 622 | #define PM3FBDestReadMode_Origin2 1<<22 | 622 | #define PM3FBDestReadMode_Origin2 1<<22 |
| @@ -640,16 +640,16 @@ | |||
| 640 | #define PM3FBSourceReadModeOr 0xaca8 | 640 | #define PM3FBSourceReadModeOr 0xaca8 |
| 641 | #define PM3FBSourceReadMode_ReadDisable (0<<0) | 641 | #define PM3FBSourceReadMode_ReadDisable (0<<0) |
| 642 | #define PM3FBSourceReadMode_ReadEnable (1<<0) | 642 | #define PM3FBSourceReadMode_ReadEnable (1<<0) |
| 643 | #define PM3FBSourceReadMode_StripePitch(sp) (((sp)&0x7)<<2 | 643 | #define PM3FBSourceReadMode_StripePitch(sp) (((sp)&0x7)<<2) |
| 644 | #define PM3FBSourceReadMode_StripeHeight(sh) (((sh)&0x7)<<7 | 644 | #define PM3FBSourceReadMode_StripeHeight(sh) (((sh)&0x7)<<7) |
| 645 | #define PM3FBSourceReadMode_Layout(l) (((l)&0x3)<<8 | 645 | #define PM3FBSourceReadMode_Layout(l) (((l)&0x3)<<8) |
| 646 | #define PM3FBSourceReadMode_Origin 1<<10 | 646 | #define PM3FBSourceReadMode_Origin 1<<10 |
| 647 | #define PM3FBSourceReadMode_Blocking 1<<11 | 647 | #define PM3FBSourceReadMode_Blocking 1<<11 |
| 648 | #define PM3FBSourceReadMode_UserTexelCoord 1<<13 | 648 | #define PM3FBSourceReadMode_UserTexelCoord 1<<13 |
| 649 | #define PM3FBSourceReadMode_WrapXEnable 1<<14 | 649 | #define PM3FBSourceReadMode_WrapXEnable 1<<14 |
| 650 | #define PM3FBSourceReadMode_WrapYEnable 1<<15 | 650 | #define PM3FBSourceReadMode_WrapYEnable 1<<15 |
| 651 | #define PM3FBSourceReadMode_WrapX(w) (((w)&0xf)<<16 | 651 | #define PM3FBSourceReadMode_WrapX(w) (((w)&0xf)<<16) |
| 652 | #define PM3FBSourceReadMode_WrapY(w) (((w)&0xf)<<20 | 652 | #define PM3FBSourceReadMode_WrapY(w) (((w)&0xf)<<20) |
| 653 | #define PM3FBSourceReadMode_ExternalSourceData 1<<24 | 653 | #define PM3FBSourceReadMode_ExternalSourceData 1<<24 |
| 654 | #define PM3FBWriteBufferAddr0 0xb000 | 654 | #define PM3FBWriteBufferAddr0 0xb000 |
| 655 | #define PM3FBWriteBufferAddr1 0xb008 | 655 | #define PM3FBWriteBufferAddr1 0xb008 |
| @@ -942,7 +942,7 @@ | |||
| 942 | #define PM3Window 0x8980 | 942 | #define PM3Window 0x8980 |
| 943 | #define PM3Window_ForceLBUpdate 1<<3 | 943 | #define PM3Window_ForceLBUpdate 1<<3 |
| 944 | #define PM3Window_LBUpdateSource 1<<4 | 944 | #define PM3Window_LBUpdateSource 1<<4 |
| 945 | #define PM3Window_FrameCount(c) (((c)&0xff)<<9 | 945 | #define PM3Window_FrameCount(c) (((c)&0xff)<<9) |
| 946 | #define PM3Window_StencilFCP 1<<17 | 946 | #define PM3Window_StencilFCP 1<<17 |
| 947 | #define PM3Window_DepthFCP 1<<18 | 947 | #define PM3Window_DepthFCP 1<<18 |
| 948 | #define PM3Window_OverrideWriteFiltering 1<<19 | 948 | #define PM3Window_OverrideWriteFiltering 1<<19 |