From owner-p4-projects@FreeBSD.ORG Fri Nov 3 23:09:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35F6E16A510; Fri, 3 Nov 2006 23:09:12 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0B38A16A50B for ; Fri, 3 Nov 2006 23:09:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6D8E43D80 for ; Fri, 3 Nov 2006 23:09:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA3N96eT020150 for ; Fri, 3 Nov 2006 23:09:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA3N962W020147 for perforce@freebsd.org; Fri, 3 Nov 2006 23:09:06 GMT (envelope-from jb@freebsd.org) Date: Fri, 3 Nov 2006 23:09:06 GMT Message-Id: <200611032309.kA3N962W020147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Nov 2006 23:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=109166 Change 109166 by jb@jb_freebsd8 on 2006/11/03 23:08:19 Reset to match current. Affected files ... .. //depot/projects/dtrace/src/sys/dev/dcons/dcons.h#5 edit .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#6 edit .. //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#5 edit .. //depot/projects/dtrace/src/sys/gdb/gdb_cons.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/dcons/dcons.h#5 (text+ko) ==== @@ -101,7 +101,6 @@ int dcons_checkc(struct dcons_softc *); int dcons_ischar(struct dcons_softc *); void dcons_putc(struct dcons_softc *, int); -void dcons_puts(struct dcons_softc *, char *, int); int dcons_load_buffer(struct dcons_buf *, int, struct dcons_softc *); void dcons_init(struct dcons_buf *, int, struct dcons_softc *); #endif ==== //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#6 (text+ko) ==== @@ -78,7 +78,6 @@ static cn_term_t ofw_cnterm; static cn_getc_t ofw_cngetc; static cn_putc_t ofw_cnputc; -static cn_puts_t ofw_cnputs; CONSOLE_DRIVER(ofw); @@ -290,17 +289,6 @@ } static void -ofw_cnputs(struct consdev *cp, char *p, int num) -{ - int i; - for (i = 0; i < num; i++) { - if (p[i] == '\n') - ofw_cnputc(cp, '\r'); - ofw_cnputc(cp, p[i] & 0xff); - } -} - -static void ofw_cnputc(struct consdev *cp, int c) { char cbuf; ==== //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#5 (text+ko) ==== @@ -55,7 +55,6 @@ static cn_term_t uart_cnterm; static cn_getc_t uart_cngetc; static cn_putc_t uart_cnputc; -static cn_puts_t uart_cnputs; CONSOLE_DRIVER(uart); @@ -110,14 +109,6 @@ } static void -uart_cnputs(struct consdev *cp, char *p, int num) -{ - int i; - for (i = 0; i < num; i++) - uart_putc(cp->cn_arg, p[i] & 0xff); -} - -static void uart_cnputc(struct consdev *cp, int c) { ==== //depot/projects/dtrace/src/sys/gdb/gdb_cons.c#5 (text) ==== @@ -159,18 +159,6 @@ } } -static void -gdb_cnputs(struct consdev *cp, char *p, int num) -{ - int i; - - for (i = 0; i < num; i++) { - if (p[i] == '\n') - gdb_cnputc(cp, '\r'); - gdb_cnputc(cp, p[i] & 0xff); - } -} - CONSOLE_DRIVER(gdb); /*