Deleted Added
full compact
sio.c (153195) sio.c (155921)
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

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

26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * from: @(#)com.c 7.5 (Berkeley) 5/16/91
30 * from: i386/isa sio.c,v 1.234
31 */
32
33#include <sys/cdefs.h>
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

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

26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * from: @(#)com.c 7.5 (Berkeley) 5/16/91
30 * from: i386/isa sio.c,v 1.234
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/sio/sio.c 153195 2005-12-07 07:23:53Z imp $");
34__FBSDID("$FreeBSD: head/sys/dev/sio/sio.c 155921 2006-02-22 18:16:26Z jhb $");
35
36#include "opt_comconsole.h"
37#include "opt_compat.h"
38#include "opt_gdb.h"
39#include "opt_kdb.h"
40#include "opt_sio.h"
41
42/*

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

1069 com->pps_bit = MSR_CTS;
1070 else
1071 com->pps_bit = MSR_DCD;
1072 pps_init(&com->pps);
1073
1074 rid = 0;
1075 com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
1076 if (com->irqres) {
35
36#include "opt_comconsole.h"
37#include "opt_compat.h"
38#include "opt_gdb.h"
39#include "opt_kdb.h"
40#include "opt_sio.h"
41
42/*

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

1069 com->pps_bit = MSR_CTS;
1070 else
1071 com->pps_bit = MSR_DCD;
1072 pps_init(&com->pps);
1073
1074 rid = 0;
1075 com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
1076 if (com->irqres) {
1077 ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres,
1077 ret = bus_setup_intr(dev, com->irqres,
1078 INTR_TYPE_TTY | INTR_FAST,
1079 siointr, com, &com->cookie);
1080 if (ret) {
1078 INTR_TYPE_TTY | INTR_FAST,
1079 siointr, com, &com->cookie);
1080 if (ret) {
1081 ret = BUS_SETUP_INTR(device_get_parent(dev), dev,
1081 ret = bus_setup_intr(dev,
1082 com->irqres, INTR_TYPE_TTY,
1083 siointr, com, &com->cookie);
1084 if (ret == 0)
1085 device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n");
1086 }
1087 if (ret)
1088 device_printf(dev, "could not activate interrupt\n");
1089#if defined(KDB) && (defined(BREAK_TO_DEBUGGER) || \

--- 1561 unchanged lines hidden ---
1082 com->irqres, INTR_TYPE_TTY,
1083 siointr, com, &com->cookie);
1084 if (ret == 0)
1085 device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n");
1086 }
1087 if (ret)
1088 device_printf(dev, "could not activate interrupt\n");
1089#if defined(KDB) && (defined(BREAK_TO_DEBUGGER) || \

--- 1561 unchanged lines hidden ---