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

4 files changed, 252 insertions, 93 deletions

diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c
index b609bc7ce1..5d8277af04 100644
--- a/vidix/mga_vid.c
+++ b/vidix/mga_vid.c
@@ -1228,7 +1228,7 @@ static int mga_probe(int verbose,int force)
 			printf("[mga] Found MGA G550\n");
 			is_g400 = 1;
 			goto card_found;
-		    case DEVICE_MATROX_MGA_G400_AGP:
+		    case DEVICE_MATROX_MGA_G400_G450:
 			printf("[mga] Found MGA G400/G450\n");
 			is_g400 = 1;
 			goto card_found;
diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c
index 84514f2cc5..7eb3028c32 100644
--- a/vidix/nvidia_vid.c
+++ b/vidix/nvidia_vid.c
@@ -81,72 +81,230 @@ static struct nvidia_cards nvidia_card_ids[] = {
   {DEVICE_NVIDIA2_RIVA128ZX,NV_ARCH_03},
   /*NV04*/
   {DEVICE_NVIDIA_NV4_RIVA_TNT,NV_ARCH_04},
+  {DEVICE_NVIDIA_NV5_RIVA_TNT2_TNT2,NV_ARCH_04},
   {DEVICE_NVIDIA_NV5_RIVA_TNT2,NV_ARCH_04},  
   {DEVICE_NVIDIA_NV5_RIVA_TNT22,NV_ARCH_04},  
   {DEVICE_NVIDIA_NV5_RIVA_TNT23,NV_ARCH_04},  
-  {DEVICE_NVIDIA_NV5_RIVA_TNT24,NV_ARCH_04},  
+  {DEVICE_NVIDIA_NV6_VANTA_VANTA_LT,NV_ARCH_04},
+  {DEVICE_NVIDIA_NV5M64_RIVA_TNT2,NV_ARCH_04},
   {DEVICE_NVIDIA_NV6_VANTA,NV_ARCH_04},
-  {DEVICE_NVIDIA_RIVA_TNT2_MODEL,NV_ARCH_04},
   {DEVICE_NVIDIA_NV6_VANTA2,NV_ARCH_04},
-  {DEVICE_NVIDIA_NV6_VANTA3,NV_ARCH_04},    
-  {DEVICE_NVIDIA_NV5_RIVA_TNT25,NV_ARCH_04}, 
   {DEVICE_NVIDIA2_TNT,NV_ARCH_04},
   {DEVICE_NVIDIA2_TNT2,NV_ARCH_04},  
   {DEVICE_NVIDIA2_VTNT2,NV_ARCH_04},  
   {DEVICE_NVIDIA2_UTNT2	,NV_ARCH_04},
   {DEVICE_NVIDIA2_ITNT2,NV_ARCH_04},
+  {DEVICE_NVIDIA_NV5_ALADDIN_TNT2,NV_ARCH_30},
   /*NV10*/
+  {DEVICE_NVIDIA_NV18_GEFORCE_PCX,NV_ARCH_10},
   {DEVICE_NVIDIA_NV10_GEFORCE_256,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV10_GEFORCE_2562,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV11_GEFORCE2_MX,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV11_GEFORCE2_MX2,NV_ARCH_10},   
-  {DEVICE_NVIDIA_NV11_GEFORCE2_GO,NV_ARCH_10},  
-  {DEVICE_NVIDIA_NV11_GEFORCE2_MXR ,NV_ARCH_10},  
-  {DEVICE_NVIDIA_NV15_GEFORCE2_GTS,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV15_GEFORCE2_TI,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV15_GEFORCE2_ULTRA,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV17_GEFORCE4_MX460,NV_ARCH_10}, 
-  {DEVICE_NVIDIA_NV17_GEFORCE4_MX440,NV_ARCH_10},  
-  {DEVICE_NVIDIA_NV17_GEFORCE4_MX420,NV_ARCH_10},  
-  {DEVICE_NVIDIA_NV17_GEFORCE4_440,NV_ARCH_10}, 
-  {DEVICE_NVIDIA_NV17_GEFORCE4_420,NV_ARCH_10}, 
+  {DEVICE_NVIDIA_NV10DDR_GEFORCE_256,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV10GL_QUADRO,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV11_GEFORCE2_MX_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV11DDR_GEFORCE2_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV11DDR_GEFORCE2_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV11_GEFORCE2_GO,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV11GL_QUADRO2_MXR_EX_GO,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV15_GEFORCE2_GTS_PRO,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV15DDR_GEFORCE2_TI,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV15BR_GEFORCE2_ULTRA,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV15GL_QUADRO2_PRO,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_MX2,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_MX3,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_MX4,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_440,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_420,NV_ARCH_10},
   {DEVICE_NVIDIA_NV17_GEFORCE4_4202,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV17_GEFORCE4_4402,NV_ARCH_10},
-  {DEVICE_NVIDIA_NV18_GEFORCE4_MX440,NV_ARCH_10}, 
-  {DEVICE_NVIDIA_NV15_GEFORCE2,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_460,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17GL_QUADRO4_550,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_4203,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17GL_QUADRO4_200_400,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17GL_QUADRO4_5502,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17GL_QUADRO4_550,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV17_GEFORCE4_410,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX2,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX3,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX4,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX5,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18M_GEFORCE4_448,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18M_GEFORCE4_488,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18GL_QUADRO_FX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18GL_QUADRO4_580,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18GL_QUADRO4_NVS,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18GL_QUADRO4_380,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18M_GEFORCE4_4482,NV_ARCH_10},
+  {DEVICE_NVIDIA_NVCRUSH11_GEFORCE2_MX,NV_ARCH_10},
+  {DEVICE_NVIDIA_NFORCE2_AGP_DIFFERENT,NV_ARCH_10},
+  {DEVICE_NVIDIA_NFORCE2_AGP,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE4_MX5,NV_ARCH_10},
+  {DEVICE_NVIDIA_NV18_GEFORCE_PCX,NV_ARCH_10}, 
   /*NV20*/
   {DEVICE_NVIDIA_NV20_GEFORCE3,NV_ARCH_20},
-  {DEVICE_NVIDIA_NV20_GEFORCE3_TI200,NV_ARCH_20},
-  {DEVICE_NVIDIA_NV20_GEFORCE3_TI500,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV25_GEFORCE4_TI4600,NV_ARCH_20},
-  {DEVICE_NVIDIA_NV25_GEFORCE4_TI4400,NV_ARCH_20},
-  {DEVICE_NVIDIA_NV25_GEFORCE4_TI4200,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_QUADRO4_900XGL,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_QUADRO4_750XGL,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_QUADRO4_700XGL,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28_GEFORCE4_TI,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28_GEFORCE4_TI2,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28_GEFORCE4_TI3,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28_GEFORCE4_TI4,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28GL_QUADRO4_980,NV_ARCH_20}, 
-  {DEVICE_NVIDIA_NV28GL_QUADRO4_780,NV_ARCH_20}, 
+  {DEVICE_NVIDIA_NV20_GEFORCE3_TI,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV20_GEFORCE3_TI2,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV20DCC_QUADRO_DCC,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25_GEFORCE4_TI,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25_GEFORCE4_TI2,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25_GEFORCE4_TI3,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25_GEFORCE4_TI4,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25GL_QUADRO4_900,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25GL_QUADRO4_750,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV25GL_QUADRO4_700,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28_GEFORCE4_TI,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28_GEFORCE4_TI2,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28_GEFORCE4_TI3,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28_GEFORCE4_TI4,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28GL_QUADRO4_980,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28GL_QUADRO4_780,NV_ARCH_20},
+  {DEVICE_NVIDIA_NV28GLM_QUADRO4_700,NV_ARCH_20},
   /*NV30*/
-  {DEVICE_NVIDIA_NV30_GEFORCE_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV30_GEFORCE_FX2,NV_ARCH_30}, 	
-  {DEVICE_NVIDIA_NV30_GEFORCE_FX3,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV30GL_QUADRO_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV30GL_QUADRO_FX2,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV31_GEFORCE_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV31_GEFORCE_FX2,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV34_GEFORCE_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV34_GEFORCE_FX2,NV_ARCH_30}, 
+  {DEVICE_NVIDIA_NV30_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV30_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV30_GEFORCE_FX3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV30GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV30GL_QUADRO_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31_GEFORCE_FX3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31M,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31M_PRO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31M_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31M_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NVIDIA_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31GLM,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31GLM_PRO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV31GLM_PRO2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX2,NV_ARCH_30},
   {DEVICE_NVIDIA_NV34_GEFORCE_FX3,NV_ARCH_30},
-  {DEVICE_NVIDIA_NV34M_GEFORCE_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV34GL_QUADRO_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV35_GEFORCE_FX,NV_ARCH_30}, 
-  {DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30}, 
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX4,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34M_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34M_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX5,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX6,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34M_GEFORCE_FX3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34M_GEFORCE_FX4,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34GL_QUADRO_NVS,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34GLM_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34_GEFORCE_FX7,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV34GL,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_FX3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV38_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_FX4,NV_ARCH_30},
   {DEVICE_NVIDIA_NV35GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35GL_QUADRO_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_PCX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_1_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_2_GEFORCE_FX,NV_ARCH_30},
   {DEVICE_NVIDIA_NV36_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_4_GEFORCE_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_5,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_GEFORCE_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_GEFORCE_FX3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_GEFORCE_PCX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36M_PRO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36MAP,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36GL,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV36_GEFORCE_PCX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV35_GEFORCE_PCX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV37GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV37GL_QUADRO_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV38GL_QUADRO_FX,NV_ARCH_30},
+  /* FIXME are they different? */
+  {DEVICE_NVIDIA_NV40_GEFORCE_6800,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68002,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_2_GEFORCE_6800,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68003,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68004,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68005,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68006,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68007,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68008,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68009,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_680010,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_680011,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_680012,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_68008,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40GL,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40GL_QUADRO_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_GEFORCE_6800,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_1_GEFORCE_6800,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_2_GEFORCE_6800,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_8_GEFORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_9_GEFORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41_QUADRO_FX2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV41GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV40_GEFORCE_6800_GEFORCE,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_6600_GEFORCE,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_6600_GEFORCE2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_6200,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_62002,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_6600,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_66002,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_66003,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_66004,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_66005,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO2,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO3,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO4,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO5,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_GO6,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43_GEFORCE_6610,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV43GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_6100_NFORCE,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_6100_NFORCE2,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_6100_NFORCE3,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_6100_NFORCE4,NV_ARCH_30},
+  {DEVICE_NVIDIA_C51G_GEFORCE_6100,NV_ARCH_30},
+  {DEVICE_NVIDIA_C51PV_GEFORCE_6150,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44_GEFORCE_6200,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44_GEFORCE_62002,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44_GEFORCE_62003,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44_GEFORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44_QUADRO_NVS,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_6200,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV44A_GEFORCE_6200,NV_ARCH_30},
+  {DEVICE_NVIDIA_NV45GL_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_7200,NV_ARCH_30},
+  {DEVICE_NVIDIA_QUADRO_NVS_110M,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_7400,NV_ARCH_30},
+  {DEVICE_NVIDIA_QUADRO_NVS_110M2,NV_ARCH_30},
+  {DEVICE_NVIDIA_QUADRO_FX_350,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_7300,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_7300_GS,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_7600,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_76002,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_7600_GS,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_QUADRO_FX_560,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_7800,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_78002,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_78003,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_78004,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70_GEFORCE_78005,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_7800,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_7900_GTX,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_7900_GT,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_7900_GS,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_7900,NV_ARCH_30},
+  {DEVICE_NVIDIA_GEFORCE_GO_79002,NV_ARCH_30},
+  {DEVICE_NVIDIA_GE_FORCE_GO,NV_ARCH_30},
+  {DEVICE_NVIDIA_G70GL_QUADRO_FX4500,NV_ARCH_30},
+  {DEVICE_NVIDIA_G71_QUADRO_FX,NV_ARCH_30},
+  {DEVICE_NVIDIA_G71_QUADRO_FX2,NV_ARCH_30}
 };
 
 
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;
diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c
index 5eee2e16f1..d3033b65c0 100644
--- a/vidix/unichrome_vid.c
+++ b/vidix/unichrome_vid.c
@@ -113,7 +113,8 @@ static vidix_capability_t uc_cap = {
  * @brief list of card IDs compliant with the Unichrome driver .
  */
 static unsigned short uc_card_ids[] = {
-  DEVICE_VIA2_VT8623_CLE266_AGP
+  DEVICE_VIA2_VT8623_APOLLO_CLE266,
+  DEVICE_VIA2_VT8378_S3_UNICHROME
 };
 
 /**