Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84d436b authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

pm3fb: header file cleanup 



This patch fixes white spaces, redudant definitions and formating in the pm3fb
header file.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ff1edee

include/video/pm3fb.h

+602 −632
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
	#define PM3ByApertureMode_EFFECTIVE_STRIDE_2048		(1 << 7)

	#define PM3ByApertureMode_EFFECTIVE_STRIDE_4096		(2 << 7)

	#define PM3ByApertureMode_EFFECTIVE_STRIDE_8192		(3 << 7)

	#define PM3ByApertureMode_PATCH_OFFSET_X(off)	(((off)&7f)<<9)

	#define PM3ByApertureMode_PATCH_OFFSET_Y(off)	(((off)&7f)<<16)

	#define PM3ByApertureMode_PATCH_OFFSET_X(off)	(((off) & 0x7f) << 9)

	#define PM3ByApertureMode_PATCH_OFFSET_Y(off)	(((off) & 0x7f) << 16)

	#define PM3ByApertureMode_FRAMEBUFFER			(0 << 21)

	#define PM3ByApertureMode_LOCALBUFFER			(1 << 21)

	#define PM3ByApertureMode_DOUBLE_WRITE_OFF		(0 << 22)
@@ -165,21 +165,36 @@ 
	#define PM3VideoOverlayMode_PIXELSIZE_8BIT		(0 << 5)

	#define PM3VideoOverlayMode_PIXELSIZE_16BIT		(1 << 5)

	#define PM3VideoOverlayMode_PIXELSIZE_32BIT		(2 << 5)

        #define PM3VideoOverlayMode_COLORFORMAT_RGB8888 ((0<<7)|(1<<12)|(2<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_RGB4444 ((1<<7)|(1<<12)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_RGB5551 ((2<<7)|(1<<12)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_RGB565  ((3<<7)|(1<<12)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_RGB332  ((4<<7)|(1<<12)|(0<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_BGR8888 ((0<<7)|(2<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_BGR4444 ((1<<7)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_BGR5551 ((2<<7)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_BGR565  ((3<<7)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_BGR332  ((4<<7)|(0<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_CI8     ((5<<7)|(1<<12)|(0<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_VUY444  ((2<<10)|(1<<12)|(2<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_YUV444  ((2<<10)|(2<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_VUY422  ((1<<10)|(1<<12)|(1<<5))

        #define PM3VideoOverlayMode_COLORFORMAT_YUV422  ((1<<10)|(1<<5))

	#define PM3VideoOverlayMode_COLORFORMAT_RGB8888		\

					((0 << 7)|(1 << 12)|(2 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_RGB4444		\

					((1 << 7)|(1 << 12)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_RGB5551		\

					((2 << 7)|(1 << 12)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_RGB565		\

					((3 << 7)|(1 << 12)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_RGB332		\

					((4 << 7)|(1 << 12)|(0 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_BGR8888		\

					((0 << 7)|(2 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_BGR4444		\

					((1 << 7)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_BGR5551		\

					((2 << 7)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_BGR565		\

					((3 << 7)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_BGR332		\

					((4 << 7)|(0 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_CI8		\

					((5 << 7)|(1 << 12)|(0 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_VUY444		\

					((2 << 10)|(1 << 12)|(2 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_YUV444		\

					((2 << 10)|(2 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_VUY422		\

					((1 << 10)|(1 << 12)|(1 << 5))

	#define PM3VideoOverlayMode_COLORFORMAT_YUV422		\

					((1 << 10)|(1 << 5))

	#define PM3VideoOverlayMode_COLORORDER_BGR		(0 << 12)

	#define PM3VideoOverlayMode_COLORORDER_RGB		(1 << 12)

	#define PM3VideoOverlayMode_LINEARCOLOREXT_OFF		(0 << 13)
@@ -543,47 +558,47 @@ 
#define PM3FBDestReadEnablesAnd					0xad20

#define PM3FBDestReadEnablesOr					0xad28

	#define PM3FBDestReadEnables_E(e)		((e) & 0xff)

	#define PM3FBDestReadEnables_E0				1<<0

	#define PM3FBDestReadEnables_E1				1<<1

	#define PM3FBDestReadEnables_E2				1<<2

	#define PM3FBDestReadEnables_E3				1<<3

	#define PM3FBDestReadEnables_E4				1<<4

	#define PM3FBDestReadEnables_E5				1<<5

	#define PM3FBDestReadEnables_E6				1<<6

	#define PM3FBDestReadEnables_E7				1<<7

	#define PM3FBDestReadEnables_E0				(1 << 0)

	#define PM3FBDestReadEnables_E1				(1 << 1)

	#define PM3FBDestReadEnables_E2				(1 << 2)

	#define PM3FBDestReadEnables_E3				(1 << 3)

	#define PM3FBDestReadEnables_E4				(1 << 4)

	#define PM3FBDestReadEnables_E5				(1 << 5)

	#define PM3FBDestReadEnables_E6				(1 << 6)

	#define PM3FBDestReadEnables_E7				(1 << 7)

	#define PM3FBDestReadEnables_R(r)		(((r) & 0xff) << 8)

	#define PM3FBDestReadEnables_R0				1<<8

	#define PM3FBDestReadEnables_R1				1<<9

	#define PM3FBDestReadEnables_R2				1<<10

	#define PM3FBDestReadEnables_R3				1<<11

	#define PM3FBDestReadEnables_R4				1<<12

	#define PM3FBDestReadEnables_R5				1<<13

	#define PM3FBDestReadEnables_R6				1<<14

	#define PM3FBDestReadEnables_R7				1<<15

	#define PM3FBDestReadEnables_R0				(1 << 8)

	#define PM3FBDestReadEnables_R1				(1 << 9)

	#define PM3FBDestReadEnables_R2				(1 << 10)

	#define PM3FBDestReadEnables_R3				(1 << 11)

	#define PM3FBDestReadEnables_R4				(1 << 12)

	#define PM3FBDestReadEnables_R5				(1 << 13)

	#define PM3FBDestReadEnables_R6				(1 << 14)

	#define PM3FBDestReadEnables_R7				(1 << 15)

	#define PM3FBDestReadEnables_ReferenceAlpha(a)	(((a) & 0xff) << 24)



#define PM3FBDestReadMode					0xaee0

#define PM3FBDestReadModeAnd					0xac90

#define PM3FBDestReadModeOr					0xac98

	#define PM3FBDestReadMode_ReadDisable			0<<0

	#define PM3FBDestReadMode_ReadEnable			1<<0

	#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_Enable0			1<<8

	#define PM3FBDestReadMode_Enable1			1<<9

	#define PM3FBDestReadMode_Enable2			1<<10

	#define PM3FBDestReadMode_Enable3			1<<11

	#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_Origin0			1<<20

	#define PM3FBDestReadMode_Origin1			1<<21

	#define PM3FBDestReadMode_Origin2			1<<22

	#define PM3FBDestReadMode_Origin3			1<<23

	#define PM3FBDestReadMode_Blocking			1<<24

	#define PM3FBDestReadMode_UseReadEnabled		1<<26

	#define PM3FBDestReadMode_AlphaFiltering		1<<27

	#define PM3FBDestReadMode_Origin0			(1 << 20)

	#define PM3FBDestReadMode_Origin1			(1 << 21)

	#define PM3FBDestReadMode_Origin2			(1 << 22)

	#define PM3FBDestReadMode_Origin3			(1 << 23)

	#define PM3FBDestReadMode_Blocking			(1 << 24)

	#define PM3FBDestReadMode_UseReadEnabled		(1 << 26)

	#define PM3FBDestReadMode_AlphaFiltering		(1 << 27)



#define PM3FBHardwareWriteMask					0x8ac0

#define PM3FBSoftwareWriteMask					0x8820
@@ -603,14 +618,14 @@ 
	#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_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_ExternalSourceData		1<<24

	#define PM3FBSourceReadMode_ExternalSourceData		(1 << 24)

#define PM3FBWriteBufferAddr0					0xb000

#define PM3FBWriteBufferAddr1					0xb008

#define PM3FBWriteBufferAddr2					0xb010
@@ -632,24 +647,24 @@ 
#define PM3FBWriteMode						0x8ab8

#define PM3FBWriteModeAnd					0xacf0

#define PM3FBWriteModeOr					0xacf8

	#define PM3FBWriteMode_WriteDisable                     0<<0

	#define PM3FBWriteMode_WriteEnable                      1<<0

	#define PM3FBWriteMode_Replicate                        1<<4

	#define PM3FBWriteMode_OpaqueSpan                       1<<5

	#define PM3FBWriteMode_WriteDisable			(0 << 0)

	#define PM3FBWriteMode_WriteEnable			(1 << 0)

	#define PM3FBWriteMode_Replicate			(1 << 4)

	#define PM3FBWriteMode_OpaqueSpan			(1 << 5)

	#define PM3FBWriteMode_StripePitch(p)		(((p) & 0x7) << 6)

	#define PM3FBWriteMode_StripeHeight(h)		(((h) & 0x7) << 9)

	#define PM3FBWriteMode_Enable0                          1<<12

	#define PM3FBWriteMode_Enable1                          1<<13

	#define PM3FBWriteMode_Enable2                          1<<14

	#define PM3FBWriteMode_Enable3                          1<<15

	#define PM3FBWriteMode_Enable0				(1 << 12)

	#define PM3FBWriteMode_Enable1				(1 << 13)

	#define PM3FBWriteMode_Enable2				(1 << 14)

	#define PM3FBWriteMode_Enable3				(1 << 15)

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

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

	#define PM3FBWriteMode_Layout2(l)		(((l) & 0x3) << 20)

	#define PM3FBWriteMode_Layout3(l)		(((l) & 0x3) << 22)

	#define PM3FBWriteMode_Origin0                          1<<24

	#define PM3FBWriteMode_Origin1                          1<<25

	#define PM3FBWriteMode_Origin2                          1<<26

	#define PM3FBWriteMode_Origin3                          1<<27

	#define PM3FBWriteMode_Origin0				(1 << 24)

	#define PM3FBWriteMode_Origin1				(1 << 25)

	#define PM3FBWriteMode_Origin2				(1 << 26)

	#define PM3FBWriteMode_Origin3				(1 << 27)

#define PM3ForegroundColor					0xb0c0

/* ... */

#define PM3GIDMode						0xb538
@@ -664,14 +679,14 @@ 
#define PM3LBDestReadMode					0xb500

#define PM3LBDestReadModeAnd					0xb580

#define PM3LBDestReadModeOr					0xb588

	#define PM3LBDestReadMode_Disable			0<<0

	#define PM3LBDestReadMode_Enable			1<<0

	#define PM3LBDestReadMode_Disable			(0 << 0)

	#define PM3LBDestReadMode_Enable			(1 << 0)

	#define PM3LBDestReadMode_StripePitch(p)	(((p) & 0x7) << 2)

	#define PM3LBDestReadMode_StripeHeight(h)	(((h) & 0x7) << 5)

	#define PM3LBDestReadMode_Layout			1<<8

	#define PM3LBDestReadMode_Origin			1<<9

	#define PM3LBDestReadMode_UserReadEnables		1<<10

	#define PM3LBDestReadMode_Packed16			1<<11

	#define PM3LBDestReadMode_Layout			(1 << 8)

	#define PM3LBDestReadMode_Origin			(1 << 9)

	#define PM3LBDestReadMode_UserReadEnables		(1 << 10)

	#define PM3LBDestReadMode_Packed16			(1 << 11)

	#define PM3LBDestReadMode_Width(w)		(((w) & 0xfff) << 12)

#define PM3LBReadFormat						0x8888

	#define PM3LBReadFormat_DepthWidth(w)		(((w) & 0x3) << 0)
@@ -686,12 +701,12 @@ 
#define PM3LBSourceReadMode					0xb520

#define PM3LBSourceReadModeAnd					0xb5a0

#define PM3LBSourceReadModeOr					0xb5a8

	#define PM3LBSourceReadMode_Enable			1<<0

	#define PM3LBSourceReadMode_Enable			(1 << 0)

	#define PM3LBSourceReadMode_StripePitch(p)	(((p) & 0x7) << 2)

	#define PM3LBSourceReadMode_StripeHeight(h)	(((h) & 0x7) << 5)

	#define PM3LBSourceReadMode_Layout			1<<8

	#define PM3LBSourceReadMode_Origin			1<<9

	#define PM3LBSourceReadMode_Packed16			1<<10

	#define PM3LBSourceReadMode_Layout			(1 << 8)

	#define PM3LBSourceReadMode_Origin			(1 << 9)

	#define PM3LBSourceReadMode_Packed16			(1 << 10)

	#define PM3LBSourceReadMode_Width(w)		(((w) & 0xfff) << 11)

#define PM3LBStencil						0x88a8

#define PM3LBWriteBufferAddr					0xb540
@@ -705,13 +720,13 @@ 
#define PM3LBWriteMode						0x88c0

#define PM3LBWriteModeAnd					0xac80

#define PM3LBWriteModeOr					0xac88

	#define PM3LBWriteMode_WriteDisable			0<<0

	#define PM3LBWriteMode_WriteEnable			1<<0

	#define PM3LBWriteMode_WriteDisable			(0 << 0)

	#define PM3LBWriteMode_WriteEnable			(1 << 0)

	#define PM3LBWriteMode_StripePitch(p)		(((p) & 0x7) << 3)

	#define PM3LBWriteMode_StripeHeight(h)		(((h) & 0x7) << 6)

	#define PM3LBWriteMode_Layout				1<<9

	#define PM3LBWriteMode_Origin				1<<10

	#define PM3LBWriteMode_Packed16				1<<11

	#define PM3LBWriteMode_Layout				(1 << 9)

	#define PM3LBWriteMode_Origin				(1 << 10)

	#define PM3LBWriteMode_Packed16				(1 << 11)

	#define PM3LBWriteMode_Width(w)			(((w) & 0xfff) << 12)

/* ... */

#define PM3LineStippleMode					0x81a8
@@ -732,9 +747,6 @@ 
	#define PM3LogicalOpMode_Background_LogicOp(op)	(((op) & 0xf) << 7)

	#define PM3LogicalOpMode_UseConstantSource_Disable	(0 << 11)

	#define PM3LogicalOpMode_UseConstantSource_Enable	(1 << 11)



/* ... */

#define PM3LUT							0x8e80

/* ... */

#define PM3LUT							0x8e80

#define PM3LUTAddress						0x84d0
@@ -814,7 +826,6 @@ 
#define PM3RasterizerModeAnd					0xaba0

#define PM3RasterizerModeOr					0xaba8

#define PM3RectangleHeight					0x94e0

#define PM3Render						0x8038

#define PM3RepeatLine						0x9328

#define PM3ResetPickResult					0x8c20

#define PM3RLEMask						0x8c48
@@ -884,7 +895,7 @@ 
#define PM3TextureMapSize					0xb428

#define PM3TextureMapWidth0					0x8580

#define PM3TextureMapWidth1					0x8588

        #define PM3TextureMapWidth_Width(w)             ((w&0xfff)<<0)

	#define PM3TextureMapWidth_Width(w)		(((w) & 0xfff) << 0)

	#define PM3TextureMapWidth_BorderLayout			(1 << 12)

	#define PM3TextureMapWidth_Layout_Linear		(0 << 13)

	#define PM3TextureMapWidth_Layout_Patch64		(1 << 13)
@@ -900,12 +911,12 @@ 
/* ... */

#define PM3WaitForCompletion					0x80b8

#define PM3Window						0x8980

	#define PM3Window_ForceLBUpdate				1<<3

	#define PM3Window_LBUpdateSource			1<<4

	#define PM3Window_ForceLBUpdate				(1 << 3)

	#define PM3Window_LBUpdateSource			(1 << 4)

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

	#define PM3Window_StencilFCP				1<<17

	#define PM3Window_DepthFCP				1<<18

	#define PM3Window_OverrideWriteFiltering		1<<19

	#define PM3Window_StencilFCP				(1 << 17)

	#define PM3Window_DepthFCP				(1 << 18)

	#define PM3Window_OverrideWriteFiltering		(1 << 19)

#define PM3WindowAnd						0xab80

#define PM3WindowOr						0xab88

#define PM3WindowOrigin						0x81c8
@@ -923,21 +934,21 @@ 
*  GLINT Permedia3 2D setup Unit	      *

***********************************************/

#define PM3Config2D						0xb618

	#define PM3Config2D_OpaqueSpan				1<<0

	#define PM3Config2D_MultiRXBlit				1<<1

	#define PM3Config2D_UserScissorEnable			1<<2

	#define PM3Config2D_FBDestReadEnable			1<<3

	#define PM3Config2D_AlphaBlendEnable			1<<4

	#define PM3Config2D_DitherEnable			1<<5

	#define PM3Config2D_ForegroundROPEnable			1<<6

	#define PM3Config2D_OpaqueSpan				(1 << 0)

	#define PM3Config2D_MultiRXBlit				(1 << 1)

	#define PM3Config2D_UserScissorEnable			(1 << 2)

	#define PM3Config2D_FBDestReadEnable			(1 << 3)

	#define PM3Config2D_AlphaBlendEnable			(1 << 4)

	#define PM3Config2D_DitherEnable			(1 << 5)

	#define PM3Config2D_ForegroundROPEnable			(1 << 6)

	#define PM3Config2D_ForegroundROP(rop)		(((rop) & 0xf) << 7)

	#define PM3Config2D_BackgroundROPEnable			1<<11

	#define PM3Config2D_BackgroundROPEnable			(1 << 11)

	#define PM3Config2D_BackgroundROP(rop)		(((rop) & 0xf) << 12)

	#define PM3Config2D_UseConstantSource			1<<16

	#define PM3Config2D_FBWriteEnable			1<<17

	#define PM3Config2D_Blocking				1<<18

	#define PM3Config2D_ExternalSourceData			1<<19

	#define PM3Config2D_LUTModeEnable			1<<20

	#define PM3Config2D_UseConstantSource			(1 << 16)

	#define PM3Config2D_FBWriteEnable			(1 << 17)

	#define PM3Config2D_Blocking				(1 << 18)

	#define PM3Config2D_ExternalSourceData			(1 << 19)

	#define PM3Config2D_LUTModeEnable			(1 << 20)

#define PM3DownloadGlyphwidth					0xb658

	#define PM3DownloadGlyphwidth_GlyphWidth(gw)	((gw) & 0xffff)

#define PM3DownloadTarget					0xb650
@@ -954,17 +965,17 @@ 
	#define PM3RectanglePosition_YOffset(y)		(((y) & 0xffff) << 16)

#define PM3Render2D						0xb640

	#define PM3Render2D_Width(w)			((w) & 0x0fff)

	#define PM3Render2D_Operation_Normal			0<<12

	#define PM3Render2D_Operation_SyncOnHostData		1<<12

	#define PM3Render2D_Operation_SyncOnBitMask		2<<12

	#define PM3Render2D_Operation_PatchOrderRendering	3<<12

	#define PM3Render2D_FBSourceReadEnable			1<<14

	#define PM3Render2D_SpanOperation			1<<15

	#define PM3Render2D_Operation_Normal			(0 << 12)

	#define PM3Render2D_Operation_SyncOnHostData		(1 << 12)

	#define PM3Render2D_Operation_SyncOnBitMask		(2 << 12)

	#define PM3Render2D_Operation_PatchOrderRendering	(3 << 12)

	#define PM3Render2D_FBSourceReadEnable			(1 << 14)

	#define PM3Render2D_SpanOperation			(1 << 15)

	#define PM3Render2D_Height(h)			(((h) & 0x0fff) << 16)

	#define PM3Render2D_XPositive				1<<28

	#define PM3Render2D_YPositive				1<<29

	#define PM3Render2D_AreaStippleEnable			1<<30

	#define PM3Render2D_TextureEnable			1<<31

	#define PM3Render2D_XPositive				(1 << 28)

	#define PM3Render2D_YPositive				(1 << 29)

	#define PM3Render2D_AreaStippleEnable			(1 << 30)

	#define PM3Render2D_TextureEnable			(1 << 31)

#define PM3Render2DGlyph					0xb648

	#define PM3Render2DGlyph_Width(w)		((w) & 0x7f)

	#define PM3Render2DGlyph_Height(h)		(((h) & 0x7f) << 7)
@@ -983,26 +994,27 @@ 
#define PM3FillBackgroundColor					0x8330

#define PM3FillConfig2D0					0x8338

#define PM3FillConfig2D1					0x8360

	#define PM3FillConfig2D_OpaqueSpan                      1<<0

	#define PM3FillConfig2D_MultiRXBlit                     1<<1

	#define PM3FillConfig2D_UserScissorEnable               1<<2

	#define PM3FillConfig2D_FBDestReadEnable                1<<3

	#define PM3FillConfig2D_AlphaBlendEnable                1<<4

	#define PM3FillConfig2D_DitherEnable                    1<<5

	#define PM3FillConfig2D_ForegroundROPEnable             1<<6

	#define PM3FillConfig2D_OpaqueSpan			(1 << 0)

	#define PM3FillConfig2D_MultiRXBlit			(1 << 1)

	#define PM3FillConfig2D_UserScissorEnable		(1 << 2)

	#define PM3FillConfig2D_FBDestReadEnable		(1 << 3)

	#define PM3FillConfig2D_AlphaBlendEnable		(1 << 4)

	#define PM3FillConfig2D_DitherEnable			(1 << 5)

	#define PM3FillConfig2D_ForegroundROPEnable		(1 << 6)

	#define PM3FillConfig2D_ForegroundROP(rop)	(((rop) & 0xf) << 7)

	#define PM3FillConfig2D_BackgroundROPEnable             1<<11

	#define PM3FillConfig2D_BackgroundROPEnable		(1 << 11)

	#define PM3FillConfig2D_BackgroundROP(rop)	(((rop) & 0xf) << 12)

	#define PM3FillConfig2D_UseConstantSource               1<<16

	#define PM3FillConfig2D_FBWriteEnable                   1<<17

	#define PM3FillConfig2D_Blocking                        1<<18

	#define PM3FillConfig2D_ExternalSourceData              1<<19

	#define PM3FillConfig2D_LUTModeEnable                   1<<20

	#define PM3FillConfig2D_UseConstantSource		(1 << 16)

	#define PM3FillConfig2D_FBWriteEnable			(1 << 17)

	#define PM3FillConfig2D_Blocking			(1 << 18)

	#define PM3FillConfig2D_ExternalSourceData		(1 << 19)

	#define PM3FillConfig2D_LUTModeEnable			(1 << 20)

#define PM3FillFBDestReadBufferAddr				0x8310

#define PM3FillFBSourceReadBufferAddr				0x8308

#define PM3FillFBSourceReadBufferOffset				0x8340

	#define PM3FillFBSourceReadBufferOffset_XOffset(x) ((x) & 0xffff)

	#define PM3FillFBSourceReadBufferOffset_YOffset(y)      (((y)&0xffff)<<16)

	#define PM3FillFBSourceReadBufferOffset_YOffset(y)	\

						(((y) & 0xffff) << 16)

#define PM3FillFBWriteBufferAddr				0x8300

#define PM3FillForegroundColor0					0x8328

#define PM3FillForegroundColor1					0x8358
@@ -1013,8 +1025,6 @@ 
	#define PM3FillRectanglePosition_XOffset(x)	((x) & 0xffff)

	#define PM3FillRectanglePosition_YOffset(y)	(((y) & 0xffff) << 16)



#define PM3_REGS_SIZE           0x10000

#define PM3_MAX_PIXCLOCK        300000

/* a few more useful registers & regs value... */

#define PM3Sync							0x8c40

	#define PM3Sync_Tag					0x188
@@ -1023,38 +1033,6 @@ 
#define PM3OutputFifo						0x2000

#define PM3StatisticMode					0x8c08

#define PM3AreaStippleMode					0x81a0

        #define AreaStipplePattern0					(0x8200)

        #define AreaStipplePattern1					(0x8208)

        #define AreaStipplePattern2					(0x8210)

        #define AreaStipplePattern3					(0x8218)

        #define AreaStipplePattern4					(0x8220)

        #define AreaStipplePattern5					(0x8228)

        #define AreaStipplePattern6					(0x8230)

        #define AreaStipplePattern7					(0x8238)

        #define AreaStipplePattern8					(0x8240)

        #define AreaStipplePattern9					(0x8248)

        #define AreaStipplePattern10					(0x8250)

        #define AreaStipplePattern11					(0x8258)

        #define AreaStipplePattern12					(0x8260)

        #define AreaStipplePattern13					(0x8268)

        #define AreaStipplePattern14					(0x8270)

        #define AreaStipplePattern15					(0x8278)

        #define AreaStipplePattern16					(0x8280)

        #define AreaStipplePattern17					(0x8288)

        #define AreaStipplePattern18					(0x8290)

        #define AreaStipplePattern19					(0x8298)

        #define AreaStipplePattern20					(0x82a0)

        #define AreaStipplePattern21					(0x82a8)

        #define AreaStipplePattern22					(0x82b0)

        #define AreaStipplePattern23					(0x82b8)

        #define AreaStipplePattern24					(0x82c0)

        #define AreaStipplePattern25					(0x82c8)

        #define AreaStipplePattern26					(0x82d0)

        #define AreaStipplePattern27					(0x82d8)

        #define AreaStipplePattern28					(0x82eo)

        #define AreaStipplePattern29					(0x82e8)

        #define AreaStipplePattern30					(0x82f0)

        #define AreaStipplePattern31					(0x82f8)

#define AreaStipplePattern_indexed(i)		(0x8200 + ((i) * 0x8))



#define PM3DepthMode						0x89a0
@@ -1069,10 +1047,6 @@ 
/* ***************************** */

/* ***** pm3fb IOCTL const ***** */

/* ***************************** */

/* debug-only IOCTL */

#define PM3FBIO_CLEARMEMORY 0x504D3300 /* 'PM3\000' */

#define PM3FBIO_CLEARCMAP   0x504D3301 /* 'PM3\001' */

/* common use IOCTL */

#define PM3FBIO_RESETCHIP		0x504D33FF /* 'PM3\377' */



/* ***************************************** */
@@ -1081,11 +1055,7 @@ 


/* fifo size in chip */

#define PM3_FIFO_SIZE						120



/* max size of options */

#define PM3_OPTIONS_SIZE 256



/* max size of font name */

#define PM3_FONTNAME_SIZE 40

#define PM3_REGS_SIZE						0x10000

#define PM3_MAX_PIXCLOCK					300000



#endif /* PM3FB_H */