Deleted Added
full compact
dcons_os.c (158950) dcons_os.c (158959)
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 158950 2006-05-26 11:54:32Z phk $
34 * $FreeBSD: head/sys/dev/dcons/dcons_os.c 158959 2006-05-26 13:51:38Z phk $
35 */
36
37#include <sys/param.h>
38#if __FreeBSD_version >= 502122
39#include <sys/kdb.h>
40#include <gdb/gdb.h>
41#endif
42#include <sys/kernel.h>

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

166
167static void dcons_tty_start(struct tty *);
168static int dcons_tty_param(struct tty *, struct termios *);
169static void dcons_timeout(void *);
170static int dcons_drv_init(int);
171
172static cn_probe_t dcons_cnprobe;
173static cn_init_t dcons_cninit;
35 */
36
37#include <sys/param.h>
38#if __FreeBSD_version >= 502122
39#include <sys/kdb.h>
40#include <gdb/gdb.h>
41#endif
42#include <sys/kernel.h>

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

166
167static void dcons_tty_start(struct tty *);
168static int dcons_tty_param(struct tty *, struct termios *);
169static void dcons_timeout(void *);
170static int dcons_drv_init(int);
171
172static cn_probe_t dcons_cnprobe;
173static cn_init_t dcons_cninit;
174static cn_term_t dcons_cnterm;
174static cn_getc_t dcons_cngetc;
175static cn_getc_t dcons_cngetc;
175static cn_checkc_t dcons_cncheckc;
176static cn_putc_t dcons_cnputc;
177
176static cn_putc_t dcons_cnputc;
177
178CONS_DRIVER(dcons, dcons_cnprobe, dcons_cninit, NULL, dcons_cngetc,
179 dcons_cncheckc, dcons_cnputc, NULL);
178CONSOLE_DRIVER(dcons);
180
181#if __FreeBSD_version >= 502122
182static gdb_probe_f dcons_dbg_probe;
183static gdb_init_f dcons_dbg_init;
184static gdb_term_f dcons_dbg_term;
185static gdb_getc_f dcons_dbg_getc;
186static gdb_putc_f dcons_dbg_putc;
187

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

438#if CONS_NODEV
439 cp->cn_arg
440#else
441 cp->cn_dev->si_drv1
442#endif
443 = (void *)&sc[DCONS_CON]; /* share port0 with unit0 */
444}
445
179
180#if __FreeBSD_version >= 502122
181static gdb_probe_f dcons_dbg_probe;
182static gdb_init_f dcons_dbg_init;
183static gdb_term_f dcons_dbg_term;
184static gdb_getc_f dcons_dbg_getc;
185static gdb_putc_f dcons_dbg_putc;
186

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

437#if CONS_NODEV
438 cp->cn_arg
439#else
440 cp->cn_dev->si_drv1
441#endif
442 = (void *)&sc[DCONS_CON]; /* share port0 with unit0 */
443}
444
445static void
446dcons_cnterm(struct consdev *cp)
447{
448}
449
446#if CONS_NODEV
447static int
448dcons_cngetc(struct consdev *cp)
449{
450 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
450#if CONS_NODEV
451static int
452dcons_cngetc(struct consdev *cp)
453{
454 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
451 return (dcons_os_getc(dc));
452}
453static int
454dcons_cncheckc(struct consdev *cp)
455{
456 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
457 return (dcons_os_checkc(dc));
458}
459static void
460dcons_cnputc(struct consdev *cp, int c)
461{
462 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
463 dcons_os_putc(dc, c);
464}

--- 279 unchanged lines hidden ---
455 return (dcons_os_checkc(dc));
456}
457static void
458dcons_cnputc(struct consdev *cp, int c)
459{
460 struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
461 dcons_os_putc(dc, c);
462}

--- 279 unchanged lines hidden ---