summaryrefslogtreecommitdiffstats
path: root/sys/pc98/cbus/sio.c
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2001-06-26 11:48:17 +0000
committernyan <nyan@FreeBSD.org>2001-06-26 11:48:17 +0000
commit0f2397a09b11be58a4ce42281b27213029525963 (patch)
treea43c5d68118de91217b26594d2b6351039f3135b /sys/pc98/cbus/sio.c
parent0389b45e3baf316ed6c2c3e63ef0c667be5891f8 (diff)
downloadFreeBSD-src-0f2397a09b11be58a4ce42281b27213029525963.zip
FreeBSD-src-0f2397a09b11be58a4ce42281b27213029525963.tar.gz
Merged from sys/isa/sio.c revision 1.335.
Diffstat (limited to 'sys/pc98/cbus/sio.c')
-rw-r--r--sys/pc98/cbus/sio.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index c3a519b..b77f94b 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -976,6 +976,7 @@ sio_pccard_detach(dev)
bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres);
if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
device_printf(dev, "still open, forcing close\n");
+ (*linesw[com->tp->t_line].l_close)(com->tp, 0);
com->tp->t_gen++;
ttyclose(com->tp);
ttwakeup(com->tp);
@@ -998,7 +999,9 @@ struct pci_ids {
static struct pci_ids pci_ids[] = {
{ 0x100812b9, "3COM PCI FaxModem", 0x10 },
- { 0x048011c1, "ActionTec 56k FAX PCI Modem", 0x14 },
+ { 0x048011c1, "Lucent kermit based PCI Modem", 0x14 },
+ { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 },
+ /* { 0xXXXXXXXX, "Xircom Cardbus modem", 0x10 }, */
{ 0x00000000, NULL, 0 }
};
@@ -4634,6 +4637,7 @@ DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);
#endif
#if NPCI > 0
DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0);
+DRIVER_MODULE(sio, cardbus, sio_pci_driver, sio_devclass, 0, 0);
#endif
#ifdef PC98
OpenPOWER on IntegriCloud