updated pci ids list, fixed vidix drivers compilation and added nearly exhaustive pci ids for nvidia driver

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22892 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 44 insertions, 44 deletions

diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c
index ac6aa662fe..d89cc38972 100644
--- a/vidix/radeon_vid.c
+++ b/vidix/radeon_vid.c
@@ -859,14 +859,14 @@ static unsigned short ati_card_ids[] =
  DEVICE_ATI_RADEON_R100_QE,
  DEVICE_ATI_RADEON_R100_QF,
  DEVICE_ATI_RADEON_R100_QG,
- DEVICE_ATI_RADEON_VE_QY,
- DEVICE_ATI_RADEON_VE_QZ,
+ DEVICE_ATI_RADEON_RV100_QY,
+ DEVICE_ATI_RADEON_RV100_QZ,
  DEVICE_ATI_RADEON_MOBILITY_M7,
- DEVICE_ATI_RADEON_MOBILITY_M72,
+ DEVICE_ATI_RADEON_RV200_LX,
  DEVICE_ATI_RADEON_MOBILITY_M6,
  DEVICE_ATI_RADEON_MOBILITY_M62,
  DEVICE_ATI_RADEON_MOBILITY_U1,
- DEVICE_ATI_RADEON_R200_BB,
+ DEVICE_ATI_R200_BB_RADEON,
  DEVICE_ATI_RADEON_R200_QH,
  DEVICE_ATI_RADEON_R200_QI,
  DEVICE_ATI_RADEON_R200_QJ,
@@ -879,17 +879,17 @@ static unsigned short ati_card_ids[] =
  DEVICE_ATI_RADEON_R200_QK2,
  DEVICE_ATI_RADEON_RV200_QW,
  DEVICE_ATI_RADEON_RV200_QX,
- DEVICE_ATI_RADEON_R250_ID,
- DEVICE_ATI_RADEON_R250_IE,
- DEVICE_ATI_RADEON_R250_IF,
- DEVICE_ATI_RADEON_R250_IG,
+ DEVICE_ATI_RADEON_RV250_ID,
+ DEVICE_ATI_RADEON_RV250_IE,
+ DEVICE_ATI_RADEON_RV250_IF,
+ DEVICE_ATI_RADEON_RV250_IG,
  DEVICE_ATI_RADEON_R250_LD,
  DEVICE_ATI_RADEON_R250_LE,
- DEVICE_ATI_RADEON_R250_LF,
+ DEVICE_ATI_RADEON_R250_MOBILITY,
  DEVICE_ATI_RADEON_R250_LG,
  DEVICE_ATI_RV370_5B60_RADEON,
- DEVICE_ATI_RV250_5C61_RADEON,
- DEVICE_ATI_RV250_5C63_RADEON,
+ DEVICE_ATI_M9_5C61_RADEON,
+ DEVICE_ATI_M9_5C63_RADEON,
  DEVICE_ATI_RV280_RADEON_9200,
  DEVICE_ATI_RV280_RADEON_92002,
  DEVICE_ATI_RV280_RADEON_92003,
@@ -898,18 +898,18 @@ static unsigned short ati_card_ids[] =
  DEVICE_ATI_RV280_RADEON_92006,
  DEVICE_ATI_RADEON_R300_ND,
  DEVICE_ATI_RADEON_R300_NE,
- DEVICE_ATI_RADEON_R300_NF,
+ DEVICE_ATI_RV350_NF_RADEON,
  DEVICE_ATI_RADEON_R300_NG,
- DEVICE_ATI_RADEON_R300_AE,
- DEVICE_ATI_RADEON_R300_AF,
- DEVICE_ATI_RADEON_RV350_AP,
- DEVICE_ATI_RADEON_RV350_AQ,
- DEVICE_ATI_RADEON_RV350_AR,
- DEVICE_ATI_RADEON_RV350_BK,
- DEVICE_ATI_RADEON_R350_AH,
- DEVICE_ATI_RADEON_R350_AI,
- DEVICE_ATI_RADEON_R350_NH,
- DEVICE_ATI_RADEON_R360_NJ,
+ DEVICE_ATI_R300_AE_RADEON,
+ DEVICE_ATI_R300_AF_RADEON,
+ DEVICE_ATI_RV350_AP_RADEON,
+ DEVICE_ATI_RV350_AQ_RADEON,
+ DEVICE_ATI_RV350_AR_RADEON,
+ DEVICE_ATI_RV350_AS_RADEON,
+ DEVICE_ATI_R350_AH_RADEON,
+ DEVICE_ATI_R350_AI_RADEON,
+ DEVICE_ATI_RADEON_R350_RADEON2,
+ DEVICE_ATI_RV350_NJ_RADEON,
  DEVICE_ATI_RV350_MOBILITY_RADEON,
  DEVICE_ATI_RV350_MOBILITY_RADEON2
 #endif
@@ -1030,8 +1030,8 @@ static int radeon_probe( int verbose,int force )
               break;
               
             /* Radeon VE / Radeon Mobility */
-            case DEVICE_ATI_RADEON_VE_QY:
-            case DEVICE_ATI_RADEON_VE_QZ:
+            case DEVICE_ATI_RADEON_RV100_QY:
+            case DEVICE_ATI_RADEON_RV100_QZ:
             case DEVICE_ATI_RADEON_MOBILITY_M6:
             case DEVICE_ATI_RADEON_MOBILITY_M62:
 	    case DEVICE_ATI_RADEON_MOBILITY_U1:
@@ -1042,12 +1042,12 @@ static int radeon_probe( int verbose,int force )
             case DEVICE_ATI_RADEON_RV200_QW:
             case DEVICE_ATI_RADEON_RV200_QX: 
             case DEVICE_ATI_RADEON_MOBILITY_M7:
-            case DEVICE_ATI_RADEON_MOBILITY_M72:
+            case DEVICE_ATI_RADEON_RV200_LX:
               RadeonFamily = 150;
               break;
               
             /* Radeon 8500 */
-            case DEVICE_ATI_RADEON_R200_BB:
+            case DEVICE_ATI_R200_BB_RADEON:
             case DEVICE_ATI_RADEON_R200_QH:
             case DEVICE_ATI_RADEON_R200_QI:
             case DEVICE_ATI_RADEON_R200_QJ:
@@ -1062,16 +1062,16 @@ static int radeon_probe( int verbose,int force )
               break;
               
             /* Radeon 9000 */
-            case DEVICE_ATI_RADEON_R250_ID:
-            case DEVICE_ATI_RADEON_R250_IE:
-            case DEVICE_ATI_RADEON_R250_IF:
-            case DEVICE_ATI_RADEON_R250_IG:
+            case DEVICE_ATI_RADEON_RV250_ID:
+            case DEVICE_ATI_RADEON_RV250_IE:
+            case DEVICE_ATI_RADEON_RV250_IF:
+            case DEVICE_ATI_RADEON_RV250_IG:
             case DEVICE_ATI_RADEON_R250_LD:
             case DEVICE_ATI_RADEON_R250_LE:
-            case DEVICE_ATI_RADEON_R250_LF:
+            case DEVICE_ATI_RADEON_R250_MOBILITY:
             case DEVICE_ATI_RADEON_R250_LG:
-            case DEVICE_ATI_RV250_5C61_RADEON:
-            case DEVICE_ATI_RV250_5C63_RADEON:
+            case DEVICE_ATI_M9_5C61_RADEON:
+            case DEVICE_ATI_M9_5C63_RADEON:
               RadeonFamily = 250;
               break;
               
@@ -1088,23 +1088,23 @@ static int radeon_probe( int verbose,int force )
             /* Radeon 9700 */
             case DEVICE_ATI_RADEON_R300_ND:
             case DEVICE_ATI_RADEON_R300_NE:
-            case DEVICE_ATI_RADEON_R300_NF:
+            case DEVICE_ATI_RV350_NF_RADEON:
             case DEVICE_ATI_RADEON_R300_NG:
-            case DEVICE_ATI_RADEON_R300_AE:
-            case DEVICE_ATI_RADEON_R300_AF:
+            case DEVICE_ATI_R300_AE_RADEON:
+            case DEVICE_ATI_R300_AF_RADEON:
               RadeonFamily = 300;
               break;
 
             /* Radeon 9600/9800 */
             case DEVICE_ATI_RV370_5B60_RADEON:
-            case DEVICE_ATI_RADEON_RV350_AP:
-            case DEVICE_ATI_RADEON_RV350_AQ:
-            case DEVICE_ATI_RADEON_RV350_AR:
-            case DEVICE_ATI_RADEON_RV350_BK:
-            case DEVICE_ATI_RADEON_R350_NH:
-            case DEVICE_ATI_RADEON_R350_AH:
-            case DEVICE_ATI_RADEON_R350_AI:
-            case DEVICE_ATI_RADEON_R360_NJ:
+            case DEVICE_ATI_RV350_AP_RADEON:
+            case DEVICE_ATI_RV350_AQ_RADEON:
+            case DEVICE_ATI_RV350_AR_RADEON:
+            case DEVICE_ATI_RV350_AS_RADEON:
+            case DEVICE_ATI_RADEON_R350_RADEON2:
+            case DEVICE_ATI_R350_AH_RADEON:
+            case DEVICE_ATI_R350_AI_RADEON:
+            case DEVICE_ATI_RV350_NJ_RADEON:
             case DEVICE_ATI_RV350_MOBILITY_RADEON:
             case DEVICE_ATI_RV350_MOBILITY_RADEON2:
               RadeonFamily = 350;