- Add many new devices gleaned from dmesglog.

- Rearrange some entries that weren't in the proper ID-order.
- Fix some typos as well.

1 files changed, 79 insertions, 41 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index bee38574ce0..1377bcef622 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-	$OpenBSD: pcidevs,v 1.338 2000/10/26 21:58:45 aaron Exp $
+	$OpenBSD: pcidevs,v 1.339 2000/10/29 00:48:18 aaron Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -559,7 +559,8 @@ vendor INVALID		0xffff	INVALID VENDOR ID
 product 2MICRO OZ6832		0x6832	OZ6832 CardBus
 
 
-/* 3COM Products */
+/* 3Com Products */
+product 3COM 3C985		0x0001	3c985
 product 3COM 3C339		0x3390	3c339
 product 3COM 3C450		0x4500	3c450
 product 3COM 3C590		0x5900	3c590 10Mbps
@@ -586,7 +587,6 @@ product 3COM 3C905CTX		0x9200	3c905C 100Base-TX
 product 3COM 3C980TX		0x9800	3c980 100Base-TX
 product 3COM 3C980CTX		0x9805	3c980C 100Base-TX
 product 3COM 3CR990		0x9903	3cr990 TX-97
-product 3COM 3C985		0x0001	3c985
 
 /* 3DFX Interactive */
 product 3DFX VOODOO		0x0001	Voodoo
@@ -595,13 +595,14 @@ product 3DFX BANSHEE		0x0003	Banshee
 product 3DFX VOODOO3		0x0005	Voodoo3
 
 /* 3D Labs products */
-product 3DLABS 300SX		0x0001	GLINT 300SX
-product 3DLABS 500TX		0x0002	GLINT 500TX
-product 3DLABS DELTA		0x0003	GLINT Delta
-product 3DLABS PERMEDIA		0x0004	GLINT Permedia
-product 3DLABS 500MX		0x0006	GLINT 500MX
-product 3DLABS PERMEDIA2	0x0007	GLINT Permedia 2
+product 3DLABS 300SX		0x0001	300SX
+product 3DLABS 500TX		0x0002	500TX
+product 3DLABS DELTA		0x0003	Delta
+product 3DLABS PERMEDIA		0x0004	Permedia
+product 3DLABS 500MX		0x0006	500MX
+product 3DLABS PERMEDIA2	0x0007	Permedia 2
 product 3DLABS OXYGEN_GVX1_CPU	0x0008	Oxygen GVX1
+product 3DLABS PERMEDIA3	0x0009	Permedia 3
 product 3DLABS OXYGEN_GVX1	0x000a	Oxygen GVX1
 
 /* 3Ware products */
@@ -760,6 +761,7 @@ product ATI MACH64_ET		0x4554	Mach64 ET
 product ATI RAGEPRO		0x4742	Rage Pro
 product ATI MACH64_GD		0x4744  Mach64 GD
 product ATI MACH64_GI		0x4749  Mach64 GI
+product ATI MACH64_GM		0x474d	Mach64 GM
 product ATI MACH64_GP		0x4750  Mach64 GP
 product ATI MACH64_GQ		0x4751  Mach64 GQ
 product ATI MACH64_GT		0x4754  Mach64 GT
@@ -775,11 +777,12 @@ product ATI MACH64_LG		0x4c47  Mach64 LG
 product ATI MACH64_LI		0x4c49  Mach64 LI
 product ATI MOBILITY_1		0x4c4d	Mobility 1
 product ATI MACH64_LP		0x4c50  Mach64 LP
+product ATI RAGE_FURY		0x5046	Rage Fury AGP4x
 product ATI RAGE_MAGNUM		0x5246	Rage Magnum
+product ATI RAGE_128_VR_AGP	0x524c	Rage 128 VR AGP
 product ATI MACH64_VT		0x5654	Mach64 VT
 product ATI MACH64_VU		0x5655	Mach64 VU
 product ATI MACH64_VV		0x5656	Mach64 VV
-product ATI RAGE_FURY		0x5046	Rage Fury AGP4x
 
 /* Applied Micro Circuts products */
 product AMCIRCUITS S5933	0x4750	S5933 PCI Matchmaker
@@ -797,7 +800,7 @@ product AVANCE AVL2301		0x2301	AVL2301
 product AVANCE AVG2302		0x2302	AVG2302
 product AVANCE2 ALG2301		0x2301	ALG2301
 product AVANCE2 ALG2302		0x2302	ALG2302
-product AVANCE2 ALG4000		0x4000	ALG4000
+product AVANCE2 ALS4000		0x4000	ALS4000
 
 /* Bit3 products */
 product BIT3 PCIVME617		0x0001	PCI-VME Interface Mod. 617
@@ -848,9 +851,10 @@ product CIRRUS CL_GD5436	0x00ac	CL-GD5436
 product CIRRUS CL_GD5446	0x00b8	CL-GD5446
 product CIRRUS CL_GD5480	0x00bc	CL-GD5480
 product CIRRUS CL_GD5462	0x00d0	CL-GD5462
-product CIRRUS CL_GD5464	0x00d4	CL-GD6464
+product CIRRUS CL_GD5464	0x00d4	CL-GD5464
+product CIRRUS CL_GD5465	0x00d6	CL-GD5465
 product CIRRUS CL_PD6729	0x1100	CL-PD6729
-product CIRRUS CL_PD6832	0x1100	CL-PD6832 PCI-CardBus
+product CIRRUS CL_PD6832	0x1110	CL-PD6832 PCI-CardBus
 product CIRRUS CL_PD6833	0x1113	CL-PD6833 PCI-CardBus
 product CIRRUS CL_GD7542	0x1200	CL-GD7542
 product CIRRUS CL_GD7543	0x1202	CL-GD7543
@@ -890,12 +894,18 @@ product COMPAQ TRIFLEX4		0x4000	Triflex Host-PCI
 product COMPAQ USB		0x7020	USB
 product COMPAQ FXP		0xa0f0	Netelligent ASMC
 product COMPAQ PCI_ISA_BRIDGE1	0xa0f3	PCI-ISA
+product COMPAQ OHCI		0xa0f8	USB OpenHost
+product COMPAQ PCI_ISA_BRIDGE3	0xae29	PCI-ISA
+product COMPAQ PCI_ISAPNP	0xae2b	PCI-ISAPnP
 product COMPAQ N100TX		0xae32	Netelligent 10/100 TX
 product COMPAQ IDE		0xae33	Netelligent IDE
 product COMPAQ N10T		0xae34	Netelligent 10 T
 product COMPAQ IntNF3P		0xae35	Integrated NetFlex 3/P
 product COMPAQ DPNet100TX	0xae40	Dual Port Netelligent 10/100 TX
 product COMPAQ IntPL100TX	0xae43	ProLiant Netelligent 10/100 TX
+product COMPAQ PCI_ISA_BRIDGE2	0xae69	PCI-ISA
+product COMPAQ HOST_PCI_BRIDGE1	0xae6c	Host-PCI
+product COMPAQ HOST_PCI_BRIDGE2 0xae6d	Host-PCI
 product COMPAQ DP4000		0xb011	Embedded Netelligent 10/100 TX
 product COMPAQ N10T2		0xb012	Netelligent 10 T/2 PCI
 product COMPAQ N10_TX_UTP	0xb030	Netelligent 10/100 TX
@@ -908,8 +918,9 @@ product COMPEX RL100ATX		0x2011	RL100-ATX 10/100
 product COMPEX 98713		0x9881	PMAC 98713
 
 /* Conexant products */
-product CONEXANT SOFTK56_PCI	0x2443	SoftK56 PCI
 product CONEXANT 56K_WINMODEM	0x1033	56k Winmodem
+product CONEXANT 56K_WINMODEM2	0x1036	56k Winmodem
+product CONEXANT SOFTK56_PCI	0x2443	SoftK56 PCI
 
 /* Contaq Microsystems products */
 product CONTAQ 82C599		0x0600	82C599 PCI-VLB
@@ -993,6 +1004,7 @@ product ESSTECH	MAESTROII	0x1968	Maestro II
 product ESSTECH SOLO1		0x1969	SOLO-1 AudioDrive
 product ESSTECH MAESTRO2E	0x1978	Maestro 2E
 product ESSTECH MAESTRO3	0x1998	Maestro 3
+product ESSTECH 2898		0x2898	ES2898 Modem
 
 /* Essential Communications products */
 product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI
@@ -1018,6 +1030,7 @@ product EFFICIENTNETS EFSS25	0x0005	25SS-3010 ATM (ASIC)
 
 /* Hewlett-Packard products */
 product HP J2585A		0x1030	J2585A
+product HP J2585B		0x1031	J2585B
 /* XXX guess */
 product HP NETRAID_4M		0x10c2	NetRaid-4M
 
@@ -1060,6 +1073,7 @@ product INTEL CDC		0x0483	82424ZX (Saturn) Cache/DRAM
 product INTEL SIO		0x0484	82378IB PCI-ISA (System I/O)
 product INTEL 82426EX		0x0486	82426EX PCI-to-ISA (PCIB)
 product INTEL PCMC		0x04a3	82434LX/NX (Mercury/Neptune) PCI/Cache/DRAM
+product INTEL 80960RP		0x0960	i960 RP PCI-PCI
 product INTEL 80960RM		0x0962	i960 RM PCI-PCI
 product INTEL 80960RN		0x0964	i960 RN PCI-PCI
 product INTEL 82452		0x1000	Pro/1000
@@ -1090,8 +1104,9 @@ product INTEL 82437MX		0x1235	82437 (Triton MX) PCI/CACHECOMP/DRAM
 product INTEL 82441FX		0x1237	82441FX
 product INTEL 82380AB		0x123c	82380AB Mobile PCI-ISA
 product INTEL 82380FB		0x124b	82380FB Mobile PCI-PCI
-product INTEL 82806AA		0x1360	82806AA PCI64
 product INTEL 82439HX		0x1250	82439HX (Triton II)
+product INTEL 82806AA		0x1360	82806AA PCI64
+product INTEL 80960RP_ATU	0x1960	80960RP ATU
 product INTEL 82840_HB		0x1a21	82840 Host
 product INTEL 82840_AGP		0x1a23	82840 AGP
 product INTEL 82840_PCI		0x1a24	82840 PCI
@@ -1233,6 +1248,7 @@ product LUXSONOR LS242		0x0020	LS242 DVD Decoder
 /* Macronix */
 product MACRONIX MX98713	0x0512	PMAC 98713
 product MACRONIX MX98715	0x0531	PMAC 98715
+product MACRONIX MX86250	0x8625	MX86250
 
 /* Madge Networks products */
 product MADGE COLLAGE25		0x1000	Collage 25 ATM adapter
@@ -1254,6 +1270,7 @@ product MATROX MYSTIQUE		0x102B	MGA 1064SG
 
 /* Motorola products */
 product MOT MPC106		0x0002	MPC106 Host-PCI
+product MOT SM56		0x5600	SM56
 
 /* Mylex products */
 product MYLEX 960P		0x0001	DAC960P RAID
@@ -1279,6 +1296,7 @@ product NEOMAGIC 128ZV		0x0003	Magicgraph 128ZV
 product NEOMAGIC NM2160		0x0004	Magicgraph NM2160
 product NEOMAGIC NM2200		0x0005	Magicgraph NM2200
 product NEOMAGIC NM2360		0x0006	Magicgraph NM2360
+product NEOMAGIC NM2230		0x0025	MagicMedia 256AV+
 product NEOMAGIC NM256XLP	0x0016	MagicMedia 256XL+
 product NEOMAGIC NM256AV	0x8005	MagicMedia 256AV
 product NEOMAGIC NM256ZX	0x8006	MagicMedia 256ZX
@@ -1346,14 +1364,14 @@ product SYMBIOS 825		0x0003	53c825
 product SYMBIOS 815		0x0004	53c815
 product SYMBIOS 810AP		0x0005	53c810AP
 product SYMBIOS 860		0x0006	53c860
-product SYMBIOS 875		0x000f	53c875
-product SYMBIOS	875J		0x008f	53c875J
-product SYMBIOS	885		0x000d	53c885
-product SYMBIOS	895		0x000c	53c895
-product SYMBIOS	895A		0x0012	53c895A
+product SYMBIOS	1510D		0x000a	53c1510D
 product SYMBIOS	896		0x000b	53c896
+product SYMBIOS	895		0x000c	53c89
+product SYMBIOS	885		0x000d	53c885
+product SYMBIOS 875		0x000f	53c875
 product SYMBIOS	1510		0x0010	53c1510
-product SYMBIOS	1510D		0x000a	53c1510D
+product SYMBIOS	895A		0x0012	53c895A
+product SYMBIOS	875J		0x008f	53c875J
 
 /* Packet Engines products */
 product SYMBIOS PE_GNIC		0x0702	Packet Engines G-NIC
@@ -1370,13 +1388,16 @@ product NUMBER9 I128_2		0x2339	Imagine-128 II
 product NUMBER9 I128_T2R	0x493D	Imagine-128 T2R
 
 /* NVidia products */
-product NVIDIA	NV1		0x0008	NV1
-product NVIDIA	DAC64		0x0009	DAC64
-product NVIDIA	RIVA_TNT	0x0020	Riva TNT
-product NVIDIA	RIVA_TNT2	0x0028	Riva TNT2
-product NVIDIA	GEFORCE256	0x0100	GeForce256
-product NVIDIA	GEFORCE256_DDR	0x0101	GeForce256 DDR
-product NVIDIA	GEFORCE2GTS	0x0150	GeForce2 GTS
+product NVIDIA NV1		0x0008	NV1
+product NVIDIA DAC64		0x0009	DAC64
+product NVIDIA RIVA_TNT		0x0020	Riva TNT
+product NVIDIA RIVA_TNT2	0x0028	Riva TNT2
+product NVIDIA RIVA_TNT2_ULTRA	0x0029	Riva TNT2 Ultra
+product NVIDIA VANTA1		0x002c	Vanta
+product NVIDIA VANTA2		0x002d	Vanta
+product NVIDIA GEFORCE256	0x0100	GeForce256
+product NVIDIA GEFORCE256_DDR	0x0101	GeForce256 DDR
+product NVIDIA GEFORCE2GTS	0x0150	GeForce2 GTS
 
 /* Oak Technologies products */
 product OAKTECH OTI1007		0x0107	OTI107
@@ -1386,6 +1407,9 @@ product OLICOM OC2183		0x0013	OC2183
 product OLICOM OC2325		0x0012	OC2325
 product OLICOM OC2326		0x0014	OC2326
 
+/* Omega Micro products */
+product OMEGA 82C092G		0x1221	82C092G
+
 /* Opti products */
 product OPTI 82C557		0xc557	82C557 Host
 product OPTI 82C558		0xc558	82C558 PCI-ISA
@@ -1494,6 +1518,7 @@ product S3 PLATO		0x8902	Plato
 product S3 TRIO3D_AGP		0x8904	Trio3D AGP
 product S3 VIRGE_DX_GX		0x8a01	ViRGE DX/GX
 product S3 VIRGE_GX2		0x8a10	ViRGE GX2
+product S3 TRIO3_DX2		0x8a13	Trio3 DX2
 product S3 SAVAGE3D		0x8a20	Savage 3D
 product S3 SAVAGE3D_M		0x8a21	Savage 3DM
 product S3 SAVAGE4		0x8a22	Savage 4
@@ -1522,21 +1547,25 @@ product SIGMA DVDMAGICPRO	0x8300	DVDmagic-PRO
 /* Silicon Integrated System products */
 product SIS 86C201		0x0001	86C201 Host-AGP
 product SIS 86C202		0x0002	86C202 VGA
-product SIS 86C205		0x0005	86C205
+product SIS 86C205_1		0x0005	86C205
 product SIS 85C503		0x0008	85C503 ISA
 product SIS 5595		0x0009	5595 PCI System I/O Chipset
 product SIS 5597VGA		0x0200	5597/5598 VGA
+product SIS 6215		0x0204	6215
+product SIS 86C205_2		0x0205	86C205
 product SIS 85C501		0x0406	85C501
 product SIS 85C496		0x0496	85C496
 product SIS 85C596		0x0496	85C596
 product SIS SiS530		0x0530	SiS530 Host-PCI
 product SIS 85C601		0x0601	85C601 EIDE
 product SIS 620			0x0620  620 Host-PCI
+product SIS 630			0x0630	630 Host-PCI
 product SIS 900			0x0900	900 10/100BaseTX
 product SIS 7016		0x7016	7016 10/100BaseTX
 product SIS 5511		0x5511	5511
 product SIS 5512		0x5512	5512
 product SIS 5513		0x5513	5513 EIDE
+product SIS 5571		0x5571	5571
 product SIS 5581		0x5581	5581
 product SIS 5582		0x5582	5582
 product SIS 5591		0x5591	5591 Host-PCI
@@ -1545,6 +1574,7 @@ product SIS 5597		0x5597  5597 Host
 product SIS 5598		0x5598	5598
 product SIS 6204		0x6204	6204
 product SIS 6205		0x6205	6205
+product SIS 6300		0x6300	6300
 product SIS 530			0x6306  530 VGA
 product SIS 6326		0x6326	6326 AGP Video
 product SIS 5597_USB		0x7001	5597/5598 USB
@@ -1586,6 +1616,9 @@ product TEKRAM2	DC690C		0x690c	DC-690C
 
 /* Texas Instruments products */
 product TI TLAN			0x0500	TLAN
+product TI PERMEDIA		0x3d04	3DLabs Permedia
+product TI PERMEDIA2		0x3d07	3DLabs Permedia 2
+product TI TSB12LV23		0x8019	TSB12LV23 FireWire
 product TI PCI1130		0xac12	PCI1130 PCI-CardBus
 product TI PCI1031		0xac13	PCI1031 PCI-pcmcia
 product TI PCI1131		0xac15	PCI1131 PCI-CardBus
@@ -1599,15 +1632,13 @@ product TI PCI1211		0xac1e	PCI1211 PCI-CardBus
 product TI PCI1251B		0xac1f	PCI1251B PCI-CardBus
 product TI PCI2030		0xac20	PCI2030 PCI-PCI
 product TI PCI2031		0xac21	PCI2031 PCI-PCI
+product TI PCI1410		0xac50	PCI1410 PCI-CardBus
 product TI PCI1420		0xac51	PCI1420 PCI-CardBus
 product TI PCI1451		0xac52	PCI1451 PCI-CardBus
-product TI PERMEDIA		0x3d04	3DLabs Permedia
-product TI PERMEDIA2		0x3d07	3DLabs Permedia 2
-product TI TSB12LV23		0x8019	TSB12LV23 FireWire
 
 /* Toshiba products */
-product TOSHIBA	R4X00		0x102f	R4x00 Host-PCI
 product TOSHIBA	TC35856F	0x0020	TC35856F ATM (Meteor)
+product TOSHIBA	R4X00		0x102f	R4x00 Host-PCI
 
 /* Toshiba(2) products */
 product TOSHIBA2 THB 		0x0601	Host-PCI
@@ -1621,6 +1652,7 @@ product TOSHIBA2 TFIRO		0x0701	Fast Infrared Type O
 /* Trident products */
 product TRIDENT 4DWAVE_DX	0x2000	4DWAVE DX
 product TRIDENT 4DWAVE_NX	0x2001	4DWAVE NX
+product TRIDENT CYBERBLADE_I7	0x8420	CyberBlade i7
 product TRIDENT	TGUI_9320	0x9320	TGUI 9320
 product TRIDENT	TGUI_9350	0x9350	TGUI 9350
 product TRIDENT	TGUI_9360	0x9360	TGUI 9360
@@ -1633,8 +1665,9 @@ product TRIDENT CYBER_9525	0x9525	CYBER 9525
 product TRIDENT	TGUI_9660	0x9660	TGUI 9660
 product TRIDENT	TGUI_9680	0x9680	TGUI 9680
 product TRIDENT	TGUI_9682	0x9682	TGUI 9682
-product TRIDENT TGUI_9750	0x9750	TGUI 9750 (3D Image)
-product TRIDENT TGUI_9850	0x9850	TGUI 9850
+product TRIDENT 3DIMAGE_9750	0x9750	3DImage 9750
+product TRIDENT 3DIMAGE_9850	0x9850	3DImage 9850
+product TRIDENT BLADE_3D	0x9880	Blade 3D
 
 /* Triones/HighPoint Technologies products */
 product	TRIONES	HPT343		0x0003	HPT343 EIDE
@@ -1684,6 +1717,7 @@ product V3 V96DPC		0xC960	V96DPC	i960 (Dual) Host-PCI
 /* VIA Technologies products */
 product VIATECH VT8363		0x0305	VT8363 (Apollo 133) Host
 product	VIATECH	VT8371_HB	0x0391	VT8371 (Apollo 133) Host
+product VIATECH VT8501		0x0501	VT8501 (Apollo MVP4)
 product VIATECH VT82C505	0x0505	VT82C505 (Pluto) 
 product VIATECH VT82C561	0x0561	VT82C561
 product VIATECH VT82C586A_IDE	0x0571	VT82C586A IDE
@@ -1694,6 +1728,7 @@ product VIATECH VT82C595	0x0595	VT82C595 (Apollo VP2) Host-PCI
 product VIATECH VT82C596A	0x0596	VT82C596A (Apollo Pro) PCI-ISA
 product VIATECH VT82C597PCI	0x0597	VT82C597 (Apollo VP3) Host-PCI
 product VIATECH VT82C598PCI	0x0598	VT82C598 (Apollo MVP3) Host-PCI
+product VIATECH VT8605		0x0605	VT8605 (ProSavage PM133) Host-PCI
 product	VIATECH VT82C686A_ISA	0x0686	VT82C686A (Apollo 133) PCI-ISA
 product	VIATECH	VT82C691	0x0691	VT82C691 (Apollo Pro) Host-PCI
 product	VIATECH	VT82C693	0x0693	VT82C693 (Apollo Pro Plus) Host-PCI
@@ -1704,15 +1739,17 @@ product VIATECH VT82C586_IDE	0x1571	VT82C586 (Apollo VP) IDE
 product VIATECH VT82C1595	0x1595	VT82C1595 (Apollo VP2) Host-PCI
 product VIATECH VT83C572	0x3038	VT83C572 USB
 product VIATECH VT82C586_PWR	0x3040	VT82C586 (Apollo VP) Power Management
-product VIATECH VT82C596	0x3050	VT82C596 Power Management
 product VIATECH RHINE		0x3043	Rhine/RhineII
-product	VIATECH RHINEII_2	0x3065	RhineII-2
+product VIATECH VT82C596	0x3050	VT82C596 Power Management
 product	VIATECH	VT82C686A_SMB	0x3057	VT82C686A (Apollo 133) SMBus
 product	VIATECH	VT82C686A_AC97	0x3058	VT82C686A (Apollo 133) AC-97 Audio
+product	VIATECH RHINEII_2	0x3065	RhineII-2
 product VIATECH VT8363_AGP	0x8305	VT8363 (Apollo 133) PCI-AGP
 product	VIATECH	VT8371_PPB	0x8391	VT8371 (Apollo 133) PCI-PCI
+product VIATECH VT8501_AGP	0x8501	VT8501 (Apollo MVP4) PCI-AGP
 product VIATECH VT82C597AGP	0x8597	VT82C597 (Apollo VP3) PCI-AGP
 product VIATECH VT82C598AGP	0x8598	VT82C598 (Apollo MVP3) PCI-AGP
+product VIATECH VT8605_AGP	0x8605	VT8605 (ProSavage PM133) PCI-AGP
 product VIATECH RHINEII		0x6100	RhineII
 
 /* Vortex Computer Systems products */
@@ -1819,15 +1856,15 @@ product	XIRCOM X3201_3_21143	0x0003	X3201-3 (21143)
 
 /* Yamaha products */
 product YAMAHA YMF724		0x0004	724
-product YAMAHA YMF724F		0x000d	724F
 product YAMAHA YMF734		0x0005	734
+product YAMAHA YMF738_TEG	0x0006	738
 product YAMAHA YMF737		0x0008	737
-product YAMAHA YMF738		0x0020	738
 product YAMAHA YMF740		0x000a	740
 product YAMAHA YMF740C		0x000c	740C
+product YAMAHA YMF724F		0x000d	724F
 product YAMAHA YMF744		0x0010	744
 product YAMAHA YMF754		0x0012	754
-product YAMAHA YMF738_TEG	0x0006	738
+product YAMAHA YMF738		0x0020	738
 
 /* Zeinet products */
 product ZEINET 1221		0x0001	1221
@@ -1836,4 +1873,5 @@ product ZEINET 1221		0x0001	1221
 product ZIATECH ZT8905		0x8905 PCI-ST32
 
 /* Zoran products */
-product ZORAN ZR36120		0x6120 Video
+product ZORAN ZR36057		0x6057 TV
+product ZORAN ZR36120		0x6120 DVD