From owner-cvs-src@FreeBSD.ORG Tue May 30 05:58:25 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D29516A424; Tue, 30 May 2006 05:58:25 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from cantva.canterbury.ac.nz (cantva.canterbury.ac.nz [132.181.2.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BFDF43D4C; Tue, 30 May 2006 05:58:23 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from CONVERSION-DAEMON.it.canterbury.ac.nz by it.canterbury.ac.nz (PMDF V6.2-X27 #31178) id <01M31IRJZ89S9UZOYB@it.canterbury.ac.nz>; Tue, 30 May 2006 17:58:21 +1200 (NEW ZEALAND STANDARD TIME) Received: from [192.168.1.10] ([222.155.31.185]) by it.canterbury.ac.nz (PMDF V6.2-X27 #31178) with ESMTPA id <01M31IRIZA5W9UY8G2@it.canterbury.ac.nz>; Tue, 30 May 2006 17:58:21 +1200 (NEW ZEALAND STANDARD TIME) Date: Tue, 30 May 2006 17:58:19 +1200 From: Andrew Turner In-reply-to: <10582.1148668175@critter.freebsd.dk> To: Poul-Henning Kamp Message-id: <447BDEFB.9090302@fubar.geek.nz> MIME-version: 1.0 Content-type: multipart/mixed; boundary="Boundary_(ID_uumUDU02hx4x+/xfROzXcg)" User-Agent: Thunderbird 1.5.0.2 (X11/20060425) References: <10582.1148668175@critter.freebsd.dk> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/ofw ofw_console.c src/sys/dev/zs zs.c src/sys/ia64/ia64 ssc.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 05:58:25 -0000 This is a multi-part message in MIME format. --Boundary_(ID_uumUDU02hx4x+/xfROzXcg) Content-type: text/plain; charset=ISO-8859-1; format=flowed Content-transfer-encoding: 7bit Poul-Henning Kamp wrote: > NB: this may actually not compile. The attached patch makes it compile for me on PowerPC. It locks up when loading the console currently so I can't test it. Andrew > In message <200605261825.k4QIPYEB008871@repoman.freebsd.org>, Poul-Henning Kamp > writes: > >> phk 2006-05-26 18:25:34 UTC >> >> FreeBSD src repository >> >> Modified files: >> sys/dev/ofw ofw_console.c >> sys/dev/zs zs.c >> sys/ia64/ia64 ssc.c >> Log: >> Update to new console api. >> >> Revision Changes Path >> 1.33 +11 -28 src/sys/dev/ofw/ofw_console.c >> 1.35 +1 -13 src/sys/dev/zs/zs.c >> 1.27 +10 -16 src/sys/ia64/ia64/ssc.c >> >> > > --Boundary_(ID_uumUDU02hx4x+/xfROzXcg) Content-type: text/plain; name="patch_cons" Content-transfer-encoding: 7bit Content-disposition: inline; filename="patch_cons" Index: ofw_console.c =================================================================== RCS file: /cvsroot/src/sys/dev/ofw/ofw_console.c,v retrieving revision 1.33 diff -u -r1.33 ofw_console.c --- ofw_console.c 26 May 2006 18:25:34 -0000 1.33 +++ ofw_console.c 29 May 2006 09:58:22 -0000 @@ -79,8 +79,7 @@ static cn_getc_t ofw_cngetc; static cn_putc_t ofw_cnputc; -CONSOLE_DRIVER(ofw) - ofw_cons_checkc, ofw_cons_putc, NULL); +CONSOLE_DRIVER(ofw); static void cn_drvinit(void *unused) @@ -227,7 +226,7 @@ tp = (struct tty *)v; - while ((c = ofw_cons_checkc(NULL)) != -1) { + while ((c = ofw_cngetc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) { ttyld_rint(tp, c); } @@ -237,7 +236,7 @@ } static void -ofw_cons_probe(struct consdev *cp) +ofw_cnprobe(struct consdev *cp) { int chosen; @@ -269,7 +268,7 @@ } static void -ofw_cneterm(struct consdev *cp) +ofw_cnterm(struct consdev *cp) { } --Boundary_(ID_uumUDU02hx4x+/xfROzXcg)--