summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/cardbus/com_cardbus.c4
-rw-r--r--sys/dev/pci/pucdata.c9
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 73940dedfe6..af32dcd35bd 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.41 2011/10/09 21:46:32 jsg Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.42 2012/07/12 08:20:53 deraadt Exp $ */
/* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
/*
@@ -127,6 +127,8 @@ static struct csdev {
{ PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56,
CARDBUS_BASE0_REG, PCI_MAPREG_TYPE_IO },
{ PCI_VENDOR_WCH, PCI_PRODUCT_WCH_CH352,
+ CARDBUS_BASE0_REG, PCI_MAPREG_TYPE_IO },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9820,
CARDBUS_BASE0_REG, PCI_MAPREG_TYPE_IO }
};
diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c
index 6a960be1534..f65c39df3aa 100644
--- a/sys/dev/pci/pucdata.c
+++ b/sys/dev/pci/pucdata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pucdata.c,v 1.82 2012/05/12 15:54:54 kettenis Exp $ */
+/* $OpenBSD: pucdata.c,v 1.83 2012/07/12 08:20:52 deraadt Exp $ */
/* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */
/*
@@ -1900,6 +1900,13 @@ const struct puc_device_description puc_devs[] = {
{ PUC_COM_POW2(0), 0x14, 0x0000 },
},
},
+ { /* "NetMos NM9820 UART" */
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9820, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
{ /* "MosChip MCS9865 Quad Serial Port" */
{ PCI_VENDOR_MOSCHIP, PCI_PRODUCT_MOSCHIP_MCS9865, 0x1000, 0x4 },
{ 0xffff, 0xffff, 0xffff, 0xffff },