diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 21:56:18 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 21:56:18 +0000 |
| commit | 7d4d34240e9e7f74329b46fc6fbd9878fb04fb06 (patch) | |
| tree | 5aab2b13c80c067ea98410d285ba7eea2e7d4785 /vidix | |
| parent | cee668bb27e8b8322b9ccdaabab3e58cfe5c413d (diff) | |
| download | mpv-7d4d34240e9e7f74329b46fc6fbd9878fb04fb06.tar.bz2 mpv-7d4d34240e9e7f74329b46fc6fbd9878fb04fb06.tar.xz | |
sync with vidix.sf.net r318: resolve bitfield collision in vidix radeon driver (patch by Guillaume Lecerf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25300 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/radeon_vid.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index f8a8695d53..5e94cc155e 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -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 |