[MPlayer-cvslog] r25300 - trunk/vidix/radeon_vid.c

[ben]

Author: ben
Date: Tue Dec  4 22:56:18 2007
New Revision: 25300

Log:
sync with vidix.sf.net r318: resolve bitfield collision in vidix radeon driver (patch by Guillaume Lecerf)

Modified:
   trunk/vidix/radeon_vid.c

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Tue Dec  4 22:56:18 2007
@@ -272,20 +272,20 @@ static video_registers_t vregs[] = 
 #define R_FAMILY	0x000000FF
 #define R_100		0x00000001
 #define R_120		0x00000002
-#define R_150		0x00000003
-#define R_200		0x00000004
-#define R_250		0x00000005
-#define R_280		0x00000006
-#define R_300		0x00000007
-#define R_350		0x00000008
-#define R_370		0x00000010
-#define R_380		0x00000020
-#define R_420		0x00000040
-#define R_430		0x00000080
-#define R_480		0x00000100
-#define R_520		0x00000200
-#define R_530		0x00000400
-#define R_580		0x00000800
+#define R_150		0x00000004
+#define R_200		0x00000008
+#define R_250		0x00000010
+#define R_280		0x00000020
+#define R_300		0x00000040
+#define R_350		0x00000080
+#define R_370		0x00000100
+#define R_380		0x00000200
+#define R_420		0x00000400
+#define R_430		0x00000800
+#define R_480		0x00001000
+#define R_520		0x00002000
+#define R_530		0x00004000
+#define R_580		0x00008000
 #define R_OVL_SHIFT	0x01000000
 #define R_INTEGRATED	0x02000000
 #define R_PCIE		0x04000000