Deleted Added
full compact
sio.c (77726) sio.c (77750)
1/*-
2 * Copyright (c) 1991 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*-
2 * Copyright (c) 1991 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/sys/dev/sio/sio.c 77726 2001-06-04 21:04:14Z joerg $
33 * $FreeBSD: head/sys/dev/sio/sio.c 77750 2001-06-05 05:58:57Z imp $
34 * from: @(#)com.c 7.5 (Berkeley) 5/16/91
35 * from: i386/isa sio.c,v 1.234
36 */
37
38#include "opt_comconsole.h"
39#include "opt_compat.h"
40#include "opt_ddb.h"
41#include "opt_sio.h"

--- 508 unchanged lines hidden (view full) ---

550 if (com->irqres) {
551 bus_teardown_intr(dev, com->irqres, com->cookie);
552 bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres);
553 }
554 if (com->ioportres)
555 bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres);
556 if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
557 device_printf(dev, "still open, forcing close\n");
34 * from: @(#)com.c 7.5 (Berkeley) 5/16/91
35 * from: i386/isa sio.c,v 1.234
36 */
37
38#include "opt_comconsole.h"
39#include "opt_compat.h"
40#include "opt_ddb.h"
41#include "opt_sio.h"

--- 508 unchanged lines hidden (view full) ---

550 if (com->irqres) {
551 bus_teardown_intr(dev, com->irqres, com->cookie);
552 bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres);
553 }
554 if (com->ioportres)
555 bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres);
556 if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
557 device_printf(dev, "still open, forcing close\n");
558 (*linesw[com->tp->t_line].l_close)(com->tp, 0);
558 com->tp->t_gen++;
559 ttyclose(com->tp);
560 ttwakeup(com->tp);
561 ttwwakeup(com->tp);
562 } else {
563 if (com->ibuf != NULL)
564 free(com->ibuf, M_DEVBUF);
565 }

--- 6 unchanged lines hidden (view full) ---

572struct pci_ids {
573 u_int32_t type;
574 const char *desc;
575 int rid;
576};
577
578static struct pci_ids pci_ids[] = {
579 { 0x100812b9, "3COM PCI FaxModem", 0x10 },
559 com->tp->t_gen++;
560 ttyclose(com->tp);
561 ttwakeup(com->tp);
562 ttwwakeup(com->tp);
563 } else {
564 if (com->ibuf != NULL)
565 free(com->ibuf, M_DEVBUF);
566 }

--- 6 unchanged lines hidden (view full) ---

573struct pci_ids {
574 u_int32_t type;
575 const char *desc;
576 int rid;
577};
578
579static struct pci_ids pci_ids[] = {
580 { 0x100812b9, "3COM PCI FaxModem", 0x10 },
580 { 0x048011c1, "ActionTec 56k FAX PCI Modem", 0x14 },
581 { 0x048011c1, "Lucent kermit based PCI Modem", 0x14 },
581 { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 },
582 { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 },
583 /* { 0xXXXXXXXX, "Xircom Cardbus modem", 0x10 }, */
582 { 0x00000000, NULL, 0 }
583};
584
585static int
586sio_pci_attach(dev)
587 device_t dev;
588{
589 u_int32_t type;

--- 2759 unchanged lines hidden (view full) ---

3349#endif
3350
3351DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
3352#if NCARD > 0
3353DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);
3354#endif
3355#if NPCI > 0
3356DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0);
584 { 0x00000000, NULL, 0 }
585};
586
587static int
588sio_pci_attach(dev)
589 device_t dev;
590{
591 u_int32_t type;

--- 2759 unchanged lines hidden (view full) ---

3351#endif
3352
3353DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
3354#if NCARD > 0
3355DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);
3356#endif
3357#if NPCI > 0
3358DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0);
3359DRIVER_MODULE(sio, cardbus, sio_pci_driver, sio_devclass, 0, 0);
3357#endif
3360#endif