Deleted Added
full compact
ofw_console.c (184329) ofw_console.c (193018)
1/*-
2 * Copyright (C) 2001 Benno Rice.
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

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

19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
22 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
23 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 2001 Benno Rice.
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

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

19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
22 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
23 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_console.c 184329 2008-10-27 11:45:31Z ed $");
27__FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_console.c 193018 2009-05-29 06:41:23Z ed $");
28
29#include "opt_comconsole.h"
30#include "opt_ofw.h"
31
32#include <sys/param.h>
33#include <sys/kdb.h>
34#include <sys/kernel.h>
35#include <sys/priv.h>

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

90 if ((options = OF_finddevice("/options")) == -1 ||
91 OF_getprop(options, "output-device", output,
92 sizeof(output)) == -1)
93 return;
94 /*
95 * XXX: This is a hack and it may result in two /dev/ttya
96 * XXX: devices on platforms where the sab driver works.
97 */
28
29#include "opt_comconsole.h"
30#include "opt_ofw.h"
31
32#include <sys/param.h>
33#include <sys/kdb.h>
34#include <sys/kernel.h>
35#include <sys/priv.h>

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

90 if ((options = OF_finddevice("/options")) == -1 ||
91 OF_getprop(options, "output-device", output,
92 sizeof(output)) == -1)
93 return;
94 /*
95 * XXX: This is a hack and it may result in two /dev/ttya
96 * XXX: devices on platforms where the sab driver works.
97 */
98 tp = tty_alloc(&ofw_ttydevsw, NULL, NULL);
98 tp = tty_alloc(&ofw_ttydevsw, NULL);
99 tty_makedev(tp, NULL, "%s", output);
100 tty_makealias(tp, "ofwcons");
101 }
102}
103
104SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL);
105
106static int stdin;

--- 133 unchanged lines hidden ---
99 tty_makedev(tp, NULL, "%s", output);
100 tty_makealias(tp, "ofwcons");
101 }
102}
103
104SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL);
105
106static int stdin;

--- 133 unchanged lines hidden ---