From owner-freebsd-bugs Sun Apr 18 21:22:29 1999 Delivered-To: freebsd-bugs@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 561E314E77 for ; Sun, 18 Apr 1999 21:22:27 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id VAA75585; Sun, 18 Apr 1999 21:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from ftp.dns.ne.jp (ftp.dns.ne.jp [210.155.3.5]) by hub.freebsd.org (Postfix) with ESMTP id E3E8514BD2 for ; Sun, 18 Apr 1999 21:20:22 -0700 (PDT) (envelope-from tanimura@sakuramail.com) Received: from silver.carrots (yksk0142.ppp.infoweb.ne.jp [210.131.91.106]) by ftp.dns.ne.jp (8.9.2/8.8.5) with ESMTP id NAA14804 for ; Mon, 19 Apr 1999 13:17:45 +0900 (JST) Received: (from tanimura@localhost) by silver.carrots (8.9.3+3.1W/3.7W) id NAA59278; Mon, 19 Apr 1999 13:17:52 +0900 (JST) Message-Id: <199904190417.NAA14804@ftp.dns.ne.jp> Date: Mon, 19 Apr 1999 13:17:52 +0900 (JST) From: tanimura@sakuramail.com Reply-To: tanimura@naklab.dnj.ynu.ac.jp To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: i386/11207: sys/i386/isa/rp.c: fixed breaking and warnings on making kernel Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11207 >Category: i386 >Synopsis: sys/i386/isa/rp.c: fixed breaking and warnings on making kernel >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Apr 18 21:20:02 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Seigo TANIMURA >Release: FreeBSD 4.0-CURRENT i386 >Organization: Nakagawa Lab, Div of Electronic Eng & CS, Faculty of Eng, Yokohama National Univ, JPN >Environment: FreeBSD silver 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Sun Apr 18 22:27:47 JST 1999 tanimura@silver:/export/silver/tanimura/work/uart16550/sys/compile/SILVER i386 >Description: The change against sys/i386/isa/rp.c on merging new-bus elminated the beginning of a comment to break making a kernel, and rp.c makes some warning under egcs. >How-To-Repeat: >Fix: Please apply the following patch. --- v --- cut here --- v --- --- sys.org/i386/isa/rp.c Sun Apr 18 03:03:21 1999 +++ sys/i386/isa/rp.c Sun Apr 18 18:02:48 1999 @@ -1279,8 +1279,9 @@ } } +/* printf("COOL!! Device is found!!\n"); for(rpmajor=0;rpmajord_open == rpopen) printf("From %d entries: Found entry at major = %d\n",nchrdev,rpmajor); */ return(1); @@ -1553,10 +1554,10 @@ tp = rp->rp_tty; while(rp->rp_disable_writes) { rp->rp_waiting = 1; - if(error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH, - "rp_write", 0)) { + error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH, + "rp_write", 0); + if (error) return(error); - } } error = (*linesw[tp->t_line].l_write)(tp, uio, flag); @@ -1658,9 +1659,11 @@ | (dt->c_cflag & ~lt->c_cflag); dt->c_lflag = (tp->t_lflag & lt->c_lflag) | (dt->c_lflag & ~lt->c_lflag); - for(cc = 0; cc < NCCS; ++cc) - if(lt->c_cc[cc] = tp->t_cc[cc]) + for(cc = 0; cc < NCCS; ++cc) { + lt->c_cc[cc] = tp->t_cc[cc]; + if (lt->c_cc[cc] != 0) dt->c_cc[cc] = tp->t_cc[cc]; + } if(lt->c_ispeed != 0) dt->c_ispeed = tp->t_ispeed; if(lt->c_ospeed != 0) @@ -1776,15 +1779,29 @@ } static struct speedtab baud_table[] = { - B0, 0, B50, BRD50, B75, BRD75, - B110, BRD110, B134, BRD134, B150, BRD150, - B200, BRD200, B300, BRD300, B600, BRD600, - B1200, BRD1200, B1800, BRD1800, B2400, BRD2400, - B4800, BRD4800, B9600, BRD9600, B19200, BRD19200, - B38400, BRD38400, B7200, BRD7200, B14400, BRD14400, - B57600, BRD57600, B76800, BRD76800, - B115200, BRD115200, B230400, BRD230400, - -1, -1 + { B0, 0 }, + { B50, BRD50 }, + { B75, BRD75 }, + { B110, BRD110 }, + { B134, BRD134 }, + { B150, BRD150 }, + { B200, BRD200 }, + { B300, BRD300 }, + { B600, BRD600 }, + { B1200, BRD1200 }, + { B1800, BRD1800 }, + { B2400, BRD2400 }, + { B4800, BRD4800 }, + { B7200, BRD7200 }, + { B9600, BRD9600 }, + { B14400, BRD14400 }, + { B19200, BRD19200 }, + { B38400, BRD38400 }, + { B57600, BRD57600 }, + { B76800, BRD76800 }, + { B115200, BRD115200 }, + { B230400, BRD230400 }, + { -1, -1 }, }; static int --- ^ --- cut here --- ^ --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message