Deleted Added
full compact
dcons_os.c (227309) dcons_os.c (228631)
1/*-
2 * Copyright (C) 2003,2004
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

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

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
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 *
1/*-
2 * Copyright (C) 2003,2004
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

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

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
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 * $FreeBSD: head/sys/dev/dcons/dcons_os.c 227309 2011-11-07 15:43:11Z ed $
34 * $FreeBSD: head/sys/dev/dcons/dcons_os.c 228631 2011-12-17 15:08:43Z avg $
35 */
36
37#include <sys/param.h>
38#include <sys/kdb.h>
39#include <gdb/gdb.h>
40#include <sys/kernel.h>
41#include <sys/module.h>
42#include <sys/systm.h>

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

104static void dcons_timeout(void *);
105static int dcons_drv_init(int);
106
107static cn_probe_t dcons_cnprobe;
108static cn_init_t dcons_cninit;
109static cn_term_t dcons_cnterm;
110static cn_getc_t dcons_cngetc;
111static cn_putc_t dcons_cnputc;
35 */
36
37#include <sys/param.h>
38#include <sys/kdb.h>
39#include <gdb/gdb.h>
40#include <sys/kernel.h>
41#include <sys/module.h>
42#include <sys/systm.h>

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

104static void dcons_timeout(void *);
105static int dcons_drv_init(int);
106
107static cn_probe_t dcons_cnprobe;
108static cn_init_t dcons_cninit;
109static cn_term_t dcons_cnterm;
110static cn_getc_t dcons_cngetc;
111static cn_putc_t dcons_cnputc;
112static cn_grab_t dcons_cngrab;
113static cn_ungrab_t dcons_cnungrab;
112
113CONSOLE_DRIVER(dcons);
114
115#if defined(GDB)
116static gdb_probe_f dcons_dbg_probe;
117static gdb_init_f dcons_dbg_init;
118static gdb_term_f dcons_dbg_term;
119static gdb_getc_f dcons_dbg_getc;

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

241 cp->cn_arg = (void *)&sc[DCONS_CON]; /* share port0 with unit0 */
242}
243
244static void
245dcons_cnterm(struct consdev *cp)
246{
247}
248
114
115CONSOLE_DRIVER(dcons);
116
117#if defined(GDB)
118static gdb_probe_f dcons_dbg_probe;
119static gdb_init_f dcons_dbg_init;
120static gdb_term_f dcons_dbg_term;
121static gdb_getc_f dcons_dbg_getc;

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

243 cp->cn_arg = (void *)&sc[DCONS_CON]; /* share port0 with unit0 */
244}
245
246static void
247dcons_cnterm(struct consdev *cp)
248{
249}
250
251static void
252dcons_cngrab(struct consdev *cp)
253{
254}
255
256static void
257dcons_cnungrab(struct consdev *cp)
258{
259}
260
249static int
250dcons_cngetc(struct consdev *cp)
251{
252 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
253 return (dcons_os_checkc(dc));
254}
255
256static void

--- 214 unchanged lines hidden ---
261static int
262dcons_cngetc(struct consdev *cp)
263{
264 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
265 return (dcons_os_checkc(dc));
266}
267
268static void

--- 214 unchanged lines hidden ---