PERFORCE change 52017 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Apr 30 19:23:52 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52017
Change 52017 by marcel at marcel_nfs on 2004/04/30 19:22:53
IFC @52014
Affected files ...
.. //depot/projects/gdb/contrib/patch/COPYING#2 delete
.. //depot/projects/gdb/contrib/patch/ChangeLog#2 delete
.. //depot/projects/gdb/contrib/patch/FREEBSD-upgrade#2 delete
.. //depot/projects/gdb/contrib/patch/INSTALL#2 delete
.. //depot/projects/gdb/contrib/patch/Makefile.in#2 delete
.. //depot/projects/gdb/contrib/patch/NEWS#2 delete
.. //depot/projects/gdb/contrib/patch/README#2 delete
.. //depot/projects/gdb/contrib/patch/acconfig.h#2 delete
.. //depot/projects/gdb/contrib/patch/addext.c#2 delete
.. //depot/projects/gdb/contrib/patch/argmatch.c#2 delete
.. //depot/projects/gdb/contrib/patch/argmatch.h#2 delete
.. //depot/projects/gdb/contrib/patch/backupfile.c#2 delete
.. //depot/projects/gdb/contrib/patch/backupfile.h#2 delete
.. //depot/projects/gdb/contrib/patch/basename.c#2 delete
.. //depot/projects/gdb/contrib/patch/common.h#2 delete
.. //depot/projects/gdb/contrib/patch/config.hin#2 delete
.. //depot/projects/gdb/contrib/patch/configure#2 delete
.. //depot/projects/gdb/contrib/patch/configure.in#2 delete
.. //depot/projects/gdb/contrib/patch/getopt.c#2 delete
.. //depot/projects/gdb/contrib/patch/getopt.h#2 delete
.. //depot/projects/gdb/contrib/patch/getopt1.c#2 delete
.. //depot/projects/gdb/contrib/patch/inp.c#2 delete
.. //depot/projects/gdb/contrib/patch/inp.h#2 delete
.. //depot/projects/gdb/contrib/patch/install-sh#2 delete
.. //depot/projects/gdb/contrib/patch/maketime.c#2 delete
.. //depot/projects/gdb/contrib/patch/maketime.h#2 delete
.. //depot/projects/gdb/contrib/patch/partime.c#2 delete
.. //depot/projects/gdb/contrib/patch/partime.h#2 delete
.. //depot/projects/gdb/contrib/patch/patch.1#2 delete
.. //depot/projects/gdb/contrib/patch/patch.c#2 delete
.. //depot/projects/gdb/contrib/patch/pch.c#2 delete
.. //depot/projects/gdb/contrib/patch/pch.h#2 delete
.. //depot/projects/gdb/contrib/patch/quotearg.c#2 delete
.. //depot/projects/gdb/contrib/patch/quotearg.h#2 delete
.. //depot/projects/gdb/contrib/patch/util.c#2 delete
.. //depot/projects/gdb/contrib/patch/util.h#2 delete
.. //depot/projects/gdb/contrib/patch/version.c#2 delete
.. //depot/projects/gdb/contrib/patch/version.h#2 delete
.. //depot/projects/gdb/etc/mtree/BSD.include.dist#4 integrate
.. //depot/projects/gdb/include/Makefile#4 integrate
.. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#9 integrate
.. //depot/projects/gdb/release/Makefile#4 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate
.. //depot/projects/gdb/sbin/ggate/Makefile#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#1 branch
.. //depot/projects/gdb/sbin/ggate/ggated/Makefile#1 branch
.. //depot/projects/gdb/sbin/ggate/ggated/ggated.8#1 branch
.. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatel/Makefile#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#1 branch
.. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.c#1 branch
.. //depot/projects/gdb/sbin/ggate/shared/ggate.c#1 branch
.. //depot/projects/gdb/sbin/ggate/shared/ggate.h#1 branch
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#10 integrate
.. //depot/projects/gdb/sbin/route/route.c#4 integrate
.. //depot/projects/gdb/share/man/man4/sio.4#2 integrate
.. //depot/projects/gdb/share/man/man7/release.7#3 integrate
.. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/gdb/sys/conf/NOTES#18 integrate
.. //depot/projects/gdb/sys/conf/files#20 integrate
.. //depot/projects/gdb/sys/conf/files.sparc64#4 integrate
.. //depot/projects/gdb/sys/conf/options#17 integrate
.. //depot/projects/gdb/sys/conf/options.sparc64#2 integrate
.. //depot/projects/gdb/sys/dev/asr/asr.c#5 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-all.h#6 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-disk.h#3 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#8 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-pci.c#8 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/gdb/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/gdb/sys/dev/ata/atapi-fd.h#3 integrate
.. //depot/projects/gdb/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/gdb/sys/dev/sio/sio.c#8 integrate
.. //depot/projects/gdb/sys/dev/sio/sio_ebus.c#2 delete
.. //depot/projects/gdb/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/gdb/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/gdb/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/gdb/sys/kern/link_elf_obj.c#1 branch
.. //depot/projects/gdb/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/gdb/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/gdb/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/gdb/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/gdb/sys/sparc64/include/nexusvar.h#2 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/gdb/usr.bin/du/du.c#2 integrate
Differences ...
==== //depot/projects/gdb/etc/mtree/BSD.include.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.80 2004/02/25 02:51:37 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.81 2004/04/30 16:21:39 pjd Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -78,6 +78,10 @@
..
..
geom
+ concat
+ ..
+ gate
+ ..
..
gnu
posix
==== //depot/projects/gdb/include/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.211 2004/02/28 21:50:48 mlaier Exp $
+# $FreeBSD: src/include/Makefile,v 1.212 2004/04/30 16:23:08 pjd Exp $
#
# Doing a "make install" builds /usr/include.
@@ -34,8 +34,9 @@
LSUBDIRS= cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \
dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \
fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
- fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs isofs/cd9660 \
- netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
+ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \
+ geom/concat geom/gate \
+ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm security/mac_biba security/mac_bsdextended \
security/mac_lomac security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.10 2004/04/29 05:19:42 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.11 2004/04/30 01:31:20 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -487,6 +487,13 @@
archive_read_extract_hard_link(struct archive *a, struct archive_entry *entry,
int flags)
{
+ int r;
+ const char *pathname;
+ const char *linkname;
+
+ pathname = archive_entry_pathname(entry);
+ linkname = archive_entry_hardlink(entry);
+
/*
* XXX Should we suppress the unlink here unless
* ARCHIVE_EXTRACT_UNLINK? That would make the
@@ -497,11 +504,20 @@
/* Just remove any pre-existing file with this name. */
if (!(flags & ARCHIVE_EXTRACT_NO_OVERWRITE))
- unlink(archive_entry_pathname(entry));
+ unlink(pathname);
+
+ r = link(linkname, pathname);
+
+ if (r != 0) {
+ /* Might be a non-existent parent dir; try fixing that. */
+ mkdirpath(a, pathname);
+ r = link(linkname, pathname);
+ }
- if (link(archive_entry_hardlink(entry),
- archive_entry_pathname(entry))) {
- archive_set_error(a, errno, "Can't restore hardlink");
+ if (r != 0) {
+ /* XXX Better error message here XXX */
+ archive_set_error(a, errno,
+ "Can't restore hardlink to '%s'", linkname);
return (ARCHIVE_WARN);
}
@@ -518,6 +534,13 @@
archive_read_extract_symbolic_link(struct archive *a,
struct archive_entry *entry, int flags)
{
+ int r;
+ const char *pathname;
+ const char *linkname;
+
+ pathname = archive_entry_pathname(entry);
+ linkname = archive_entry_symlink(entry);
+
/*
* XXX Should we suppress the unlink here unless
* ARCHIVE_EXTRACT_UNLINK? That would make the
@@ -528,13 +551,20 @@
/* Just remove any pre-existing file with this name. */
if (!(flags & ARCHIVE_EXTRACT_NO_OVERWRITE))
- unlink(archive_entry_pathname(entry));
+ unlink(pathname);
+
+ r = symlink(linkname, pathname);
+
+ if (r != 0) {
+ /* Might be a non-existent parent dir; try fixing that. */
+ mkdirpath(a, pathname);
+ r = symlink(linkname, pathname);
+ }
- if (symlink(archive_entry_symlink(entry),
- archive_entry_pathname(entry))) {
+ if (r != 0) {
/* XXX Better error message here XXX */
- archive_set_error(a, errno, "Can't restore symlink to '%s'",
- archive_entry_symlink(entry));
+ archive_set_error(a, errno,
+ "Can't restore symlink to '%s'", linkname);
return (ARCHIVE_WARN);
}
==== //depot/projects/gdb/release/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.842 2004/03/25 20:37:59 jhb Exp $
+# $FreeBSD: src/release/Makefile,v 1.843 2004/04/30 13:52:09 kensmith Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -115,6 +115,12 @@
RELEASEPORTSMODULE= ${MINIMALDOCPORTS}
.endif
+# Make changing names of disc1/disc2 CD's possible.
+DISC1_LABEL?= fbsd_miniinst
+DISC1_NAME?= miniinst
+DISC2_LABEL?= fbsd_livefs
+DISC2_NAME?= disc2
+
# Helper variable
.if defined(NOPORTS)
.if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES"
@@ -416,6 +422,10 @@
BOOT_CONFIG \
BUILDNAME \
CD_EXTRA_BITS \
+ DISC1_LABEL \
+ DISC1_NAME \
+ DISC2_LABEL \
+ DISC2_NAME \
DISTRIBUTIONS \
DOC_LANG \
DOMINIMALDOCPORTS \
@@ -925,11 +935,11 @@
${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT}
.endif
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
- fbsd_miniinst \
- ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}
+ ${DISC1_LABEL} \
+ ${CD}/${BUILDNAME}-${TARGET}-${DISC1_NAME}.iso ${CD_DISC1}
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
- fbsd_livefs \
- ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}
+ ${DISC2_LABEL} \
+ ${CD}/${BUILDNAME}-${TARGET}-${DISC2_NAME}.iso ${CD_DISC2}
.if defined(CD_EXTRA_BITS)
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
fbsd_boot \
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.721 2004/04/24 17:30:32 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.722 2004/04/30 11:52:34 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -220,9 +220,16 @@
<para>The &man.getvfsent.3; API has been removed.</para>
+ <para>&man.jail.8; now supports use of raw sockets from within a jail.
+ This feature is disabled by default, and controlled using the
+ <varname>security.jail.allow_raw_sockets</varname> sysctl.</para>
+
<para arch="i386">The loran (Loran-C receiver) driver has been removed due to
breakage and lack of maintainership.</para>
+ <para>A bug in &man.mmap.2; that pages marked as <literal>PROT_NONE</literal>
+ may become readable under certain circumstances, has been fixed. &merged;</para>
+
<para>The raid(4), RAIDframe disk driver from NetBSD has been removed.
This is currently non-functional, and would require some amount of work
to make it work under the &man.geom.4; API in 5-CURRENT.</para>
@@ -467,6 +474,10 @@
support for the TCP-MD5 class of security associations.
&merged;</para>
+ <para>The TCP connection reset handling has been improved to
+ make several reset attacks as difficult as possible while
+ maintaining compatibility with the widest range of TCP stacks.</para>
+
<para>The implementation of RFC 1948 has been improved.
The time offset component of an ISN now includes random positive
increments between clock ticks so that ISNs will always
@@ -720,7 +731,8 @@
accepts an encrypted password on a file descriptor. &merged;</para>
<para>A bug in &man.rarpd.8; that prevents it from working properly
- when a interface has more than one IP address has been fixed.</para>
+ when a interface has more than one IP address has been fixed.
+ &merged;</para>
<para>The configuration files used by the &man.resolver.3; now
support the <literal>timeout:</literal> and
@@ -828,6 +840,10 @@
<para><application>libpcap</application> has been updated from
version 0.7.1 to version 0.8.3.</para>
+ <para><application>lukemftp</application>
+ has been updated from a snapshot as of
+ November 3, 2003 to one as of April 26, 2004.</para>
+
<para><application>OpenPAM</application> has been updated from the
Dogwood release to the Eelgrass release.</para>
==== //depot/projects/gdb/sbin/ifconfig/ifconfig.c#10 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.103 2004/04/13 11:23:12 luigi Exp $";
+ "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.104 2004/04/30 22:34:12 ambrisko Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -417,7 +417,7 @@
{
int c;
int all, namesonly, downonly, uponly;
- int need_nl = 0;
+ int need_nl = 0, count = 0;
const struct afswtch *afp = 0;
int addrcount, ifindex;
struct if_msghdr *ifm, *nextifm;
@@ -543,6 +543,7 @@
afp = NULL; /* not a family, NULL */
}
+retry:
mib[0] = CTL_NET;
mib[1] = PF_ROUTE;
mib[2] = 0;
@@ -558,8 +559,15 @@
errx(1, "iflist-sysctl-estimate");
if ((buf = malloc(needed)) == NULL)
errx(1, "malloc");
- if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+ if (errno == ENOMEM && count++ < 10) {
+ warnx("Routing table grew, retrying");
+ free(buf);
+ sleep(1);
+ goto retry;
+ }
errx(1, "actual retrieval of interface table");
+ }
lim = buf + needed;
next = buf;
==== //depot/projects/gdb/sbin/route/route.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.72 2004/04/13 11:23:13 luigi Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.73 2004/04/30 22:34:12 ambrisko Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -201,7 +201,7 @@
char *argv[];
{
size_t needed;
- int mib[6], rlen, seqno;
+ int mib[6], rlen, seqno, count = 0;
char *buf, *next, *lim;
struct rt_msghdr *rtm;
@@ -232,6 +232,7 @@
} else
bad: usage(*argv);
}
+retry:
mib[0] = CTL_NET;
mib[1] = PF_ROUTE;
mib[2] = 0; /* protocol */
@@ -242,8 +243,15 @@
err(EX_OSERR, "route-sysctl-estimate");
if ((buf = malloc(needed)) == NULL)
errx(EX_OSERR, "malloc failed");
- if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+ if (errno == ENOMEM && count++ < 10) {
+ warnx("Routing table grew, retrying");
+ sleep(1);
+ free(buf);
+ goto retry;
+ }
err(EX_OSERR, "route-sysctl-get");
+ }
lim = buf + needed;
if (verbose)
(void) printf("Examining routing table from sysctl\n");
@@ -268,6 +276,8 @@
if (rlen < (int)rtm->rtm_msglen) {
warn("write to routing socket");
(void) printf("got only %d for rlen\n", rlen);
+ free(buf);
+ goto retry;
break;
}
seqno++;
@@ -1105,9 +1115,10 @@
{
size_t needed;
int mib[6];
- char *buf, *lim, *next;
+ char *buf, *lim, *next, count = 0;
struct rt_msghdr *rtm;
+retry2:
mib[0] = CTL_NET;
mib[1] = PF_ROUTE;
mib[2] = 0; /* protocol */
@@ -1118,8 +1129,15 @@
err(EX_OSERR, "route-sysctl-estimate");
if ((buf = malloc(needed)) == NULL)
errx(EX_OSERR, "malloc failed");
- if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+ if (errno == ENOMEM && count++ < 10) {
+ warnx("Routing table grew, retrying");
+ sleep(1);
+ free(buf);
+ goto retry2;
+ }
err(EX_OSERR, "actual retrieval of interface table");
+ }
lim = buf + needed;
for (next = buf; next < lim; next += rtm->rtm_msglen) {
rtm = (struct rt_msghdr *)next;
==== //depot/projects/gdb/share/man/man4/sio.4#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91
.\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD: src/share/man/man4/sio.4,v 1.50 2003/06/28 23:53:37 ru Exp $
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $
.\"
.Dd July 10, 2002
.Dt SIO 4
@@ -178,6 +178,8 @@
PPS timestamping on CTS instead of DCD
.It 0x20000
device is assumed to use a 16650A-type (extended FIFO) chip
+.It 0x400000
+If no comconsole found then mark as a comconsole
.El
.Pp
Minor numbering:
==== //depot/projects/gdb/share/man/man7/release.7#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/man7/release.7,v 1.35 2004/01/28 21:07:36 jhb Exp $
+.\" $FreeBSD: src/share/man/man7/release.7,v 1.36 2004/04/30 13:52:09 kensmith Exp $
.\"
.Dd March 12, 2002
.Dt RELEASE 7
@@ -283,6 +283,22 @@
.It Va MAKE_ISOS
If defined, bootable ISO CD-ROM images will be created from the
contents of the CD-ROM stage directory.
+.It Va DISC1_LABEL
+The label used for the CD-ROM created from the disc1 contents, the
+default label will be
+.Dq fbsd_miniinst .
+.It Va DISC1_NAME
+The name used as part of the ISO file name for the CD-ROM created from
+the disc1 contents, the default will be
+.Dq miniinst .
+.It Va DISC2_LABEL
+The label used for the CD-ROM created from the disc2 contents, the
+default label will be
+.Dq fbsd_livefs .
+.It Va DISC2_NAME
+The name used as part of the ISO file name for the CD-ROM created from
+the disc2 contents, the default will be
+.Dq disc2 .
.It Va NOCDROM
If defined, the CD-ROM stage directories will not be created.
.It Va NODOC
==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#12 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.36 2004/04/18 18:38:59 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.37 2004/04/30 20:51:55 wpaul Exp $");
#include <sys/ctype.h>
#include <sys/unistd.h>
@@ -1641,7 +1641,11 @@
ktimer *timer;
struct timeval tv;
- timer = arg;
+ mtx_unlock(&Giant);
+
+ timer = arg;
+
+ timer->k_header.dh_inserted = FALSE;
/*
* If this is a periodic timer, re-arm it
@@ -1655,6 +1659,7 @@
if (timer->k_period) {
tv.tv_sec = 0;
tv.tv_usec = timer->k_period * 1000;
+ timer->k_header.dh_inserted = TRUE;
timer->k_handle =
timeout(ntoskrnl_timercall, timer, tvtohz(&tv));
}
@@ -1664,6 +1669,8 @@
ntoskrnl_wakeup(&timer->k_header);
+ mtx_lock(&Giant);
+
return;
}
@@ -1674,11 +1681,7 @@
if (timer == NULL)
return;
- INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead));
- timer->k_header.dh_sigstate = FALSE;
- timer->k_header.dh_type = EVENT_TYPE_NOTIFY;
- timer->k_header.dh_size = OTYPE_TIMER;
- callout_handle_init(&timer->k_handle);
+ ntoskrnl_init_timer_ex(timer, EVENT_TYPE_NOTIFY);
return;
}
@@ -1693,6 +1696,7 @@
INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead));
timer->k_header.dh_sigstate = FALSE;
+ timer->k_header.dh_inserted = FALSE;
timer->k_header.dh_type = type;
timer->k_header.dh_size = OTYPE_TIMER;
callout_handle_init(&timer->k_handle);
@@ -1776,9 +1780,9 @@
if (timer == NULL)
return(FALSE);
- if (timer->k_handle.callout != NULL &&
- callout_pending(timer->k_handle.callout)) {
+ if (timer->k_header.dh_inserted == TRUE) {
untimeout(ntoskrnl_timercall, timer, timer->k_handle);
+ timer->k_header.dh_inserted = FALSE;
pending = TRUE;
} else
pending = FALSE;
@@ -1803,6 +1807,7 @@
}
}
+ timer->k_header.dh_inserted = TRUE;
timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv));
return(pending);
@@ -1826,13 +1831,14 @@
if (timer == NULL)
return(FALSE);
- if (timer->k_handle.callout != NULL &&
- callout_pending(timer->k_handle.callout))
+ if (timer->k_header.dh_inserted == TRUE) {
+ untimeout(ntoskrnl_timercall, timer, timer->k_handle);
+ if (timer->k_dpc != NULL)
+ ntoskrnl_dequeue_dpc(timer->k_dpc);
pending = TRUE;
- else
+ } else
pending = FALSE;
- untimeout(ntoskrnl_timercall, timer, timer->k_handle);
return(pending);
}
@@ -1841,18 +1847,7 @@
ntoskrnl_read_timer(timer)
ktimer *timer;
{
- uint8_t pending;
-
- if (timer == NULL)
- return(FALSE);
-
- if (timer->k_handle.callout != NULL &&
- callout_pending(timer->k_handle.callout))
- pending = TRUE;
- else
- pending = FALSE;
-
- return(pending);
+ return(timer->k_header.dh_sigstate);
}
__stdcall static void
==== //depot/projects/gdb/sys/conf/NOTES#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1222 2004/04/27 16:38:12 emax Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1223 2004/04/30 21:16:51 ambrisko Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1459,6 +1459,8 @@
options COM_MULTIPORT # Code for some cards with shared IRQs.
options CONSPEED=115200 # Speed for serial console
# (default 9600).
+options FORCECONSPEED # no matter what use CONSPEED for
+ # console.
# `flags' specific to sio(4). See below for flags used by both sio(4) and
# uart(4).
==== //depot/projects/gdb/sys/conf/files#20 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.890 2004/04/24 22:03:02 rik Exp $
+# $FreeBSD: src/sys/conf/files,v 1.891 2004/04/30 17:25:47 tmm Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -630,7 +630,6 @@
dev/si/si_eisa.c optional si eisa
dev/si/si_isa.c optional si isa
dev/si/si_pci.c optional si pci
-dev/sio/sio_ebus.c optional sio ebus
dev/sio/sio_pccard.c optional sio card
dev/sio/sio_pccard.c optional sio pccard
dev/sio/sio_pci.c optional sio pci
==== //depot/projects/gdb/sys/conf/files.sparc64#4 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.51 2004/03/22 08:08:25 alc Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.52 2004/04/30 15:00:40 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -52,7 +52,7 @@
sparc64/isa/isa.c optional isa
sparc64/isa/ofw_isa.c optional ebus
sparc64/isa/ofw_isa.c optional isa
-sparc64/pci/apb.c optional apb
+sparc64/pci/apb.c optional pci
sparc64/pci/ofw_pci.c optional pci
sparc64/pci/ofw_pcib.c optional pci ofw_newpci
sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci
==== //depot/projects/gdb/sys/conf/options#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.445 2004/04/27 16:38:13 emax Exp $
+# $FreeBSD: src/sys/conf/options,v 1.446 2004/04/30 21:16:51 ambrisko Exp $
#
# On the handling of kernel options
#
@@ -521,6 +521,7 @@
# options for serial support
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
+FORCECONSPEED opt_sio.h
BREAK_TO_DEBUGGER opt_comconsole.h
ALT_BREAK_TO_DEBUGGER opt_comconsole.h
==== //depot/projects/gdb/sys/conf/options.sparc64#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.8 2003/08/24 01:54:06 jake Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.9 2004/04/30 15:21:25 tmm Exp $
SUN4U opt_global.h
@@ -6,13 +6,10 @@
GFB_NO_FONT_LOADING opt_gfb.h
GFB_NO_MODE_CHANGE opt_gfb.h
-EBUS_DEBUG opt_ebus.h
PSYCHO_DEBUG opt_psycho.h
DEBUGGER_ON_POWERFAIL opt_psycho.h
OFW_PCI_DEBUG opt_ofw_pci.h
OFW_NEWPCI opt_ofw_pci.h
-# Normal IOMMU debugging
-IOMMU_DEBUG opt_iommu.h
# Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
IOMMU_DIAG opt_iommu.h
PMAP_STATS opt_pmap.h
==== //depot/projects/gdb/sys/dev/asr/asr.c#5 (text+ko) ====
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.47 2004/04/22 02:22:18 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.48 2004/05/01 01:25:05 scottl Exp $");
#define ASR_VERSION 1
#define ASR_REVISION '0'
@@ -247,19 +247,6 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
-#define STATIC static
-#define INLINE
-
-#if (defined(DEBUG_ASR) && (DEBUG_ASR > 0))
-#undef STATIC
-#define STATIC
-#undef INLINE
-#define INLINE
-#endif
-#define IN
-#define OUT
-#define INOUT
-
#define osdSwap4(x) ((u_long)ntohl((u_long)(x)))
#define KVTOPHYS(x) vtophys(x)
#include "dev/asr/dptalign.h"
@@ -377,114 +364,95 @@
struct Asr_softc * ha_next; /* HBA list */
} Asr_softc_t;
-STATIC Asr_softc_t * Asr_softc;
+static Asr_softc_t * Asr_softc;
/*
* Prototypes of the routines we have in this object.
*/
/* Externally callable routines */
-#define PROBE_ARGS IN device_t tag
+#define PROBE_ARGS device_t tag
#define PROBE_RET int
#define PROBE_SET() u_int32_t id = (pci_get_device(tag)<<16)|pci_get_vendor(tag)
#define PROBE_RETURN(retval) if(retval){device_set_desc(tag,retval);return(0);}else{return(ENXIO);}
-#define ATTACH_ARGS IN device_t tag
+#define ATTACH_ARGS device_t tag
#define ATTACH_RET int
#define ATTACH_SET() int unit = device_get_unit(tag)
#define ATTACH_RETURN(retval) return(retval)
/* I2O HDM interface */
-STATIC PROBE_RET asr_probe(PROBE_ARGS);
-STATIC ATTACH_RET asr_attach(ATTACH_ARGS);
+static PROBE_RET asr_probe(PROBE_ARGS);
+static ATTACH_RET asr_attach(ATTACH_ARGS);
/* DOMINO placeholder */
-STATIC PROBE_RET domino_probe(PROBE_ARGS);
-STATIC ATTACH_RET domino_attach(ATTACH_ARGS);
+static PROBE_RET domino_probe(PROBE_ARGS);
+static ATTACH_RET domino_attach(ATTACH_ARGS);
/* MODE0 adapter placeholder */
-STATIC PROBE_RET mode0_probe(PROBE_ARGS);
-STATIC ATTACH_RET mode0_attach(ATTACH_ARGS);
+static PROBE_RET mode0_probe(PROBE_ARGS);
+static ATTACH_RET mode0_attach(ATTACH_ARGS);
-STATIC Asr_softc_t * ASR_get_sc(
- IN dev_t dev);
-STATIC int asr_ioctl(
- IN dev_t dev,
- IN u_long cmd,
- INOUT caddr_t data,
- int flag,
- struct thread * td);
-STATIC int asr_open(
- IN dev_t dev,
- int32_t flags,
- int32_t ifmt,
- IN struct thread * td);
-STATIC int asr_close(
- dev_t dev,
- int flags,
- int ifmt,
- struct thread * td);
-STATIC int asr_intr(
- IN Asr_softc_t * sc);
-STATIC void asr_timeout(
- INOUT void * arg);
-STATIC int ASR_init(
- IN Asr_softc_t * sc);
-STATIC INLINE int ASR_acquireLct(
- INOUT Asr_softc_t * sc);
-STATIC INLINE int ASR_acquireHrt(
- INOUT Asr_softc_t * sc);
-STATIC void asr_action(
- IN struct cam_sim * sim,
- IN union ccb * ccb);
-STATIC void asr_poll(
- IN struct cam_sim * sim);
+static Asr_softc_t *ASR_get_sc(dev_t dev);
+static int asr_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct thread *td);
+static int asr_open(dev_t dev, int32_t flags, int32_t ifmt,
+ struct thread *td);
+static int asr_close(dev_t dev, int flags, int ifmt, struct thread *td);
+static int asr_intr(Asr_softc_t *sc);
+static void asr_timeout(void *arg);
+static int ASR_init(Asr_softc_t *sc);
+static int ASR_acquireLct(Asr_softc_t *sc);
+static int ASR_acquireHrt(Asr_softc_t *sc);
+static void asr_action(struct cam_sim *sim, union ccb *ccb);
+static void asr_poll(struct cam_sim *sim);
+static int ASR_queue(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message);
/*
* Here is the auto-probe structure used to nest our tests appropriately
* during the startup phase of the operating system.
*/
-STATIC device_method_t asr_methods[] = {
+static device_method_t asr_methods[] = {
DEVMETHOD(device_probe, asr_probe),
DEVMETHOD(device_attach, asr_attach),
{ 0, 0 }
};
-STATIC driver_t asr_driver = {
+static driver_t asr_driver = {
"asr",
asr_methods,
sizeof(Asr_softc_t)
};
-STATIC devclass_t asr_devclass;
+static devclass_t asr_devclass;
DRIVER_MODULE(asr, pci, asr_driver, asr_devclass, 0, 0);
-STATIC device_method_t domino_methods[] = {
+static device_method_t domino_methods[] = {
DEVMETHOD(device_probe, domino_probe),
DEVMETHOD(device_attach, domino_attach),
{ 0, 0 }
};
-STATIC driver_t domino_driver = {
+static driver_t domino_driver = {
"domino",
domino_methods,
0
};
-STATIC devclass_t domino_devclass;
+static devclass_t domino_devclass;
DRIVER_MODULE(domino, pci, domino_driver, domino_devclass, 0, 0);
-STATIC device_method_t mode0_methods[] = {
+static device_method_t mode0_methods[] = {
DEVMETHOD(device_probe, mode0_probe),
DEVMETHOD(device_attach, mode0_attach),
{ 0, 0 }
};
-STATIC driver_t mode0_driver = {
+static driver_t mode0_driver = {
"mode0",
mode0_methods,
0
};
-STATIC devclass_t mode0_devclass;
+static devclass_t mode0_devclass;
DRIVER_MODULE(mode0, pci, mode0_driver, mode0_devclass, 0, 0);
@@ -494,7 +462,7 @@
* only ioctl is used. the sd driver provides all other access.
*/
#define CDEV_MAJOR 154 /* preferred default character major */
-STATIC struct cdevsw asr_cdevsw = {
+static struct cdevsw asr_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = asr_open,
@@ -511,12 +479,10 @@
/*
* Fill message with default.
*/
-STATIC PI2O_MESSAGE_FRAME
-ASR_fillMessage (
- IN char * Message,
- IN u_int16_t size)
+static PI2O_MESSAGE_FRAME
+ASR_fillMessage(char *Message, u_int16_t size)
{
- OUT PI2O_MESSAGE_FRAME Message_Ptr;
+ PI2O_MESSAGE_FRAME Message_Ptr;
Message_Ptr = getAlignLong(I2O_MESSAGE_FRAME, Message);
bzero ((void *)Message_Ptr, size);
@@ -529,11 +495,10 @@
#define EMPTY_QUEUE ((U32)-1L)
-STATIC INLINE U32
-ASR_getMessage(
- IN i2oRegs_t * virt)
+static __inline U32
+ASR_getMessage(i2oRegs_t *virt)
{
- OUT U32 MessageOffset;
+ U32 MessageOffset;
if ((MessageOffset = virt->ToFIFO) == EMPTY_QUEUE) {
MessageOffset = virt->ToFIFO;
@@ -542,15 +507,12 @@
} /* ASR_getMessage */
/* Issue a polled command */
-STATIC U32
-ASR_initiateCp (
- INOUT i2oRegs_t * virt,
- INOUT U8 * fvirt,
- IN PI2O_MESSAGE_FRAME Message)
+static U32
+ASR_initiateCp(i2oRegs_t *virt, U8 *fvirt, PI2O_MESSAGE_FRAME Message)
{
- OUT U32 Mask = -1L;
- U32 MessageOffset;
- u_int Delay = 1500;
+ U32 Mask = -1L;
+ U32 MessageOffset;
+ u_int Delay = 1500;
/*
* ASR_initiateCp is only used for synchronous commands and will
@@ -576,10 +538,8 @@
/*
* Reset the adapter.
*/
-STATIC U32
-ASR_resetIOP (
- INOUT i2oRegs_t * virt,
- INOUT U8 * fvirt)
+static U32
+ASR_resetIOP(i2oRegs_t *virt, U8 *fvirt)
{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list