Deleted Added
full compact
dcons_crom.c (129879) dcons_crom.c (136467)
1/*
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. 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

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
1/*
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. 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

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
35 * $FreeBSD: head/sys/dev/dcons/dcons_crom.c 129879 2004-05-30 20:08:47Z phk $
35 * $FreeBSD: head/sys/dev/dcons/dcons_crom.c 136467 2004-10-13 05:38:42Z simokawa $
36 */
37
38#include <sys/param.h>
39#include <sys/kernel.h>
40#include <sys/module.h>
41#include <sys/systm.h>
42#include <sys/types.h>
43#include <sys/conf.h>
44#include <sys/malloc.h>
45
46#include <sys/bus.h>
47#include <machine/bus.h>
48
36 */
37
38#include <sys/param.h>
39#include <sys/kernel.h>
40#include <sys/module.h>
41#include <sys/systm.h>
42#include <sys/types.h>
43#include <sys/conf.h>
44#include <sys/malloc.h>
45
46#include <sys/bus.h>
47#include <machine/bus.h>
48
49#ifdef __DragonFly__
50#include <bus/firewire/firewire.h>
51#include <bus/firewire/firewirereg.h>
52#include <bus/firewire/iec13213.h>
53#include "dcons.h"
54#include "dcons_os.h"
55#else
49#include <dev/firewire/firewire.h>
50#include <dev/firewire/firewirereg.h>
51#include <dev/firewire/iec13213.h>
52#include <dev/dcons/dcons.h>
56#include <dev/firewire/firewire.h>
57#include <dev/firewire/firewirereg.h>
58#include <dev/firewire/iec13213.h>
59#include <dev/dcons/dcons.h>
60#include <dev/dcons/dcons_os.h>
61#endif
53
54#include <sys/cons.h>
55
56static bus_addr_t dcons_paddr;
57
58#if __FreeBSD_version >= 500000
59static int force_console = 1;
60TUNABLE_INT("hw.firewire.dcons_crom.force_console", &force_console);

--- 179 unchanged lines hidden ---
62
63#include <sys/cons.h>
64
65static bus_addr_t dcons_paddr;
66
67#if __FreeBSD_version >= 500000
68static int force_console = 1;
69TUNABLE_INT("hw.firewire.dcons_crom.force_console", &force_console);

--- 179 unchanged lines hidden ---