Date: Wed, 10 Mar 2004 20:17:55 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48670 for review Message-ID: <200403110417.i2B4Ht8U076424@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48670 Change 48670 by marcel@marcel_nfs on 2004/03/10 20:17:06 Have gdb.h and uart_dbg.c agree on the interface. This compiles. Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_dbg.c#2 edit .. //depot/projects/gdb/sys/gdb/gdb.h#2 edit Differences ... ==== //depot/projects/gdb/sys/dev/uart/uart_dbg.c#2 (text+ko) ==== @@ -29,21 +29,24 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/bus.h> +#include <sys/kernel.h> +#include <machine/bus.h> #include <gdb/gdb.h> #include <dev/uart/uart.h> #include <dev/uart/uart_cpu.h> -static gdb_probe_t uart_dbg_probe; -static gdb_init_t uart_dbg_init; -static gdb_term_t uart_dbg_term; -static gdb_getc_t uart_dbg_getc; -static gdb_checkc_t uart_dbg_checkc; -static gdb_putc_t uart_dbg_putc; +static gdb_probe_f uart_dbg_probe; +static gdb_init_f uart_dbg_init; +static gdb_term_f uart_dbg_term; +static gdb_getc_f uart_dbg_getc; +static gdb_checkc_f uart_dbg_checkc; +static gdb_putc_f uart_dbg_putc; -GDB_DBGPORT(uart, uart_dbg_probe, uart_dbg_init, uart_dbg_term, uart_dbg_getc, - uart_dbg_checkc, uart_dbg_putc); +GDB_DBGPORT(uart, uart_dbg_probe, uart_dbg_init, uart_dbg_term, + uart_dbg_checkc, uart_dbg_getc, uart_dbg_putc); static struct uart_devinfo uart_dbgport; @@ -70,28 +73,28 @@ } static void -uart_cnterm(void) +uart_dbg_term(void) { uart_term(&uart_dbgport); } static void -uart_cnputc(int c) +uart_dbg_putc(int c) { uart_putc(&uart_dbgport, c); } static int -uart_cncheckc(void) +uart_dbg_checkc(void) { return (uart_poll(&uart_dbgport)); } static int -uart_cngetc(void) +uart_dbg_getc(void) { return (uart_getc(&uart_dbgport)); ==== //depot/projects/gdb/sys/gdb/gdb.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ typedef int gdb_getc_f(void); typedef void gdb_init_f(void); typedef int gdb_probe_f(void); -typedef void gdb_putc_f(void); +typedef void gdb_putc_f(int); typedef void gdb_term_f(void); struct gdb_dbgport {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403110417.i2B4Ht8U076424>