diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index ffe2f199987a..0e9c2094b808 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.254 2000/08/07 08:27:11 billc Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.255 2000/08/21 09:13:02 haya Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *  NetBSD: pcidevs,v 1.247 2000/08/07 04:08:35 billc Exp
+ *	NetBSD: pcidevs,v 1.249 2000/08/21 08:58:51 haya Exp 
  */
 
 /*
@@ -416,7 +416,7 @@
 #define	PCI_VENDOR_SBE	0x1176		/* SBE */
 #define	PCI_VENDOR_SILICONENG	0x1177		/* Silicon Engineering */
 #define	PCI_VENDOR_ALFA	0x1178		/* Alfa */
-#define	PCI_VENDOR_TOSHIBA2	0x1179		/* Toshiba America Info Systems */
+#define	PCI_VENDOR_TOSHIBA2	0x1179		/* Toshiba */
 #define	PCI_VENDOR_ATREND	0x117a		/* A-Trend Technology */
 #define	PCI_VENDOR_ATTO	0x117c		/* Atto Technology */
 #define	PCI_VENDOR_TR	0x117e		/* T/R Systems */
@@ -1449,20 +1449,28 @@
 #define	PCI_PRODUCT_TI_TVP4020	0x3d07		/* TVP4020 Permedia 2 */
 #define	PCI_PRODUCT_TI_TSB12LV21	0x8000		/* TSB12LV21 IEEE 1394 Host Controller */
 #define	PCI_PRODUCT_TI_TSB12LV22	0x8009		/* TSB12LV22 OHCI IEEE 1394 Host Controller */
+#define	PCI_PRODUCT_TI_PCI4450LYNX	0x8011		/* PCI4450 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge */
+#define	PCI_PRODUCT_TI_PCI4410LYNX	0x8017		/* PCI4410 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_TSB12LV23	0x8019		/* TSB12LV23 OHCI IEEE 1394 Host Controller */
 #define	PCI_PRODUCT_TI_TSB12LV26	0x8020		/* TSB12LV26 OHCI IEEE 1394 Host Controller */
+#define	PCI_PRODUCT_TI_PCI4451LYNX	0x8027		/* PCI4451 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1130	0xac12		/* PCI1130 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1031	0xac13		/* PCI1031 PCI-PCMCIA Bridge */
 #define	PCI_PRODUCT_TI_PCI1131	0xac15		/* PCI1131 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1250	0xac16		/* PCI1250 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1220	0xac17		/* PCI1220 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1221	0xac19		/* PCI1221 PCI-CardBus Bridge */
+#define	PCI_PRODUCT_TI_PCI1210	0xac1a		/* PCI1210 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1450	0xac1b		/* PCI1450 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1225	0xac1c		/* PCI1225 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1251	0xac1d		/* PCI1251 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1211	0xac1e		/* PCI1211 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1251B	0xac1f		/* PCI1251B PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI2030	0xac20		/* PCI2030 PCI-PCI Bridge */
+#define	PCI_PRODUCT_TI_PCI4450YENTA	0xac40		/* PCI4450 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller */
+#define	PCI_PRODUCT_TI_PCI4410YENTA	0xac41		/* PCI4410 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller */
+#define	PCI_PRODUCT_TI_PCI4451YENTA	0xac42		/* PCI4451 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller */
+#define	PCI_PRODUCT_TI_PCI1410	0xac50		/* PCI1410 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1420	0xac51		/* PCI1420 PCI-CardBus Bridge */
 #define	PCI_PRODUCT_TI_PCI1451	0xac52		/* PCI1451 PCI-CardBus Bridge */
 
@@ -1470,14 +1478,15 @@
 #define	PCI_PRODUCT_TOSHIBA_R4X00	0x0009		/* R4x00 Host-PCI Bridge */
 #define	PCI_PRODUCT_TOSHIBA_TC35856F	0x0020		/* TC35856F ATM (\"Meteor\") */
 
-/* Toshiba America Info Systems products */
+/* Toshiba products */
 #define	PCI_PRODUCT_TOSHIBA2_HOST	0x0601		/* Host Bridge/Controller */
 #define	PCI_PRODUCT_TOSHIBA2_ISA	0x0602		/* ISA Bridge */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC95	0x0603		/* ToPIC95 CardBus-PCI Bridge */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC95B	0x060a		/* ToPIC95B CardBus-PCI Bridge */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC97	0x060f		/* ToPIC97 CardBus-PCI Bridge */
 #define	PCI_PRODUCT_TOSHIBA2_ToPIC100	0x0617		/* ToPIC100 CardBus-PCI Bridge */
-#define	PCI_PRODUCT_TOSHIBA2_FIRO	0x0701		/* Fast Infrared Type O */
+#define	PCI_PRODUCT_TOSHIBA2_OBOE	0x0701		/* Fast Infrared Type O */
+#define	PCI_PRODUCT_TOSHIBA2_DONAUOBOE	0x0d01		/* Fast Infrared Type DO */
 
 /* Trident products */
 #define	PCI_PRODUCT_TRIDENT_CYBERBLADE_I7	0x8420		/* CyberBlade i7 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 2b6c97a419b5..7b774d800ecf 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.252 2000/08/07 08:27:11 billc Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.253 2000/08/21 09:13:02 haya Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *  NetBSD: pcidevs,v 1.247 2000/08/07 04:08:35 billc Exp
+ *	NetBSD: pcidevs,v 1.249 2000/08/21 08:58:51 haya Exp 
  */
 
 /*
@@ -3795,6 +3795,18 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Texas Instruments",
 	    "TSB12LV22 OHCI IEEE 1394 Host Controller",
 	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4450LYNX,
+	    0,
+	    "Texas Instruments",
+	    "PCI4450 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4410LYNX,
+	    0,
+	    "Texas Instruments",
+	    "PCI4410 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge",
+	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_TSB12LV23,
 	    0,
@@ -3807,6 +3819,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Texas Instruments",
 	    "TSB12LV26 OHCI IEEE 1394 Host Controller",
 	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4451LYNX,
+	    0,
+	    "Texas Instruments",
+	    "PCI4451 OCHI IEEE 1394 HOST Controller w/ PCI-CardBus Bridge",
+	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1130,
 	    0,
@@ -3843,6 +3861,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Texas Instruments",
 	    "PCI1221 PCI-CardBus Bridge",
 	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1210,
+	    0,
+	    "Texas Instruments",
+	    "PCI1210 PCI-CardBus Bridge",
+	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1450,
 	    0,
@@ -3879,6 +3903,30 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Texas Instruments",
 	    "PCI2030 PCI-PCI Bridge",
 	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4450YENTA,
+	    0,
+	    "Texas Instruments",
+	    "PCI4450 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4410YENTA,
+	    0,
+	    "Texas Instruments",
+	    "PCI4410 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4451YENTA,
+	    0,
+	    "Texas Instruments",
+	    "PCI4451 PCI-CardBus Bridge w/ OCHI IEEE 1394 Controller",
+	},
+	{
+	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1410,
+	    0,
+	    "Texas Instruments",
+	    "PCI1410 PCI-CardBus Bridge",
+	},
 	{
 	    PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1420,
 	    0,
@@ -3906,45 +3954,51 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_HOST,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "Host Bridge/Controller",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ISA,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "ISA Bridge",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "ToPIC95 CardBus-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC95B,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "ToPIC95B CardBus-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC97,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "ToPIC97 CardBus-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC100,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "ToPIC100 CardBus-PCI Bridge",
 	},
 	{
-	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_FIRO,
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_OBOE,
 	    0,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    "Fast Infrared Type O",
 	},
+	{
+	    PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_DONAUOBOE,
+	    0,
+	    "Toshiba",
+	    "Fast Infrared Type DO",
+	},
 	{
 	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_CYBERBLADE_I7,
 	    0,
@@ -7002,7 +7056,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_TOSHIBA2, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Toshiba America Info Systems",
+	    "Toshiba",
 	    NULL,
 	},
 	{