From owner-p4-projects@FreeBSD.ORG  Wed Mar 10 20:17:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0F0016A4D0; Wed, 10 Mar 2004 20:17:55 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B51D816A4CE
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 20:17:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9522B43D2D
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 20:17:55 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B4HtGe076427
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 20:17:55 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B4Ht8U076424
	for perforce@freebsd.org; Wed, 10 Mar 2004 20:17:55 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Wed, 10 Mar 2004 20:17:55 -0800 (PST)
Message-Id: <200403110417.i2B4Ht8U076424@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48670 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Mar 2004 04:17:56 -0000

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 {