From 50c2952249e3862549ac987c09fdb7baed5388b1 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Tue, 26 Jun 2001 11:48:17 +0000 Subject: [PATCH] Merged from sys/isa/sio.c revision 1.335. --- sys/pc98/cbus/sio.c | 6 +++++- sys/pc98/pc98/sio.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index c3a519b85d35..b77f94b71900 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 diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index c3a519b85d35..b77f94b71900 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/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