Deleted Added
full compact
comconsole.c (120118) comconsole.c (146011)
1/*
1/*-
2 * Copyright (c) 1998 Michael Smith (msmith@freebsd.org)
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
2 * Copyright (c) 1998 Michael Smith (msmith@freebsd.org)
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/boot/pc98/libpc98/comconsole.c 120118 2003-09-16 11:24:23Z bde $");
27__FBSDID("$FreeBSD: head/sys/boot/pc98/libpc98/comconsole.c 146011 2005-05-08 14:17:28Z nyan $");
28
29#include <stand.h>
30#include <bootstrap.h>
31#include <machine/cpufunc.h>
32#include <dev/ic/ns16550.h>
33#include "libi386.h"
34
35#define COMC_FMT 0x3 /* 8N1 */
36#define COMC_TXWAIT 0x40000 /* transmit timeout */
37#define COMC_BPS(x) (115200 / (x)) /* speed to DLAB divisor */
38
39#ifndef COMPORT
28
29#include <stand.h>
30#include <bootstrap.h>
31#include <machine/cpufunc.h>
32#include <dev/ic/ns16550.h>
33#include "libi386.h"
34
35#define COMC_FMT 0x3 /* 8N1 */
36#define COMC_TXWAIT 0x40000 /* transmit timeout */
37#define COMC_BPS(x) (115200 / (x)) /* speed to DLAB divisor */
38
39#ifndef COMPORT
40#ifdef PC98
41#define COMPORT 0x238
40#define COMPORT 0x238
42#else
43#define COMPORT 0x3f8
44#endif
41#endif
45#endif
46#ifndef COMSPEED
47#define COMSPEED 9600
48#endif
49
50static void comc_probe(struct console *cp);
51static int comc_init(int arg);
52static void comc_putchar(int c);
53static int comc_getchar(void);

--- 65 unchanged lines hidden ---
42#ifndef COMSPEED
43#define COMSPEED 9600
44#endif
45
46static void comc_probe(struct console *cp);
47static int comc_init(int arg);
48static void comc_putchar(int c);
49static int comc_getchar(void);

--- 65 unchanged lines hidden ---