--- /lib/discover/pci.lst	2005-11-26 00:14:38.000000000 +0100
+++ /home/kreator/pci.lst	2006-07-17 18:28:57.960974938 +0200
@@ -132,32 +132,45 @@
 	10000013	scsi	sym53c8xx_2	53c875a
 	10000020	scsi	sym53c8xx_2	53c1010 Ultra3 SCSI Adapter
 	10000021	scsi	sym53c8xx_2	53c1010 66MHz  Ultra3 SCSI Adapter
-	10000030	scsi	mptscsih	53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
+	10000030	scsi	mptspi	53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
 	10000031	scsi	unknown	53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
-	10000032	scsi	mptscsih	53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
+	10000032	scsi	mptspi	53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
 	10000033	scsi	megaraid	1030ZC_53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
-	10000040	scsi	mptscsih	53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
-	10000041	scsi	unknown	53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
+	10000040	scsi	mptspi	53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
+	10000041	scsi	mptspi	53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
+	10000050	scsi	mptsas	PCI-X Fusion-MPT SAS
+	10000054	scsi	mptsas	PCI-X Fusion-MPT SAS
+	10000056	scsi	mptsas	PCI-X Fusion-MPT SAS
+	10000058	scsi	mptsas	PCI-X Fusion-MPT SAS
+	1000005a	scsi	mptsas	PCI-X Fusion-MPT SAS
+	1000005c	scsi	mptsas	PCI-X Fusion-MPT SAS
+	1000005e	scsi	mptsas	PCI-X Fusion-MPT SAS
+	10000060	scsi	mptsas	PCI-X Fusion-MPT SAS
+	10000062	scsi	mptsas	PCI-Express Fusion-MPT SAS
 	10000066	scsi	megaraid	MegaRAID SCSI 320-2XRWS
 	1000008f	scsi	sym53c8xx_2	53c875J
-	10000407	scsi	megaraid	MegaRAID
-	10000408	scsi	megaraid2	MegaRAID
-	10000409	scsi	megaraid2	MegaRAID
+	10000407	scsi	megaraid	LSI MegaRAID SCSI 320-0X/2X/4X
+	10000408	scsi	megaraid	LSI MegaRAID SCSI 320-1E/2E
+	10000409	scsi	megaraid	LSI MegaRAID SATA 300-4X/8X
 	10000518	scsi	megaraid	MegaRAID SCSI 320-2
 	10000520	scsi	megaraid	MegaRAID
 	10000523	scsi	megaraid	MegaRAID SATA 150-6
 	10000530	scsi	megaraid	MegaRAID SCSI 320-0X
 	10000531	scsi	megaraid	MegaRAID SCSI 320-4X
 	10000532	scsi	megaraid	MegaRAID SCSI 320-2X
-	10000621	scsi	mptscsih	FC909 Fibre Channel Adapter
-	10000622	scsi	mptscsih	FC929 Fibre Channel Adapter
-	10000623	scsi	mptscsih	FC929 LAN
-	10000624	scsi	mptscsih	FC919 Fibre Channel Adapter
-	10000625	scsi	mptscsih	FC919 LAN
-	10000626	scsi	mptscsih	FC929X Fibre Channel Adapter
-	10000627	scsi	mptscsih	FC929X LAN
-	10000628	scsi	mptscsih	FC919X Fibre Channel Adapter
-	10000629	scsi	mptscsih	FC919X LAN
+	10000621	scsi	mptfc	FC909 Fibre Channel Adapter
+	10000622	scsi	mptfc	FC929 Fibre Channel Adapter
+	10000623	scsi	mptlan	FC929 LAN
+	10000624	scsi	mptfc	FC919 Fibre Channel Adapter
+	10000625	scsi	mptlan	FC919 LAN
+	10000626	scsi	mptfc	FC929X Fibre Channel Adapter
+	10000627	scsi	mptlan	FC929X LAN
+	10000628	scsi	mptfc	FC919X Fibre Channel Adapter
+	10000629	scsi	mptlan	FC919X LAN
+	10000642	scsi	mptfc	FC939X Fibre Channel Adapter
+	10000643	scsi	mptlan	FC939X LAN
+	10000640	scsi	mptfc	FC949X Fibre Channel Adapter
+	10000641	scsi	mptlan	FC949X LAN
 	10000701	ethernet	yellowfin	83C885 NT50 DigitalScape Fast Ethernet
 	10000702	ethernet	yellowfin	Yellowfin G-NIC gigabit ethernet
 	10000804	unknown	unknown	SA2010
@@ -168,7 +181,7 @@
 	10000e11	scsi	cpqarray	Integrated Array Controller
 	10001000	unknown	megaraid	63C815
 	10001028	scsi	megaraid	PowerEdge Expandable RAID Controller 4/DC
-	10001960	scsi	megaraid	MegaRAID
+	10001960	scsi	megaraid	LSI MegaRAID SCSI 320-0/1/2 or SATA 150-4/6
 	10004040	scsi	cpqarray	Integrated Array Controller
 	10004048	scsi	cpqarray	Integrated Array Controller
 	10004523	scsi	megaraid	MegaRAID SATA 150-4
@@ -625,7 +638,7 @@
 	101e0767	unknown	megarac	Dell Remote Assistant Card 2
 	101e101e	unknown	megarac	Dell Remote Assistant Card 2
 	101e1028	scsi	megaraid	PowerEdge RAID Controller 3/QC
-	101e1960	scsi	megaraid	MegaRAID
+	101e1960	scsi	megaraid	Dell PERC QC/DC/SC MegaRAID
 	101e9010	scsi	megaraid	MegaRAID 428 Ultra RAID Controller
 	101e9030	ide	unknown	EIDE Controller
 	101e9031	ide	unknown	EIDE Controller
@@ -792,21 +805,22 @@
 	10255453	modem	unknown	M5453 PCI AC-Link Controller Modem Device
 	10257101	pmc	ignore	M7101 PCI PMU Power Management Controller
 1028 Dell Computer Corporation
-	10280001	scsi	aacraid	PowerEdge Expandable RAID Controller 2/Si
-	10280002	scsi	aacraid	PowerEdge Expandable RAID Controller 3
-	10280003	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Si
-	10280004	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Si
+	10280001	scsi	aacraid	PowerEdge Expandable RAID Controller 2/Si (Iguana/PERC2Si)
+	10280002	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Di (Opal/PERC3Di, Viper/PERC3DiV)
+	10280003	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Si (SlimFast/PERC3Si)
+	10280004	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Di (Iguana FlipChip/PERC3DiF)
 	10280005	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Di
 	10280006	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Di
 	10280007	unknown	racser	Remote Access Controller:DRAC III
 	10280008	unknown	unknown	Remote Access Controller
 	10280009	unknown	unknown	BMC/SMIC device not present
-	1028000a	scsi	aacraid	PowerEdge Expandable RAID Controller 3
+	1028000a	scsi	aacraid	PowerEdge Expandable RAID Controller 3/Di (Jaguar/PERC3DiJ, Dagger/PERC3DiD, Boxster/PERC3DiB)
 	1028000c	unknown	racser	Remote Access Controller:ERA or ERA/O
 	1028000d	unknown	racser	BMC/SMIC device
 	1028000e	scsi	megaraid	PowerEdge Expandable RAID controller 4
-	1028000f	scsi	megaraid	PowerEdge Expandable RAID controller 4
-	10280013	scsi	megaraid2	PowerEdge Expandable RAID controller 4
+	1028000f	scsi	megaraid	Dell PERC4 Di MegaRAID
+	10280013	scsi	megaraid	Dell PERC 4e Si/Di MegaRAID
+	10281960	scsi	megaraid	Dell PERC3 Di MegaRAID
 1029 Siemens Nixdorf IS
 102a LSI Logic
 	102a0000	unknown	unknown	HYDRA
@@ -5646,12 +5660,13 @@
 	900500c3	scsi	aic7xxx	AIC-7899D U160/m
 	900500c5	scsi	aic7xxx	RAID subsystem HBA
 	900500cf	scsi	aic7xxx	AIC-7899P U160/m
+	90050200	scsi	aacraid	Themisto Jupiter
 	90050250	scsi	ips	ServeRAID Controller
-	90050283	scsi	unknown	AAC-RAID
-	90050284	scsi	unknown	AAC-RAID
-	90050285	scsi	aacraid	AAC-RAID
-	90050286	scsi	unknown	AAC-RAID (Rocket)
-	90050287	scsi	aacraid	PowerEdge Expandable RAID Controller 320/DC
+	90050283	scsi	aacraid	AAC-RAID Catapult
+	90050284	scsi	aacraid	AAC-RAID Tomcat
+	90050285	scsi	aacraid	AAC-RAID Adaptec 2120S/2200S/3230S/3240S, Legend S220/S230, ASR-2020ZCR, ASR-2025ZCR, ICP5085BR, ICP9085LI, ASR-2020SA, ASR-2025SA, AAR-2410SA, CERC SATA, AAR-2810SA, AAR-21610SA, AAR-2610SA, ASR-2240S, ASR-4005SAS, IBM 8i, ASR-4000SAS, ASR-4800SAS, ASR-4805SAS
+	90050286	scsi	aacraid	AAC-RAID ASR-2230S, ASR-2230SLP, ASR-2130S, AAR-2820SA, AAR-2620SA, AAR-2420SA, ICP9024R0, ICP9014R0, ICP9047MA, ICP5085BR, Callisto Jupiter, IBM 8k/8k-l8, IBM 8k/8k-l4, ASR-4810SAS
+	90050287	scsi	aacraid	PowerEdge Expandable RAID Controller 320/DC, Themisto Jupiter
 	90051028	scsi	aacraid	PowerEdge Expandable RAID Controller 320/DC
 	90058000	scsi	aic79xx	ASC-29320A U320
 	9005800f	scsi	aic79xx	AIC-7901 U320
