PERFORCE change 98842 for review
John Birrell
jb at FreeBSD.org
Thu Jun 8 23:55:49 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=98842
Change 98842 by jb at jb_freebsd2 on 2006/06/08 23:53:13
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#12 integrate
.. //depot/projects/dtrace/src/contrib/binutils/bfd/elf64-sparc.c#2 integrate
.. //depot/projects/dtrace/src/contrib/traceroute/traceroute.8#3 integrate
.. //depot/projects/dtrace/src/sbin/init/init.c#2 integrate
.. //depot/projects/dtrace/src/share/man/man9/vflush.9#2 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#3 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/dtrace/src/sys/i386/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#9 integrate
.. //depot/projects/dtrace/src/sys/modules/ath_hal/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/if_bridge/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#5 integrate
.. //depot/projects/dtrace/src/sys/netatalk/COPYRIGHT#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ypserv/Makefile.yp#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ypserv/ypinit.8#2 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#12 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.570 2006/06/06 16:47:36 itetcu Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.571 2006/06/08 01:35:45 clsung Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -2724,6 +2724,11 @@
</listitem>
<listitem>
+ <para>Fabian Keil
+ <email>fk at fabiankeil.de</email></para>
+ </listitem>
+
+ <listitem>
<para>Fabien Devaux
<email>fab at gcu.info</email></para>
</listitem>
==== //depot/projects/dtrace/src/contrib/binutils/bfd/elf64-sparc.c#2 (text+ko) ====
@@ -1638,7 +1638,11 @@
|| h->root.type == bfd_link_hash_defweak)
&& (h->root.u.def.section->flags & SEC_CODE) != 0))
{
- if (! elf_hash_table (info)->dynamic_sections_created)
+ if (! info->shared
+ && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
+ && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0
+ && h->root.type != bfd_link_hash_undefweak
+ && h->root.type != bfd_link_hash_undefined)
{
/* This case can occur if we saw a WPLT30 reloc in an input
file, but none of the input files were dynamic objects.
==== //depot/projects/dtrace/src/contrib/traceroute/traceroute.8#3 (text+ko) ====
@@ -14,7 +14,7 @@
.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.12 2006/05/11 06:30:18 cjc Exp $
+.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.13 2006/06/07 21:37:42 maxim Exp $
.\"
.TH TRACEROUTE 8 "21 September 2000"
.UC 6
@@ -282,7 +282,7 @@
.RE
Note that lines 2 & 3 are the same. This is due to a buggy
-kernel on the 2nd hop system \- lbl-csam.arpa \- that forwards
+kernel on the 2nd hop system \- lilac-dmc.Berkeley.EDU \- that forwards
packets with a zero ttl (a bug in the distributed version
of 4.3BSD). Note that you have to guess what path
the packets are taking cross-country since the NSFNet (129.140)
==== //depot/projects/dtrace/src/sbin/init/init.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/init/init.c,v 1.61 2005/09/15 13:16:07 rse Exp $";
+ "$FreeBSD: src/sbin/init/init.c,v 1.62 2006/06/08 14:04:36 kib Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -1066,6 +1066,7 @@
pid_t pid;
sigset_t mask;
char term[64], *env[2];
+ int status;
if ((pid = fork()) == -1) {
emergency("can't fork for window system on port %s: %m",
@@ -1073,9 +1074,20 @@
/* hope that getty fails and we can try again */
return;
}
+ if (pid)
+ {
+ waitpid(-1, &status, 0);
+ return;
+ }
+ /* reparent window process to the init to not make a zombie on exit */
+ if ((pid = fork()) == -1) {
+ emergency("can't fork for window system on port %s: %m",
+ sp->se_device);
+ _exit(1);
+ }
if (pid)
- return;
+ _exit(0);
sigemptyset(&mask);
sigprocmask(SIG_SETMASK, &mask, (sigset_t *) 0);
==== //depot/projects/dtrace/src/share/man/man9/vflush.9#2 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/vflush.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/vflush.9,v 1.6 2006/06/08 04:39:02 maxim Exp $
.\"
.Dd November 21, 2001
.Dt VFLUSH 9
@@ -61,7 +61,7 @@
If set, busy vnodes will be forcibly closed.
.It Dv SKIPSYSTEM
If set, vnodes with the
-.Dv VSYSTEM
+.Dv VV_SYSTEM
flag set will be skipped.
.It Dv WRITECLOSE
If set, only regular files currently opened for writing will be removed.
==== //depot/projects/dtrace/src/sys/arm/conf/IQ31244#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.13 2005/10/04 14:39:33 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.14 2006/06/07 22:41:14 cognet Exp $
machine arm
ident IQ31244
@@ -25,7 +25,6 @@
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
options STARTUP_PAGETABLE_ADDR=0xa0000000
-options ARM32_NEW_VM_LAYOUT
include "../xscale/i80321/std.iq31244"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
==== //depot/projects/dtrace/src/sys/arm/conf/KB920X#3 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.4 2006/05/19 00:11:21 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.5 2006/06/07 22:41:14 cognet Exp $
machine arm
ident KB920X
@@ -25,7 +25,6 @@
options KERNVIRTADDR=0xc0000000
options PHYSADDR=0x20000000
options STARTUP_PAGETABLE_ADDR=0x20800000
-options ARM32_NEW_VM_LAYOUT
include "../at91/std.kb920x"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
==== //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#3 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.3 2006/05/13 23:41:15 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.4 2006/06/07 22:41:14 cognet Exp $
machine arm
ident KB920X
@@ -84,7 +84,6 @@
device mem # Memory and kernel memory devices
device md
options SKYEYE_WORKAROUNDS
-options ARM32_NEW_VM_LAYOUT
# Floppy drives
==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.54 2006/03/30 07:42:32 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.55 2006/06/08 18:33:08 ps Exp $");
#include "opt_compat.h"
@@ -834,26 +834,6 @@
return (0);
}
-static int
-freebsd32_copyoutiov(struct iovec *iov, u_int iovcnt, struct iovec32 *iovp,
- int error)
-{
- struct iovec32 iov32;
- int i;
-
- if (iovcnt > UIO_MAXIOV)
- return (error);
- for (i = 0; i < iovcnt; i++) {
- iov32.iov_base = PTROUT(iov[i].iov_base);
- iov32.iov_len = iov[i].iov_len;
- error = copyout(&iov32, &iovp[i], sizeof(iov32));
- if (error)
- return (error);
- }
- return (0);
-}
-
-
struct msghdr32 {
u_int32_t msg_name;
socklen_t msg_namelen;
@@ -1038,10 +1018,6 @@
if (error == 0)
error = freebsd32_copyoutmsghdr(&msg, uap->msg);
-
- if (error == 0)
- error = freebsd32_copyoutiov(iov, m32.msg_iovlen,
- (struct iovec32 *)(uintptr_t)m32.msg_iov, EMSGSIZE);
}
free(iov, M_IOV);
==== //depot/projects/dtrace/src/sys/conf/files.powerpc#3 (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.powerpc,v 1.53 2006/04/24 23:36:32 marcel Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.54 2006/06/08 23:38:01 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -13,6 +13,17 @@
compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
no-obj no-implicit-rule before-depend \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
+#
+hal.o optional ath_hal \
+ dependency "$S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \
+ compile-with "uudecode < $S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \
+ no-implicit-rule
+opt_ah.h optional ath_hal \
+ dependency "$S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h" \
+ compile-with "cp $S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h opt_ah.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "opt_ah.h"
+#
dev/fb/fb.c optional sc
dev/hwpmc/hwpmc_powerpc.c optional hwpmc
==== //depot/projects/dtrace/src/sys/crypto/via/padlock.c#5 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.4 2006/06/05 16:22:04 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.5 2006/06/08 17:40:02 pjd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -523,13 +523,14 @@
u_char *buf, *abuf;
int error = 0;
+ enccrd = maccrd = NULL;
buf = NULL;
+
if (crp == NULL || crp->crp_callback == NULL || crp->crp_desc == NULL) {
error = EINVAL;
goto out;
}
- enccrd = maccrd = NULL;
for (crd = crp->crp_desc; crd != NULL; crd = crd->crd_next) {
switch (crd->crd_alg) {
case CRYPTO_NULL_HMAC:
==== //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#3 (text) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.4 2006/06/08 18:31:21 davidch Exp $");
/*
* The following controllers are supported by this driver:
@@ -53,7 +53,7 @@
/****************************************************************************/
/* BCE Driver Version */
/****************************************************************************/
-char bce_driver_version[] = "v0.9.5";
+char bce_driver_version[] = "v0.9.6";
/****************************************************************************/
@@ -4640,10 +4640,32 @@
bce_dma_map_tx_desc, &map_arg, BUS_DMA_NOWAIT);
if (error || map_arg.maxsegs == 0) {
- BCE_PRINTF(sc, "%s(%d): Error mapping mbuf into TX chain!\n",
- __FILE__, __LINE__);
- rc = ENOBUFS;
- goto bce_tx_encap_exit;
+
+ /* Try to defrag the mbuf if there are too many segments. */
+ if (error == EFBIG && map_arg.maxsegs != 0) {
+ struct mbuf *m0;
+
+ DBPRINT(sc, BCE_WARN, "%s(): fragmented mbuf (%d pieces)\n",
+ __FUNCTION__, map_arg.maxsegs);
+
+ m0 = m_defrag(m_head, M_DONTWAIT);
+ if (m0 != NULL) {
+ m_head = m0;
+ error = bus_dmamap_load_mbuf(sc->tx_mbuf_tag,
+ map, m_head, bce_dma_map_tx_desc, &map_arg,
+ BUS_DMA_NOWAIT);
+ }
+ }
+
+ /* Still getting an error after a defrag. */
+ if (error) {
+ BCE_PRINTF(sc,
+ "%s(%d): Error mapping mbuf into TX chain!\n",
+ __FILE__, __LINE__);
+ rc = ENOBUFS;
+ goto bce_tx_encap_exit;
+ }
+
}
/*
@@ -5308,14 +5330,6 @@
*/
ifp->if_collisions = (u_long) stats->stat_EtherStatsCollisions;
- ifp->if_ibytes = BCE_STATS(IfHCInOctets);
-
- ifp->if_obytes = BCE_STATS(IfHCOutOctets);
-
- ifp->if_imcasts = BCE_STATS(IfHCInMulticastPkts);
-
- ifp->if_omcasts = BCE_STATS(IfHCOutMulticastPkts);
-
ifp->if_ierrors = (u_long) stats->stat_EtherStatsUndersizePkts +
(u_long) stats->stat_EtherStatsOverrsizePkts +
(u_long) stats->stat_IfInMBUFDiscards +
==== //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.130 2006/06/07 21:03:20 glebius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.131 2006/06/08 10:19:16 glebius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1974,8 +1974,8 @@
* Treat the 5714 and the 5752 like the 5750 until we have more info
* on this chip.
*/
- if (sc->bge_asicrev == BGE_ASICREV_BCM5714 ||
- sc->bge_asicrev == BGE_ASICREV_BCM5752)
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5714 ||
+ sc->bge_asicrev == BGE_ASICREV_BCM5752)
sc->bge_asicrev = BGE_ASICREV_BCM5750;
/*
@@ -2072,7 +2072,7 @@
ifp->if_capabilities |= IFCAP_POLLING;
#endif
- /*
+ /*
* 5700 B0 chips do not support checksumming correctly due
* to hardware bugs.
*/
@@ -2875,7 +2875,7 @@
map = sc->bge_cdata.bge_tx_dmamap[idx];
error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map,
m_head, segs, &nsegs, BUS_DMA_NOWAIT);
- if (error) {
+ if (error) {
if (error == EFBIG) {
struct mbuf *m0;
@@ -2887,7 +2887,7 @@
map, m_head, segs, &nsegs, BUS_DMA_NOWAIT);
}
if (error)
- return (error);
+ return (error);
}
/*
@@ -3270,7 +3270,7 @@
case SIOCSIFMTU:
/* Disallow jumbo frames on 5705. */
if (((sc->bge_asicrev == BGE_ASICREV_BCM5705 ||
- sc->bge_asicrev == BGE_ASICREV_BCM5750) &&
+ sc->bge_asicrev == BGE_ASICREV_BCM5750) &&
ifr->ifr_mtu > ETHERMTU) || ifr->ifr_mtu > BGE_JUMBO_MTU)
error = EINVAL;
else {
@@ -3348,7 +3348,7 @@
CSR_WRITE_4(sc, BGE_MBX_IRQ0_LO, 1);
CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS_INT, 1);
CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS_INT, 1);
- ifp->if_capenable |= IFCAP_POLLING;
+ ifp->if_capenable |= IFCAP_POLLING;
BGE_UNLOCK(sc);
} else {
error = ether_poll_deregister(ifp);
@@ -3622,7 +3622,7 @@
BRGPHY_INTRS);
}
return;
- }
+ }
if (sc->bge_tbi) {
status = CSR_READ_4(sc, BGE_MAC_STS);
@@ -3646,7 +3646,7 @@
}
/* Discard link events for MII/GMII cards if MI auto-polling disabled */
} else if (CSR_READ_4(sc, BGE_MI_MODE) & BGE_MIMODE_AUTOPOLL) {
- /*
+ /*
* Some broken BCM chips have BGE_STATFLAG_LINKSTATE_CHANGED bit
* in status word always set. Workaround this bug by reading
* PHY link status directly.
==== //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.47 2006/04/12 12:12:44 pjd Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.48 2006/06/08 09:35:02 glebius Exp $
*/
/*
@@ -1752,26 +1752,26 @@
#define BGE_MAGIC_NUMBER 0x4B657654
typedef struct {
- u_int32_t bge_addr_hi;
- u_int32_t bge_addr_lo;
+ uint32_t bge_addr_hi;
+ uint32_t bge_addr_lo;
} bge_hostaddr;
#define BGE_HOSTADDR(x, y) \
do { \
- (x).bge_addr_lo = ((u_int64_t) (y) & 0xffffffff); \
- (x).bge_addr_hi = ((u_int64_t) (y) >> 32); \
+ (x).bge_addr_lo = ((uint64_t) (y) & 0xffffffff); \
+ (x).bge_addr_hi = ((uint64_t) (y) >> 32); \
} while(0)
#define BGE_ADDR_LO(y) \
- ((u_int64_t) (y) & 0xFFFFFFFF)
+ ((uint64_t) (y) & 0xFFFFFFFF)
#define BGE_ADDR_HI(y) \
- ((u_int64_t) (y) >> 32)
+ ((uint64_t) (y) >> 32)
/* Ring control block structure */
struct bge_rcb {
bge_hostaddr bge_hostaddr;
- u_int32_t bge_maxlen_flags;
- u_int32_t bge_nicaddr;
+ uint32_t bge_maxlen_flags;
+ uint32_t bge_nicaddr;
};
#define RCB_WRITE_4(sc, rcb, offset, val) \
@@ -1785,15 +1785,15 @@
struct bge_tx_bd {
bge_hostaddr bge_addr;
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_flags;
- u_int16_t bge_len;
- u_int16_t bge_vlan_tag;
- u_int16_t bge_rsvd;
+ uint16_t bge_flags;
+ uint16_t bge_len;
+ uint16_t bge_vlan_tag;
+ uint16_t bge_rsvd;
#else
- u_int16_t bge_len;
- u_int16_t bge_flags;
- u_int16_t bge_rsvd;
- u_int16_t bge_vlan_tag;
+ uint16_t bge_len;
+ uint16_t bge_flags;
+ uint16_t bge_rsvd;
+ uint16_t bge_vlan_tag;
#endif
};
@@ -1817,26 +1817,26 @@
struct bge_rx_bd {
bge_hostaddr bge_addr;
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_len;
- u_int16_t bge_idx;
- u_int16_t bge_flags;
- u_int16_t bge_type;
- u_int16_t bge_tcp_udp_csum;
- u_int16_t bge_ip_csum;
- u_int16_t bge_vlan_tag;
- u_int16_t bge_error_flag;
+ uint16_t bge_len;
+ uint16_t bge_idx;
+ uint16_t bge_flags;
+ uint16_t bge_type;
+ uint16_t bge_tcp_udp_csum;
+ uint16_t bge_ip_csum;
+ uint16_t bge_vlan_tag;
+ uint16_t bge_error_flag;
#else
- u_int16_t bge_idx;
- u_int16_t bge_len;
- u_int16_t bge_type;
- u_int16_t bge_flags;
- u_int16_t bge_ip_csum;
- u_int16_t bge_tcp_udp_csum;
- u_int16_t bge_error_flag;
- u_int16_t bge_vlan_tag;
+ uint16_t bge_idx;
+ uint16_t bge_len;
+ uint16_t bge_type;
+ uint16_t bge_flags;
+ uint16_t bge_ip_csum;
+ uint16_t bge_tcp_udp_csum;
+ uint16_t bge_error_flag;
+ uint16_t bge_vlan_tag;
#endif
- u_int32_t bge_rsvd;
- u_int32_t bge_opaque;
+ uint32_t bge_rsvd;
+ uint32_t bge_opaque;
};
struct bge_extrx_bd {
@@ -1844,38 +1844,38 @@
bge_hostaddr bge_addr2;
bge_hostaddr bge_addr3;
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_len2;
- u_int16_t bge_len1;
- u_int16_t bge_rsvd1;
- u_int16_t bge_len3;
+ uint16_t bge_len2;
+ uint16_t bge_len1;
+ uint16_t bge_rsvd1;
+ uint16_t bge_len3;
#else
- u_int16_t bge_len1;
- u_int16_t bge_len2;
- u_int16_t bge_len3;
- u_int16_t bge_rsvd1;
+ uint16_t bge_len1;
+ uint16_t bge_len2;
+ uint16_t bge_len3;
+ uint16_t bge_rsvd1;
#endif
bge_hostaddr bge_addr0;
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_len0;
- u_int16_t bge_idx;
- u_int16_t bge_flags;
- u_int16_t bge_type;
- u_int16_t bge_tcp_udp_csum;
- u_int16_t bge_ip_csum;
- u_int16_t bge_vlan_tag;
- u_int16_t bge_error_flag;
+ uint16_t bge_len0;
+ uint16_t bge_idx;
+ uint16_t bge_flags;
+ uint16_t bge_type;
+ uint16_t bge_tcp_udp_csum;
+ uint16_t bge_ip_csum;
+ uint16_t bge_vlan_tag;
+ uint16_t bge_error_flag;
#else
- u_int16_t bge_idx;
- u_int16_t bge_len0;
- u_int16_t bge_type;
- u_int16_t bge_flags;
- u_int16_t bge_ip_csum;
- u_int16_t bge_tcp_udp_csum;
- u_int16_t bge_error_flag;
- u_int16_t bge_vlan_tag;
+ uint16_t bge_idx;
+ uint16_t bge_len0;
+ uint16_t bge_type;
+ uint16_t bge_flags;
+ uint16_t bge_ip_csum;
+ uint16_t bge_tcp_udp_csum;
+ uint16_t bge_error_flag;
+ uint16_t bge_vlan_tag;
#endif
- u_int32_t bge_rsvd0;
- u_int32_t bge_opaque;
+ uint32_t bge_rsvd0;
+ uint32_t bge_opaque;
};
#define BGE_RXBDFLAG_END 0x0004
@@ -1898,27 +1898,27 @@
struct bge_sts_idx {
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_rx_prod_idx;
- u_int16_t bge_tx_cons_idx;
+ uint16_t bge_rx_prod_idx;
+ uint16_t bge_tx_cons_idx;
#else
- u_int16_t bge_tx_cons_idx;
- u_int16_t bge_rx_prod_idx;
+ uint16_t bge_tx_cons_idx;
+ uint16_t bge_rx_prod_idx;
#endif
};
struct bge_status_block {
- u_int32_t bge_status;
- u_int32_t bge_rsvd0;
+ uint32_t bge_status;
+ uint32_t bge_rsvd0;
#if BYTE_ORDER == LITTLE_ENDIAN
- u_int16_t bge_rx_jumbo_cons_idx;
- u_int16_t bge_rx_std_cons_idx;
- u_int16_t bge_rx_mini_cons_idx;
- u_int16_t bge_rsvd1;
+ uint16_t bge_rx_jumbo_cons_idx;
+ uint16_t bge_rx_std_cons_idx;
+ uint16_t bge_rx_mini_cons_idx;
+ uint16_t bge_rsvd1;
#else
- u_int16_t bge_rx_std_cons_idx;
- u_int16_t bge_rx_jumbo_cons_idx;
- u_int16_t bge_rsvd1;
- u_int16_t bge_rx_mini_cons_idx;
+ uint16_t bge_rx_std_cons_idx;
+ uint16_t bge_rx_jumbo_cons_idx;
+ uint16_t bge_rsvd1;
+ uint16_t bge_rx_mini_cons_idx;
#endif
struct bge_sts_idx bge_idx[16];
};
@@ -2129,43 +2129,43 @@
/* Stats counters access through registers */
struct bge_mac_stats_regs {
- u_int32_t ifHCOutOctets;
- u_int32_t Reserved0;
- u_int32_t etherStatsCollisions;
- u_int32_t outXonSent;
- u_int32_t outXoffSent;
- u_int32_t Reserved1;
- u_int32_t dot3StatsInternalMacTransmitErrors;
- u_int32_t dot3StatsSingleCollisionFrames;
- u_int32_t dot3StatsMultipleCollisionFrames;
- u_int32_t dot3StatsDeferredTransmissions;
- u_int32_t Reserved2;
- u_int32_t dot3StatsExcessiveCollisions;
- u_int32_t dot3StatsLateCollisions;
- u_int32_t Reserved3[14];
- u_int32_t ifHCOutUcastPkts;
- u_int32_t ifHCOutMulticastPkts;
- u_int32_t ifHCOutBroadcastPkts;
- u_int32_t Reserved4[2];
- u_int32_t ifHCInOctets;
- u_int32_t Reserved5;
- u_int32_t etherStatsFragments;
- u_int32_t ifHCInUcastPkts;
- u_int32_t ifHCInMulticastPkts;
- u_int32_t ifHCInBroadcastPkts;
- u_int32_t dot3StatsFCSErrors;
- u_int32_t dot3StatsAlignmentErrors;
- u_int32_t xonPauseFramesReceived;
- u_int32_t xoffPauseFramesReceived;
- u_int32_t macControlFramesReceived;
- u_int32_t xoffStateEntered;
- u_int32_t dot3StatsFramesTooLong;
- u_int32_t etherStatsJabbers;
- u_int32_t etherStatsUndersizePkts;
+ uint32_t ifHCOutOctets;
+ uint32_t Reserved0;
+ uint32_t etherStatsCollisions;
+ uint32_t outXonSent;
+ uint32_t outXoffSent;
+ uint32_t Reserved1;
+ uint32_t dot3StatsInternalMacTransmitErrors;
+ uint32_t dot3StatsSingleCollisionFrames;
+ uint32_t dot3StatsMultipleCollisionFrames;
+ uint32_t dot3StatsDeferredTransmissions;
+ uint32_t Reserved2;
+ uint32_t dot3StatsExcessiveCollisions;
+ uint32_t dot3StatsLateCollisions;
+ uint32_t Reserved3[14];
+ uint32_t ifHCOutUcastPkts;
+ uint32_t ifHCOutMulticastPkts;
+ uint32_t ifHCOutBroadcastPkts;
+ uint32_t Reserved4[2];
+ uint32_t ifHCInOctets;
+ uint32_t Reserved5;
+ uint32_t etherStatsFragments;
+ uint32_t ifHCInUcastPkts;
+ uint32_t ifHCInMulticastPkts;
+ uint32_t ifHCInBroadcastPkts;
+ uint32_t dot3StatsFCSErrors;
+ uint32_t dot3StatsAlignmentErrors;
+ uint32_t xonPauseFramesReceived;
+ uint32_t xoffPauseFramesReceived;
+ uint32_t macControlFramesReceived;
+ uint32_t xoffStateEntered;
+ uint32_t dot3StatsFramesTooLong;
+ uint32_t etherStatsJabbers;
+ uint32_t etherStatsUndersizePkts;
};
struct bge_stats {
- u_int8_t Reserved0[256];
+ uint8_t Reserved0[256];
/* Statistics maintained by Receive MAC. */
struct bge_rx_mac_stats rxstats;
@@ -2202,7 +2202,7 @@
bge_hostaddr nicAvoidedInterrupts;
bge_hostaddr nicSendThresholdHit;
- u_int8_t Reserved4[320];
+ uint8_t Reserved4[320];
};
/*
@@ -2238,14 +2238,14 @@
/* VPD structures */
struct vpd_res {
- u_int8_t vr_id;
- u_int8_t vr_len;
- u_int8_t vr_pad;
+ uint8_t vr_id;
+ uint8_t vr_len;
+ uint8_t vr_pad;
};
struct vpd_key {
char vk_key[2];
- u_int8_t vk_len;
+ uint8_t vk_len;
};
#define VPD_RES_ID 0x82 /* ID string */
@@ -2286,8 +2286,8 @@
#define BGE_JSLOTS 384
#define BGE_JRAWLEN (BGE_JUMBO_FRAMELEN + ETHER_ALIGN)
-#define BGE_JLEN (BGE_JRAWLEN + (sizeof(u_int64_t) - \
- (BGE_JRAWLEN % sizeof(u_int64_t))))
+#define BGE_JLEN (BGE_JRAWLEN + (sizeof(uint64_t) - \
+ (BGE_JRAWLEN % sizeof(uint64_t))))
#define BGE_JPAGESZ PAGE_SIZE
#define BGE_RESID (BGE_JPAGESZ - (BGE_JLEN * BGE_JSLOTS) % BGE_JPAGESZ)
#define BGE_JMEM ((BGE_JLEN * BGE_JSLOTS) + BGE_RESID)
@@ -2363,15 +2363,15 @@
struct bge_dmamap_arg {
struct bge_softc *sc;
bus_addr_t bge_busaddr;
- u_int16_t bge_flags;
+ uint16_t bge_flags;
int bge_idx;
int bge_maxsegs;
struct bge_tx_bd *bge_ring;
};
struct bge_type {
- u_int16_t bge_vid;
- u_int16_t bge_did;
+ uint16_t bge_vid;
+ uint16_t bge_did;
char *bge_name;
};
@@ -2396,29 +2396,29 @@
struct resource *bge_irq;
struct resource *bge_res;
struct ifmedia bge_ifmedia; /* TBI media info */
- u_int8_t bge_extram; /* has external SSRAM */
- u_int8_t bge_tbi;
- u_int8_t bge_rx_alignment_bug;
- u_int32_t bge_chipid;
- u_int8_t bge_asicrev;
- u_int8_t bge_chiprev;
- u_int8_t bge_no_3_led;
- u_int8_t bge_pcie;
+ uint8_t bge_extram; /* has external SSRAM */
+ uint8_t bge_tbi;
+ uint8_t bge_rx_alignment_bug;
+ uint32_t bge_chipid;
+ uint8_t bge_asicrev;
+ uint8_t bge_chiprev;
+ uint8_t bge_no_3_led;
+ uint8_t bge_pcie;
struct bge_ring_data bge_ldata; /* rings */
struct bge_chain_data bge_cdata; /* mbufs */
- u_int16_t bge_tx_saved_considx;
- u_int16_t bge_rx_saved_considx;
- u_int16_t bge_ev_saved_considx;
- u_int16_t bge_return_ring_cnt;
- u_int16_t bge_std; /* current std ring head */
- u_int16_t bge_jumbo; /* current jumo ring head */
- u_int32_t bge_stat_ticks;
- u_int32_t bge_rx_coal_ticks;
- u_int32_t bge_tx_coal_ticks;
- u_int32_t bge_tx_prodidx;
- u_int32_t bge_rx_max_coal_bds;
- u_int32_t bge_tx_max_coal_bds;
- u_int32_t bge_tx_buf_ratio;
+ uint16_t bge_tx_saved_considx;
+ uint16_t bge_rx_saved_considx;
+ uint16_t bge_ev_saved_considx;
+ uint16_t bge_return_ring_cnt;
+ uint16_t bge_std; /* current std ring head */
+ uint16_t bge_jumbo; /* current jumo ring head */
+ uint32_t bge_stat_ticks;
+ uint32_t bge_rx_coal_ticks;
+ uint32_t bge_tx_coal_ticks;
+ uint32_t bge_tx_prodidx;
+ uint32_t bge_rx_max_coal_bds;
+ uint32_t bge_tx_max_coal_bds;
+ uint32_t bge_tx_buf_ratio;
int bge_if_flags;
int bge_txcnt;
int bge_link; /* link state */
==== //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.183 2006/06/07 12:26:23 glebius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.184 2006/06/08 08:15:21 glebius Exp $");
/*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
@@ -220,8 +220,10 @@
"Microsoft MN-120 CardBus 10/100" },
{ DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130), 0,
"Microsoft MN-130 10/100" },
- { DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200), 0,
- "Linksys PCMPC200 10/100" },
+ { DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB08), 0,
+ "Linksys PCMPC200 CardBus 10/100" },
+ { DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB09), 0,
+ "Linksys PCMPC200 CardBus 10/100" },
{ 0, 0, NULL }
};
@@ -1896,6 +1898,8 @@
case DC_DEVID(DC_VENDORID_3COM, DC_DEVICEID_3CSOHOB):
case DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN120):
case DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130):
+ case DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB08):
+ case DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB09):
sc->dc_type = DC_TYPE_AN985;
sc->dc_flags |= DC_64BIT_HASH;
sc->dc_flags |= DC_TX_USE_TX_INTR;
==== //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#3 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.50 2006/06/07 12:26:23 glebius Exp $
+ * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.51 2006/06/08 08:15:21 glebius Exp $
*/
/*
@@ -1013,7 +1013,8 @@
/*
* Linksys device IDs.
*/
-#define DC_DEVICEID_PCMPC200 0xab08
+#define DC_DEVICEID_PCMPC200_AB08 0xab08
+#define DC_DEVICEID_PCMPC200_AB09 0xab09
#define DC_DEVID(vendor, device) ((device) << 16 | (vendor))
==== //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.30 2005/09/11 18:39:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.31 2006/06/08 17:54:10 njl Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -52,7 +52,9 @@
#include <i386/bios/apm.h>
-uint32_t acpi_reset_video = 1;
+uint32_t acpi_resume_beep;
+TUNABLE_INT("hw.acpi.resume_beep", &acpi_resume_beep);
+uint32_t acpi_reset_video;
TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
static int intr_model = ACPI_INTR_PIC;
@@ -320,6 +322,10 @@
SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
+ "resume_beep", CTLFLAG_RD | CTLFLAG_RW, &acpi_resume_beep, 0,
+ "Beep the PC speaker when resuming");
+ SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
+ SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
"reset_video", CTLFLAG_RD | CTLFLAG_RW, &acpi_reset_video, 0,
"Call the VESA reset BIOS vector on the resume path");
==== //depot/projects/dtrace/src/sys/i386/acpica/acpi_wakecode.S#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.10 2005/04/22 09:53:04 iedowse Exp $
+ * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.11 2006/06/08 17:54:10 njl Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list