Commit f4b85dc0 authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by Linus Torvalds
Browse files

[PATCH] video: pm3fb macros fix 



Signed-off-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4971bb70

include/video/pm3fb.h

+12 −12
Original line number Diff line number Diff line
@@ -607,16 +607,16 @@ 
#define PM3FBDestReadModeOr					0xac98

	#define PM3FBDestReadMode_ReadDisable			0<<0

	#define PM3FBDestReadMode_ReadEnable			1<<0

	#define PM3FBDestReadMode_StripePitch(sp)	(((sp)&0x7)<<2

	#define PM3FBDestReadMode_StripeHeight(sh)	(((sh)&0x7)<<7

	#define PM3FBDestReadMode_StripePitch(sp)	(((sp)&0x7)<<2)

	#define PM3FBDestReadMode_StripeHeight(sh)	(((sh)&0x7)<<7)

	#define PM3FBDestReadMode_Enable0			1<<8

	#define PM3FBDestReadMode_Enable1			1<<9

	#define PM3FBDestReadMode_Enable2			1<<10

	#define PM3FBDestReadMode_Enable3			1<<11

	#define PM3FBDestReadMode_Layout0(l)		(((l)&0x3)<<12

	#define PM3FBDestReadMode_Layout1(l)		(((l)&0x3)<<14

	#define PM3FBDestReadMode_Layout2(l)		(((l)&0x3)<<16

	#define PM3FBDestReadMode_Layout3(l)		(((l)&0x3)<<18

	#define PM3FBDestReadMode_Layout0(l)		(((l)&0x3)<<12)

	#define PM3FBDestReadMode_Layout1(l)		(((l)&0x3)<<14)

	#define PM3FBDestReadMode_Layout2(l)		(((l)&0x3)<<16)

	#define PM3FBDestReadMode_Layout3(l)		(((l)&0x3)<<18)

	#define PM3FBDestReadMode_Origin0			1<<20

	#define PM3FBDestReadMode_Origin1			1<<21

	#define PM3FBDestReadMode_Origin2			1<<22
@@ -640,16 +640,16 @@ 
#define PM3FBSourceReadModeOr					0xaca8

	#define PM3FBSourceReadMode_ReadDisable			(0<<0)

	#define PM3FBSourceReadMode_ReadEnable			(1<<0)

	#define PM3FBSourceReadMode_StripePitch(sp)	(((sp)&0x7)<<2

	#define PM3FBSourceReadMode_StripeHeight(sh)	(((sh)&0x7)<<7

	#define PM3FBSourceReadMode_Layout(l)		(((l)&0x3)<<8

	#define PM3FBSourceReadMode_StripePitch(sp)	(((sp)&0x7)<<2)

	#define PM3FBSourceReadMode_StripeHeight(sh)	(((sh)&0x7)<<7)

	#define PM3FBSourceReadMode_Layout(l)		(((l)&0x3)<<8)

	#define PM3FBSourceReadMode_Origin			1<<10

	#define PM3FBSourceReadMode_Blocking			1<<11

	#define PM3FBSourceReadMode_UserTexelCoord		1<<13

	#define PM3FBSourceReadMode_WrapXEnable			1<<14

	#define PM3FBSourceReadMode_WrapYEnable			1<<15

	#define PM3FBSourceReadMode_WrapX(w)		(((w)&0xf)<<16

	#define PM3FBSourceReadMode_WrapY(w)		(((w)&0xf)<<20

	#define PM3FBSourceReadMode_WrapX(w)		(((w)&0xf)<<16)

	#define PM3FBSourceReadMode_WrapY(w)		(((w)&0xf)<<20)

	#define PM3FBSourceReadMode_ExternalSourceData		1<<24

#define PM3FBWriteBufferAddr0                                   0xb000

#define PM3FBWriteBufferAddr1                                   0xb008
@@ -942,7 +942,7 @@ 
#define PM3Window						0x8980

	#define PM3Window_ForceLBUpdate				1<<3

	#define PM3Window_LBUpdateSource			1<<4

	#define PM3Window_FrameCount(c)				(((c)&0xff)<<9

	#define PM3Window_FrameCount(c)				(((c)&0xff)<<9)

	#define PM3Window_StencilFCP				1<<17

	#define PM3Window_DepthFCP				1<<18

	#define PM3Window_OverrideWriteFiltering		1<<19