[MPlayer-dev-eng] recent vidix pcidb patch

[Diego Biurrun]

Vladimir Mosgalin writes:
> There is mistake in the recent patch. At least in these lines:
> 
> +d      10024e4a        Radeon RV350 NJ [Radeon 9800 XT]        0
> +d      10024e6a        Radeon RV350 NJ [Radeon 9800 XT] (Secondary)    0
> 
> AFAIR RV350 is either 9600 or 9600 Pro, and 9800 XT should be R360...

I've taken these IDs from pciids.sf.net,

http://pciids.sourceforge.net/iii/?i=1002

But the IDs do indeed contradict e.g.

http://www20.tomshardware.com/graphic/20031229/

It works for me with a Radeon 9800 XXT on Windows XP, where I find the
following keys in the registry:

Description:		MEDION RADEON 9800 XXL (0x00000000)
Hardware RegKey:	VEN_1002&DEV_4E4A&SUBSYS_95601787&REV_00
Inf Section:		ati2mtag_R360 (0x00000000)

Description:		MEDION RADEON 9800 XXL (0x00000000)
Hardware RegKey:	VEN_1002&DEV_4E6A&SUBSYS_95611787&REV_00
Inf Section:		ati2mtag_R360 (0x00000000)

So I assume it should indeed be R360.

However, compilation fails for me:


cc -c -I../libvo/ -I../../libvo  -g -O4 -march=pentium4 -mcpu=pentium4 -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__CYGWIN__  -fPIC -I. -I.. -o radeon_vid.o radeon_vid.c
cc1: warning: -fPIC ignored for target (all code is position independent)
radeon_vid.c:893: error: `DEVICE_ATI_RADEON_R360' undeclared here (not in a function)
radeon_vid.c:893: error: initializer element is not constant
radeon_vid.c:893: error: (near initialization for `ati_card_ids[51]')
radeon_vid.c: In function `vixProbe':
radeon_vid.c:1073: error: `DEVICE_ATI_RADEON_R360' undeclared (first use in this function)
radeon_vid.c:1073: error: (Each undeclared identifier is reported only once
radeon_vid.c:1073: error: for each function it appears in.)
make: *** [radeon_vid.o] Error 1


if I apply the following (naive) patch to add support for the R360.


--- libdha/oth/pci.db	9 May 2004 22:06:12 -0000	1.11
+++ libdha/oth/pci.db	10 May 2004 18:22:57 -0000
@@ -284,10 +284,10 @@
 d	10024168	Radeon R350 [Radeon 9800] (Secondary)	0
 d	10024e48	Radeon R350 NH [Radeon 9800]	0
 d	10024e49	Radeon R350 [Radeon 9800]	0
-d	10024e4a	Radeon RV350 NJ [Radeon 9800 XT]	0
+d	10024e4a	Radeon R360 [Radeon 9800 XXL]	0
 d	10024e68	Radeon R350 [Radeon 9800] (Secondary)	0
 d	10024e69	Radeon R350 [Radeon 9800] (Secondary)	0
-d	10024e6a	Radeon RV350 NJ [Radeon 9800 XT] (Secondary)	0
+d	10024e6a	Radeon R360 [Radeon 9800 XXL] (Secondary)	0
 d	10025041	Rage 128 PA/PRO	0	
 d	10025042	Rage 128 PB/PRO AGP 2x	0	
 d	10025043	Rage 128 PC/PRO AGP 4x	0	
--- vidix/drivers/radeon_vid.c	9 May 2004 22:06:13 -0000	1.82
+++ vidix/drivers/radeon_vid.c	10 May 2004 18:22:58 -0000
@@ -883,12 +883,12 @@
  DEVICE_ATI_RADEON_R300_AF,
  DEVICE_ATI_RADEON_RV350_AP,
  DEVICE_ATI_RADEON_RV350_AR,
- DEVICE_ATI_RADEON_RV350_NJ,
  DEVICE_ATI_RADEON_R350_AH,
  DEVICE_ATI_RADEON_R350_AI,
  DEVICE_ATI_RADEON_R350_NH,
  DEVICE_ATI_RV350_MOBILITY_RADEON,
- DEVICE_ATI_RV350_MOBILITY_RADEON2
+ DEVICE_ATI_RV350_MOBILITY_RADEON2,
+ DEVICE_ATI_RADEON_R360
 #endif
 };
 
@@ -1065,12 +1065,12 @@
             /* Radeon 9600/9800 */
             case DEVICE_ATI_RADEON_RV350_AP:
             case DEVICE_ATI_RADEON_RV350_AR:
-            case DEVICE_ATI_RADEON_RV350_NJ:
             case DEVICE_ATI_RADEON_R350_NH:
             case DEVICE_ATI_RADEON_R350_AH:
             case DEVICE_ATI_RADEON_R350_AI:
             case DEVICE_ATI_RV350_MOBILITY_RADEON:
             case DEVICE_ATI_RV350_MOBILITY_RADEON2:
+            case DEVICE_ATI_RADEON_R360:
               RadeonFamily = 350;
               break;


Diego