Date: Fri, 6 Jun 2003 17:25:29 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32694 for review Message-ID: <200306070025.h570PTVk084642@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32694 Change 32694 by marcel@marcel_nfs on 2003/06/06 17:24:34 IFC @32693 Affected files ... .. //depot/projects/ia64/MAINTAINERS#28 integrate .. //depot/projects/ia64/bin/csh/Makefile#7 integrate .. //depot/projects/ia64/etc/inetd.conf#10 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#13 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/ia64/etc/rc.d/network1#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#3 integrate .. //depot/projects/ia64/lib/libform/Makefile#3 integrate .. //depot/projects/ia64/lib/libmenu/Makefile#3 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#15 integrate .. //depot/projects/ia64/lib/libpanel/Makefile#4 integrate .. //depot/projects/ia64/libexec/getty/main.c#4 integrate .. //depot/projects/ia64/sbin/ipf/Makefile#4 integrate .. //depot/projects/ia64/sbin/ipfstat/Makefile#5 integrate .. //depot/projects/ia64/sbin/ipmon/Makefile#5 integrate .. //depot/projects/ia64/sbin/ipnat/Makefile#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#46 integrate .. //depot/projects/ia64/share/man/man4/exca.4#3 integrate .. //depot/projects/ia64/share/man/man4/pccbb.4#3 integrate .. //depot/projects/ia64/share/man/man4/wi.4#21 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#19 integrate .. //depot/projects/ia64/share/mklocale/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#7 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#17 integrate .. //depot/projects/ia64/sys/debugscripts/.gdbinit#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.i386#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/ia64/sys/debugscripts/gdbinit.vinum#1 branch .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/exca/excareg.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#27 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#5 integrate .. //depot/projects/ia64/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/apic_vector.s#8 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#56 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#16 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#49 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#58 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#19 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-iswctype.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-towctrans.c#1 branch .. //depot/projects/ia64/usr.bin/awk/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#28 integrate .. //depot/projects/ia64/usr.bin/less/Makefile.common#2 integrate .. //depot/projects/ia64/usr.bin/truss/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/chkgrp/chkgrp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ipftest/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ipresend/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ipsend/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/iptest/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#12 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#28 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.65 2003/06/05 05:03:01 roberto Exp $ +$FreeBSD: src/MAINTAINERS,v 1.66 2003/06/06 11:30:49 guido Exp $ subsystem login notes ----------------------------- @@ -117,11 +117,11 @@ sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG -sbin/ipf/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipf/Makefile:MAINTAINER= darrenr@freebsd.org sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org -sbin/ipfstat/Makefile:MAINTAINER= guido@freebsd.org -sbin/ipmon/Makefile:MAINTAINER= guido@freebsd.org -sbin/ipnat/Makefile:MAINTAINER= guido@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= darrenr@freebsd.org share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org @@ -162,10 +162,10 @@ usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG -usr.sbin/ipftest/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/ipresend/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/ipsend/Makefile:MAINTAINER= guido@freebsd.org -usr.sbin/iptest/Makefile:MAINTAINER= guido@freebsd.org +usr.sbin/ipftest/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org ==== //depot/projects/ia64/bin/csh/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.31 2003/06/06 13:46:55 kuriyama Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -73,7 +73,7 @@ .endfor csh.1: tcsh.man - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} build-tools: gethost ==== //depot/projects/ia64/etc/inetd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.62 2003/06/06 08:54:29 yar Exp $ # # Internet server configuration database # @@ -17,7 +17,6 @@ #finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -s #finger stream tcp6 nowait/3/10 nobody /usr/libexec/fingerd fingerd -s #exec stream tcp nowait root /usr/libexec/rexecd rexecd -#nntp stream tcp nowait usenet /usr/libexec/nntpd nntpd # # run comsat as root to be able to print partial mailbox contents w/ biff, # or use the safer tty:tty to just print that new mail has been received. @@ -85,7 +84,12 @@ # #imap4 stream tcp nowait root /usr/local/libexec/imapd imapd # +# example entry for the optional nntp server +# +#nntp stream tcp nowait news /usr/local/libexec/nntpd nntpd +# # example entry for the optional uucpd server +# #uucpd stream tcp nowait root /usr/local/libexec/uucpd uucpd # # Return error for all "ident" requests ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.96 2003/06/01 15:37:37 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.97 2003/06/06 22:34:43 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -417,6 +417,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.274 2003/06/01 15:37:37 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.275 2003/06/06 22:34:43 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -479,6 +479,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 @@ -801,6 +803,8 @@ .. ro_RO.ISO8859-2 .. + ru_RU.CP1251 + .. ru_RU.CP866 .. ru_RU.ISO8859-5 ==== //depot/projects/ia64/etc/rc.d/network1#11 (text+ko) ==== @@ -1,6 +1,6 @@ -#!/bin/sh -x +#!/bin/sh # -# $FreeBSD: src/etc/rc.d/network1,v 1.146 2003/04/18 17:51:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.147 2003/06/06 13:00:43 mtm Exp $ # # PROVIDE: network1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.22 2002/06/05 21:30:45 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.23 2003/06/06 13:46:55 kuriyama Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -17,6 +17,6 @@ CLEANFILES= cpp.1 cpp.1: cccp.1 - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.19 2002/06/09 00:03:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.20 2003/06/06 13:46:55 kuriyama Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -18,6 +18,6 @@ CLEANFILES= f77.1 f77.1: g77.1 - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> ==== //depot/projects/ia64/lib/libc/gen/devname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.8 2003/06/05 21:55:57 phk Exp $"); #include <sys/types.h> #include <sys/sysctl.h> @@ -105,10 +105,10 @@ } /* Finally just format it */ - if (minor(dev) > 255) + if (dev == NODEV) + r = "#NODEV"; + else r = "#%c:%d:0x%x"; - else - r = "#%c:%d:0x%d"; snprintf(buf, SPECNAMELEN + 1, r, (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev)); return (buf); ==== //depot/projects/ia64/lib/libform/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libform -# $FreeBSD: src/lib/libform/Makefile,v 1.7 2002/05/21 07:08:30 peter Exp $ +# $FreeBSD: src/lib/libform/Makefile,v 1.8 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -45,7 +45,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=form_cursor.3 pos_form_cursor.3 ==== //depot/projects/ia64/lib/libmenu/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libmenu -# $FreeBSD: src/lib/libmenu/Makefile,v 1.9 2002/05/21 07:08:30 peter Exp $ +# $FreeBSD: src/lib/libmenu/Makefile,v 1.10 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -42,7 +42,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=menu_attributes.3 menu_back.3 menu_attributes.3 menu_fore.3 \ ==== //depot/projects/ia64/lib/libncurses/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncurses/Makefile,v 1.69 2003/04/30 15:49:40 obrien Exp $ +# $FreeBSD: src/lib/libncurses/Makefile,v 1.70 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -410,7 +410,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} .endfor MLINKS+=ncurses.3 curses.3 ==== //depot/projects/ia64/lib/libpanel/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libpanel -# $FreeBSD: src/lib/libpanel/Makefile,v 1.8 2002/05/21 05:41:07 peter Exp $ +# $FreeBSD: src/lib/libpanel/Makefile,v 1.9 2003/06/06 13:46:55 kuriyama Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -32,7 +32,7 @@ CLEANFILES+= panel.3 MAN= panel.3 panel.3: panel.3x - ln -s ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} MLINKS+=panel.3 bottom_panel.3 panel.3 del_panel.3 panel.3 hide_panel.3 \ panel.3 move_panel.3 panel.3 new_panel.3 panel.3 panel_above.3 \ ==== //depot/projects/ia64/libexec/getty/main.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)from: main.c 8.1 (Berkeley) 6/20/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/getty/main.c,v 1.38 2003/01/20 10:33:35 sobomax Exp $"; + "$FreeBSD: src/libexec/getty/main.c,v 1.39 2003/06/06 14:36:41 yar Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -344,6 +344,8 @@ signal(SIGALRM, dingdong); alarm(TO); } + + rval = 0; if (AL) { const char *p = AL; char *q = name; @@ -374,12 +376,20 @@ oflush(); alarm(0); signal(SIGALRM, SIG_DFL); + if (name[0] == '\0') + continue; if (name[0] == '-') { puts("user names may not start with '-'."); continue; } - if (!(upper || lower || digit)) - continue; + if (!(upper || lower || digit)) { + if (AL) { + syslog(LOG_ERR, + "invalid auto-login name: %s", AL); + exit(1); + } else + continue; + } set_flags(2); if (crmod) { tmode.c_iflag |= ICRNL; @@ -564,7 +574,7 @@ } if (c == EOT || c == CTRL('d')) - exit(1); + exit(0); if (c == '\r' || c == '\n' || np >= &name[sizeof name-1]) { putf("\r\n"); break; @@ -590,6 +600,7 @@ else if (np > name) puts(" \r"); prompt(); + digit = lower = upper = 0; np = name; continue; } else if (isdigit(c)) ==== //depot/projects/ia64/sbin/ipf/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipf/Makefile,v 1.12 2002/03/20 09:02:48 darrenr Exp $ +# $FreeBSD: src/sbin/ipf/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -11,6 +11,6 @@ CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter WARNS= 0 -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include <bsd.prog.mk> ==== //depot/projects/ia64/sbin/ipfstat/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.17 2002/03/19 22:51:53 alfred Exp $ +# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.18 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -14,6 +14,6 @@ DPADD= ${LIBNCURSES} ${LIBKVM} LDADD= -lncurses -lkvm -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include <bsd.prog.mk> ==== //depot/projects/ia64/sbin/ipmon/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipmon/Makefile,v 1.12 2003/04/05 10:42:38 darrenr Exp $ +# $FreeBSD: src/sbin/ipmon/Makefile,v 1.13 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -11,6 +11,6 @@ CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter WARNS= 0 -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include <bsd.prog.mk> ==== //depot/projects/ia64/sbin/ipnat/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/ipnat/Makefile,v 1.14 2002/03/20 09:01:48 darrenr Exp $ +# $FreeBSD: src/sbin/ipnat/Makefile,v 1.15 2003/06/06 11:30:49 guido Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man @@ -15,6 +15,6 @@ DPADD= ${LIBKVM} LDADD= -lkvm -MAINTAINER= guido@freebsd.org +MAINTAINER= darrenr@freebsd.org .include <bsd.prog.mk> ==== //depot/projects/ia64/share/man/man4/Makefile#46 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.204 2003/06/03 07:58:39 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.205 2003/06/05 21:12:55 ru Exp $ MAN= aac.4 \ acpi.4 \ @@ -303,6 +303,7 @@ MLINKS+=netintro.4 networking.4 MLINKS+=nge.4 if_nge.4 MLINKS+=oldcard.4 card.4 +MLINKS+=pccbb.4 cbb.4 MLINKS+=pcm.4 snd.4 MLINKS+=pcn.4 if_pcn.4 MLINKS+=pcvt.4 vt.4 ==== //depot/projects/ia64/share/man/man4/exca.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/exca.4,v 1.2 2003/03/02 21:04:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/exca.4,v 1.3 2003/06/05 21:12:55 ru Exp $ .\" .Dd February 23, 2003 .Dt EXCA 4 @@ -36,5 +36,5 @@ module is used to implement the Intel ExCA interface to PC Cards. .Sh SEE ALSO -.Xr cbb 4 , +.Xr pccbb 4 , .Xr pcic 4 ==== //depot/projects/ia64/share/man/man4/pccbb.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.2 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.3 2003/06/05 21:12:55 ru Exp $ .\" .Dd July 9, 2002 .Dt PCCBB 4 @@ -31,7 +31,7 @@ .Nm pccbb .Nd cardbus bridge driver .Sh SYNOPSIS -.Cd device pccbb +.Cd device cbb .Cd device pccard .Cd device cardbus .Sh DESCRIPTION ==== //depot/projects/ia64/share/man/man4/wi.4#21 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.43 2003/05/20 22:09:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.44 2003/06/05 21:12:55 ru Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -313,9 +313,9 @@ .Xr an 4 , .Xr arp 4 , .Xr card 4 , -.Xr cbb 4 , .Xr netintro 4 , .Xr pccard 4 , +.Xr pccbb 4 , .Xr pcic 4 , .Xr ifconfig 8 , .Xr wicontrol 8 ==== //depot/projects/ia64/share/mk/bsd.sys.mk#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.27 2003/06/02 08:13:49 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.28 2003/06/06 16:55:05 obrien Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -8,7 +8,8 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 -CSTD ?= +# Can't use "c99" below due to lack of alloca.S for non-i386 platforms. +CSTD ?= gnu99 .if ${CSTD} != "" . if ${CSTD} == "k&r" CFLAGS += -traditional ==== //depot/projects/ia64/share/mklocale/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.49 2003/06/01 15:51:27 ache Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.50 2003/06/06 22:39:24 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -34,6 +34,7 @@ LATIN2LINKS= cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK LATIN4LINKS= lt_LT LATIN5LINKS= sr_YU uk_UA +CP1251LINKS= ru_RU .SUFFIXES: .src .out @@ -67,6 +68,10 @@ ln -fs ../ru_RU.ISO8859-5/LC_CTYPE \ ${LOCALEDIR}/${link}.ISO8859-5/LC_CTYPE .endfor +.for link in ${CP1251LINKS} + ln -fs ../bg_BG.CP1251/LC_CTYPE \ + ${LOCALEDIR}/${link}.CP1251/LC_CTYPE +.endfor .for link in ${ASCIILINKS} ln -fs ../la_LN.US-ASCII/LC_CTYPE \ ${LOCALEDIR}/${link}.US-ASCII/LC_CTYPE ==== //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#7 (text+ko) ==== @@ -1,21 +1,25 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.12 2002/09/30 20:37:57 peter Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.13 2003/06/06 13:49:51 kuriyama Exp $ -FILES= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -BINDIR= /usr/lib .PATH: ${.CURDIR}/../../../kern -CLEANFILES=${FILES} +CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} +all: ${OBJS} kgzldr.o + kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} -.include <bsd.prog.mk> +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + kgzldr.o ${DESTDIR}${LIBDIR} + +.include <bsd.lib.mk> ==== //depot/projects/ia64/sys/ddb/db_ps.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.41 2003/04/10 17:35:43 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.44 2003/06/06 20:28:11 julian Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -43,8 +43,8 @@ #include <vm/pmap.h> #include <ddb/ddb.h> -static void -dumpthread(volatile struct proc *p, volatile struct thread *td); + +static void dumpthread(volatile struct proc *p, volatile struct thread *td); void db_ps(dummy1, dummy2, dummy3, dummy4) @@ -72,7 +72,7 @@ /* * XXX just take 20 for now... */ - if (nl++ == 20) { + if (nl++ >= 20) { int c; db_printf("--More--"); @@ -108,7 +108,7 @@ if (P_SHOULDSTOP(p)) state = "stop"; else - state = "norm"; + state = ""; break; case PRS_NEW: state = "new "; @@ -120,7 +120,7 @@ state = "Unkn"; break; } - db_printf("%5d %8p %8p %4d %5d %5d %07x %-4s", + db_printf("%5d %8p %8p %4d %5d %5d %07x %s", p->p_pid, (volatile void *)p, (void *)p->p_uarea, p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, @@ -129,6 +129,7 @@ db_printf("(threaded) %s\n", p->p_comm); FOREACH_THREAD_IN_PROC(p, td) { dumpthread(p, td); + nl++; } /* PROC_UNLOCK(p); */ @@ -138,6 +139,7 @@ } /* sx_sunlock(&allproc_lock); */ } + static void dumpthread(volatile struct proc *p, volatile struct thread *td) { @@ -145,10 +147,16 @@ db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); if (TD_ON_SLEEPQ(td)) { if (td->td_flags & TDF_CVWAITQ) - db_printf("[CVQ "); + if (TD_IS_SLEEPING(td)) + db_printf("[CV]"); + else + db_printf("[CVQ"); else - db_printf("[SLPQ "); - db_printf(" %6s %8p]", td->td_wmesg, + if (TD_IS_SLEEPING(td)) + db_printf("[SLP]"); + else + db_printf("[SLPQ"); + db_printf("%s %p]", td->td_wmesg, (void *)td->td_wchan); } switch (td->td_state) { @@ -158,9 +166,11 @@ td->td_lockname, (void *)td->td_blocked); } +#if 0 /* covered above */ if (TD_IS_SLEEPING(td)) { db_printf("[SLP]"); } +#endif if (TD_IS_SWAPPED(td)) { db_printf("[SWAP]"); } @@ -180,8 +190,11 @@ case TDS_RUNNING: db_printf("[CPU %d]", td->td_oncpu); break; + case TDS_INACTIVE: + db_printf("[INACTIVE]"); + break; default: - panic("unknown thread state"); + db_printf("[UNK: %#x]", td->td_state); } if (p->p_flag & P_THREADED) { if (td->td_kse) ==== //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#7 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#30 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#32 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.12 2003/05/03 23:55:38 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.14 2003/06/06 23:48:18 gibbs Exp $ */ #ifdef __linux__ @@ -67,8 +67,7 @@ static ahc_device_setup_t ahc_aic7770_EISA_setup;; static ahc_device_setup_t ahc_aic7770_setup; - -struct aic7770_identity aic7770_ident_table [] = +struct aic7770_identity aic7770_ident_table[] = { { ID_AHA_274x, @@ -83,6 +82,12 @@ ahc_aic7770_VL_setup }, { + ID_AHA_284x, + 0xFFFFFFFE, + "Adaptec 284X SCSI adapter (BIOS Disabled)", + ahc_aic7770_VL_setup + }, + { ID_OLV_274x, 0xFFFFFFFF, "Adaptec (Olivetti OEM) 274X SCSI adapter", @@ -154,7 +159,7 @@ ahc->bus_suspend = aic7770_suspend; ahc->bus_resume = aic7770_resume; - error = ahc_reset(ahc); + error = ahc_reset(ahc, /*reinit*/FALSE); if (error != 0) return (error); ==== //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#13 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic79xx.c,v 1.16 2003/05/26 21:43:29 gibbs Exp $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.17 2003/05/30 02:15:15 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.20 2003/06/06 23:53:39 gibbs Exp $ */ #ifdef __linux__ @@ -1880,21 +1880,32 @@ tinfo->goal.ppr_options = 0; ahd_qinfifo_requeue_tail(ahd, scb); printerror = 0; - } else if ((ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) - || ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)) + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) && ppr_busfree == 0) { /* - * Negotiation Rejected. Go-async and + * Negotiation Rejected. Go-narrow and * retry command. */ #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) - printf("Negotiation rejected busfree.\n"); + printf("WDTR negotiation rejected busfree.\n"); #endif ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHD_TRANS_CUR|AHD_TRANS_GOAL, /*paused*/TRUE); + ahd_qinfifo_requeue_tail(ahd, scb); + printerror = 0; + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE) + && ppr_busfree == 0) { + /* + * Negotiation Rejected. Go-async and + * retry command. + */ +#ifdef AHD_DEBUG + if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) + printf("SDTR negotiation rejected busfree.\n"); +#endif ahd_set_syncrate(ahd, &devinfo, /*period*/0, /*offset*/0, /*ppr_options*/0, @@ -2188,7 +2199,7 @@ ahd_outb(ahd, LQOMODE1, 0); ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); simode1 = ahd_inb(ahd, SIMODE1); - ahd_outb(ahd, SIMODE1, ENBUSFREE); + ahd_outb(ahd, SIMODE1, simode1 & ENBUSFREE); ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) | STEP); stepping = TRUE; } @@ -3232,6 +3243,7 @@ * may change. */ period = tinfo->goal.period; + offset = tinfo->goal.offset; ppr_options = tinfo->goal.ppr_options; /* Target initiated PPR is not allowed in the SCSI spec */ if (devinfo->role == ROLE_TARGET) @@ -3239,7 +3251,7 @@ ahd_devlimited_syncrate(ahd, tinfo, &period, &ppr_options, devinfo->role); dowide = tinfo->curr.width != tinfo->goal.width; - dosync = tinfo->curr.period != period; + dosync = tinfo->curr.offset != offset || tinfo->curr.period != period; /* * Only use PPR if we have options that need it, even if the device * claims to support it. There might be an expander in the way @@ -3249,7 +3261,7 @@ if (!dowide && !dosync && !doppr) { dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT; - dosync = tinfo->goal.period != 0; + dosync = tinfo->goal.offset != 0; } if (!dowide && !dosync && !doppr) { @@ -3983,22 +3995,30 @@ response = TRUE; sending_reply = TRUE; } + /* + * After a wide message, we are async, but + * some devices don't seem to honor this portion + * of the spec. Force a renegotiation of the + * sync component of our transfer agreement even + * if our goal is async. By updating our width + * after forcing the negotiation, we avoid + * renegotiating for width. + */ + ahd_update_neg_request(ahd, devinfo, tstate, + tinfo, AHD_NEG_ALWAYS); ahd_set_width(ahd, devinfo, bus_width, AHD_TRANS_ACTIVE|AHD_TRANS_GOAL, /*paused*/TRUE); - /* After a wide message, we are async */ - ahd_set_syncrate(ahd, devinfo, /*period*/0, - /*offset*/0, /*ppr_options*/0, - AHD_TRANS_ACTIVE, /*paused*/TRUE); if (sending_reply == FALSE && reject == FALSE) { - if (tinfo->goal.offset) { - ahd->msgout_index = 0; - ahd->msgout_len = 0; - ahd_build_transfer_msg(ahd, devinfo); - ahd->msgout_index = 0; - response = TRUE; - } + /* + * We will always have an SDTR to send. + */ + ahd->msgout_index = 0; + ahd->msgout_len = 0; + ahd_build_transfer_msg(ahd, devinfo); + ahd->msgout_index = 0; + response = TRUE; } done = MSGLOOP_MSGCOMPLETE; break; @@ -5000,15 +5020,20 @@ ahd_timer_stop(&ahd->stat_timer); /* This will reset most registers to 0, but not all */ - ahd_reset(ahd); + ahd_reset(ahd, /*reinit*/FALSE); } /* * Reset the controller and record some information about it - * that is only available just after a reset. + * that is only available just after a reset. If "reinit" is + * non-zero, this reset occured after initial configuration + * and the caller requests that the chip be fully reinitialized + * to a runable state. Chip interrupts are *not* enabled after + * a reinitialization. The caller must enable interrupts via + * ahd_intr_enable(). */ int -ahd_reset(struct ahd_softc *ahd) +ahd_reset(struct ahd_softc *ahd, int reinit) { u_int sxfrctl1; int wait; @@ -5101,7 +5126,7 @@ * If a recovery action has forced a chip reset, * re-initialize the chip to our liking. */ - if (ahd->init_level > 0) + if (reinit != 0) ahd_chip_init(ahd); return (0); @@ -6703,141 +6728,24 @@ int ahd_suspend(struct ahd_softc *ahd) { -#if 0 - uint8_t *ptr; - int i; ahd_pause_and_flushwork(ahd); - if (LIST_FIRST(&ahd->pending_scbs) != NULL) + if (LIST_FIRST(&ahd->pending_scbs) != NULL) { + ahd_unpause(ahd); return (EBUSY); - -#if AHD_TARGET_MODE - /* - * XXX What about ATIOs that have not yet been serviced? - * Perhaps we should just refuse to be suspended if we - * are acting in a target role. - */ - if (ahd->pending_device != NULL) - return (EBUSY); -#endif - - /* Save volatile registers */ - ahd->suspend_state.channel[0].scsiseq = ahd_inb(ahd, SCSISEQ0); - ahd->suspend_state.channel[0].sxfrctl0 = ahd_inb(ahd, SXFRCTL0); - ahd->suspend_state.channel[0].sxfrctl1 = ahd_inb(ahd, SXFRCTL1); - ahd->suspend_state.channel[0].simode0 = ahd_inb(ahd, SIMODE0); - ahd->suspend_state.channel[0].simode1 = ahd_inb(ahd, SIMODE1); - ahd->suspend_state.channel[0].seltimer = ahd_inb(ahd, SELTIMER); - ahd->suspend_state.channel[0].seqctl = ahd_inb(ahd, SEQCTL0); - ahd->suspend_state.dscommand0 = ahd_inb(ahd, DSCOMMAND0); - ahd->suspend_state.dspcistatus = ahd_inb(ahd, DSPCISTATUS); - - if ((ahd->features & AHD_DT) != 0) { - u_int sfunct; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306070025.h570PTVk084642>