PERFORCE change 34376 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Jul 11 14:54:06 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34376
Change 34376 by marcel at marcel_nfs on 2003/07/11 14:53:23
IFC @34375
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#74 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#12 integrate
.. //depot/projects/ia64/rescue/rescue/Makefile#4 integrate
.. //depot/projects/ia64/share/man/man4/wi.4#24 integrate
.. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#14 integrate
.. //depot/projects/ia64/sys/conf/options#56 integrate
.. //depot/projects/ia64/sys/conf/options.ia64#15 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bge.c#33 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#38 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs#28 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#28 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#42 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs.h#40 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#40 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#23 integrate
.. //depot/projects/ia64/sys/i386/i386/locore.s#12 integrate
.. //depot/projects/ia64/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/ia64/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#58 integrate
.. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#15 integrate
.. //depot/projects/ia64/usr.sbin/rarpd/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#7 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#74 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.378 2003/07/10 05:29:56 kris Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.380 2003/07/11 17:01:58 gordon Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -8,6 +8,7 @@
# -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries
+# -DNORESCUE do not build rescue binaries
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
@@ -66,7 +67,7 @@
.if exists(${.CURDIR}/libexec)
SUBDIR+= libexec
.endif
-.if exists(${.CURDIR}/rescue) && defined(RESCUE)
+.if exists(${.CURDIR}/rescue) && !defined(NORESCUE)
SUBDIR+= rescue
.endif
.if exists(${.CURDIR}/sbin)
@@ -667,7 +668,7 @@
_yacc= usr.bin/yacc
.endif
-.if defined(RESCUE) && \
+.if !defined(NORESCUE) && \
${BOOTSTRAPPING} < 501100
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -721,10 +722,15 @@
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
+.if exists(${.CURDIR}/rescue) && !defined(NORESCUE)
+_rescue= rescue/rescue
+.endif
+
build-tools:
.for _tool in \
bin/csh \
bin/sh \
+ ${_rescue} \
gnu/usr.bin/cc/cc_tools \
${_fortran} \
${_libkrb5} \
@@ -752,7 +758,7 @@
_btxld= usr.sbin/btxld
.endif
-.if (defined(RESCUE) || \
+.if (!defined(NORESCUE) || \
defined(RELEASEDIR)) && \
( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
_crunchide= usr.sbin/crunch/crunchide
==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#12 (text+ko) ====
@@ -1,6 +1,6 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.14 2003/07/11 05:33:24 kan Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.15 2003/07/11 18:55:58 kan Exp $ */
-#include <sys/param.h>
+#include <osreldate.h>
/* auto-host.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
==== //depot/projects/ia64/rescue/rescue/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.5 2003/06/30 21:13:56 gordon Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.6 2003/07/11 16:57:43 gordon Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
PROG= rescue
@@ -47,6 +47,8 @@
# Define compile-time RESCUE symbol when compiling components
CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS=-DRESCUE
+# An experiment that failed: try overriding bsd.lib.mk and bsd.prog.mk
+# rather than incorporating rescue-specific logic into standard files.
#MAKEFLAGS= -m ${.CURDIR} ${.MAKEFLAGS}
# Hackery: 'librescue' exists merely as a tool for appropriately
@@ -244,14 +246,20 @@
$(OUTPUTS): $(CONF)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -q -m $(OUTMK) -c $(OUTC) $(CONF)
-# -m here forces make to treat the bsd.prog.mk and bsd.lib.mk in
-# this directory as overrides for the standard shared ones.
$(PROG): $(OUTPUTS)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK)
objs:
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs
+# <sigh> Someone should replace the bin/csh and bin/sh build-tools with
+# shell scripts so we can remove this nonsense.
+build-tools:
+.for _tool in bin/csh bin/sh
+ cd ${.CURDIR}/../../${_tool}; \
+ MAKEOBJDIRPREFIX=${CRUNCHOBJS} make DIRPRFX=rescue/${_tool} build-tools
+.endfor
+
# Use a separate build tree to hold files compiled for this crunchgen binary
# Yes, this does seem to partly duplicate bsd.subdir.mk, but I can't
# get that to cooperate with bsd.prog.mk. Besides, many of the standard
==== //depot/projects/ia64/share/man/man4/wi.4#24 (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.46 2003/07/05 00:31:51 imp Exp $
+.\" $FreeBSD: src/share/man/man4/wi.4,v 1.47 2003/07/11 09:25:18 imp Exp $
.\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
.\"
.Dd February 17, 2003
@@ -146,6 +146,7 @@
Agere Orinoco Hermes PCMCIA
Allied Telesis WR211PCM Prism-II PCMCIA
ArTem OnAir Prism? PCMCIA
+Asus WL100 Prism-2.5 PCMCIA
Avaya Wireless Prism-II PCMCIA
Bay eMobility 11B Prism-2.5? PCMCIA
Blue Concentric Circle WL-379F Prism-II CF
==== //depot/projects/ia64/sys/boot/sparc64/loader/main.c#14 (text+ko) ====
@@ -6,7 +6,7 @@
* As long as the above copyright statement and this notice remain
* unchanged, you can do what ever you want with this file.
*
- * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.20 2003/06/15 19:16:43 jake Exp $
+ * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.21 2003/07/11 16:12:50 tmm Exp $
*/
/*
* FreeBSD/sparc64 kernel loader - machine dependent part
@@ -115,7 +115,7 @@
#ifdef LOADER_BZIP2_SUPPORT
&bzipfs_fsops,
#endif
-#ifdef LOADER_NET_SUPPORT
+#ifdef LOADER_NFS_SUPPORT
&nfs_fsops,
#endif
#ifdef LOADER_TFTP_SUPPORT
==== //depot/projects/ia64/sys/conf/options#56 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.400 2003/06/26 09:50:51 smkelly Exp $
+# $FreeBSD: src/sys/conf/options,v 1.401 2003/07/11 17:04:37 imp Exp $
#
# On the handling of kernel options
#
@@ -457,7 +457,7 @@
# These cause changes all over the kernel
BLKDEV_IOSIZE opt_global.h
-BURN_BRIDGES opt_gloabl.h
+BURN_BRIDGES opt_global.h
DEBUG opt_global.h
DEBUG_LOCKS opt_global.h
DEBUG_VFS_LOCKS opt_global.h
==== //depot/projects/ia64/sys/conf/options.ia64#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.ia64,v 1.19 2003/06/18 15:25:01 jake Exp $
+# $FreeBSD: src/sys/conf/options.ia64,v 1.20 2003/07/11 08:47:15 marcel Exp $
# Options specific to the ia64 platform kernels
ITANIUM opt_global.h
@@ -10,6 +10,8 @@
PAGE_SIZE_8K opt_global.h
PAGE_SIZE_16K opt_global.h
+UWX_TRACE_ENABLE opt_global.h
+
PPC_PROBE_CHIPSET opt_ppc.h
PPC_DEBUG opt_ppc.h
==== //depot/projects/ia64/sys/dev/bge/if_bge.c#33 (text+ko) ====
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.42 2003/05/31 20:42:24 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.43 2003/07/11 08:19:52 wpaul Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2045,6 +2045,7 @@
struct bge_softc *sc;
struct ifnet *ifp;
u_int32_t statusword;
+ u_int32_t status;
sc = xsc;
ifp = &sc->arpcom.ac_if;
@@ -2073,7 +2074,6 @@
*/
if (sc->bge_asicrev == BGE_ASICREV_BCM5700) {
- u_int32_t status;
status = CSR_READ_4(sc, BGE_MAC_STS);
if (status & BGE_MACSTAT_MI_INTERRUPT) {
@@ -2089,9 +2089,24 @@
}
} else {
if (statusword & BGE_STATFLAG_LINKSTATE_CHANGED) {
- sc->bge_link = 0;
- untimeout(bge_tick, sc, sc->bge_stat_ch);
- bge_tick(sc);
+ /*
+ * Sometimes PCS encoding errors are detected in
+ * TBI mode (on fiber NICs), and for some reason
+ * the chip will signal them as link changes.
+ * If we get a link change event, but the 'PCS
+ * encoding error' bit in the MAC status register
+ * is set, don't bother doing a link check.
+ * This avoids spurious "gigabit link up" messages
+ * that sometimes appear on fiber NICs during
+ * periods of heavy traffic. (There should be no
+ * effect on copper NICs.)
+ */
+ status = CSR_READ_4(sc, BGE_MAC_STS);
+ if (!(status & BGE_MACSTAT_PORT_DECODE_ERROR)) {
+ sc->bge_link = 0;
+ untimeout(bge_tick, sc, sc->bge_stat_ch);
+ bge_tick(sc);
+ }
/* Clear the interrupt */
CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED|
BGE_MACSTAT_CFG_CHANGED);
==== //depot/projects/ia64/sys/dev/fxp/if_fxp.c#38 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.186 2003/07/03 14:00:56 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.187 2003/07/11 20:49:36 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1550,8 +1550,8 @@
if (ether_poll_register(fxp_poll, ifp)) {
/* disable interrupts */
CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE);
+ FXP_UNLOCK(sc);
fxp_poll(ifp, 0, 1);
- FXP_UNLOCK(sc);
return;
}
#endif
==== //depot/projects/ia64/sys/dev/pccard/pccarddevs#28 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.53 2003/06/17 12:29:20 imp Exp $
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.56 2003/07/11 13:50:31 simokawa Exp $
/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
@@ -93,6 +93,7 @@
vendor BUFFALO 0x026f BUFFALO (Melco Corporation)
vendor LINKSYS2 0x0274 The Linksys Group
vendor IODATA2 0x028a I-O DATA
+vendor ASUS 0x02aa ASUS
vendor NWN 0x0602 No Wires Needed
vendor BREEZECOM 0x0a02 BreezeCOM
vendor NEWMEDIA2 0x10cd NewMedia
@@ -158,6 +159,9 @@
/* ARtem */
product ARTEM ONAIR 0x0001 ARtem OnAir
+/* ASUS WL-100 */
+product ASUS WL100 0x0002 ASUS SpaceLink WL-100 Wireless LAN
+
/* Bay Networks */
product BAY STACK_650 0x0804 BayStack 650 Wireless LAN
product BAY SURFER_PRO 0x0806 AirSurfer Pro Wireless LAN
==== //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#28 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.53 2003/06/17 12:29:49 imp Exp $ */
+/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.56 2003/07/11 13:50:31 simokawa Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.53 2003/06/17 12:29:20 imp Exp
+ * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.55 2003/07/11 09:16:40 imp Exp
*/
/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
@@ -100,6 +100,7 @@
#define PCMCIA_VENDOR_BUFFALO 0x026f /* BUFFALO (Melco Corporation) */
#define PCMCIA_VENDOR_LINKSYS2 0x0274 /* The Linksys Group */
#define PCMCIA_VENDOR_IODATA2 0x028a /* I-O DATA */
+#define PCMCIA_VENDOR_ASUS 0x02aa /* ASUS */
#define PCMCIA_VENDOR_NWN 0x0602 /* No Wires Needed */
#define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */
#define PCMCIA_VENDOR_NEWMEDIA2 0x10cd /* NewMedia */
@@ -205,6 +206,11 @@
#define PCMCIA_PRODUCT_ARTEM_ONAIR 0x0001
#define PCMCIA_STR_ARTEM_ONAIR "ARtem OnAir"
+/* ASUS WL-100 */
+#define PCMCIA_CIS_ASUS_WL100 { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_ASUS_WL100 0x0002
+#define PCMCIA_STR_ASUS_WL100 "ASUS SpaceLink WL-100 Wireless LAN"
+
/* Bay Networks */
#define PCMCIA_CIS_BAY_STACK_650 { NULL, NULL, NULL, NULL }
#define PCMCIA_PRODUCT_BAY_STACK_650 0x0804
==== //depot/projects/ia64/sys/dev/usb/usbdevs#42 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.131 2003/07/10 18:43:16 wpaul Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.132 2003/07/11 21:17:29 joe Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -147,6 +147,7 @@
vendor IIYAMA 0x04e1 Iiyama
vendor SHUTTLE 0x04e6 Shuttle Technology
vendor ANNABOOKS 0x04ed Annabooks
+vendor JVC 0x04f1 JVC
vendor CHICONY 0x04f2 Chicony Electronics
vendor BROTHER 0x04f9 Brother Industries
vendor DALLAS 0x04fa Dallas Semiconductor
@@ -308,6 +309,7 @@
vendor ALATION 0x0910 Alation Systems
vendor GOHUBS 0x0921 GoHubs
vendor BIOMETRIC 0x0929 American Biometric Company
+vendor TOSHIBA 0x0930 Toshiba Corporation
vendor YANO 0x094f Yano
vendor KINGSTON 0x0951 Kingston Technology
vendor BLUEWATER 0x0956 BlueWater Systems
@@ -733,6 +735,9 @@
product IOMEGA ZIP100 0x0001 Zip 100
product IOMEGA ZIP250 0x0030 Zip 250
+/* JVC products */
+product JVC GR_DX95 0x000a GR-DX95
+
/* JRC products */
product JRC AH_J3001V_J3002V 0x0001 AirH\" PHONE AH-J3001V/J3002V
@@ -1134,6 +1139,9 @@
/* Thrustmaster products */
product THRUST FUSION_PAD 0xa0a3 Fusion Digital Gamepad
+/* Toshiba Corporation products */
+product TOSHIBA POCKETPC_E740 0x0706 PocketPC e740
+
/* Trek Technology products */
product TREK THUMBDRIVE 0x1111 ThumbDrive
product TREK THUMBDRIVE_8MB 0x9988 ThumbDrive_8MB
==== //depot/projects/ia64/sys/dev/usb/usbdevs.h#40 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.139 2003/07/10 18:43:39 wpaul Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.140 2003/07/11 21:17:53 joe Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.131 2003/07/10 18:43:16 wpaul Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.132 2003/07/11 21:17:29 joe Exp
*/
/*
@@ -154,6 +154,7 @@
#define USB_VENDOR_IIYAMA 0x04e1 /* Iiyama */
#define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */
#define USB_VENDOR_ANNABOOKS 0x04ed /* Annabooks */
+#define USB_VENDOR_JVC 0x04f1 /* JVC */
#define USB_VENDOR_CHICONY 0x04f2 /* Chicony Electronics */
#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */
#define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */
@@ -315,6 +316,7 @@
#define USB_VENDOR_ALATION 0x0910 /* Alation Systems */
#define USB_VENDOR_GOHUBS 0x0921 /* GoHubs */
#define USB_VENDOR_BIOMETRIC 0x0929 /* American Biometric Company */
+#define USB_VENDOR_TOSHIBA 0x0930 /* Toshiba Corporation */
#define USB_VENDOR_YANO 0x094f /* Yano */
#define USB_VENDOR_KINGSTON 0x0951 /* Kingston Technology */
#define USB_VENDOR_BLUEWATER 0x0956 /* BlueWater Systems */
@@ -740,6 +742,9 @@
#define USB_PRODUCT_IOMEGA_ZIP100 0x0001 /* Zip 100 */
#define USB_PRODUCT_IOMEGA_ZIP250 0x0030 /* Zip 250 */
+/* JVC products */
+#define USB_PRODUCT_JVC_GR_DX95 0x000a /* GR-DX95 */
+
/* JRC products */
#define USB_PRODUCT_JRC_AH_J3001V_J3002V 0x0001 /* AirH\" PHONE AH-J3001V/J3002V */
@@ -1141,6 +1146,9 @@
/* Thrustmaster products */
#define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */
+/* Toshiba Corporation products */
+#define USB_PRODUCT_TOSHIBA_POCKETPC_E740 0x0706 /* PocketPC e740 */
+
/* Trek Technology products */
#define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */
#define USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988 /* ThumbDrive_8MB */
==== //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#40 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.139 2003/07/10 18:43:39 wpaul Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.140 2003/07/11 21:17:53 joe Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.131 2003/07/10 18:43:16 wpaul Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.132 2003/07/11 21:17:29 joe Exp
*/
/*
@@ -1372,6 +1372,12 @@
"Zip 250",
},
{
+ USB_VENDOR_JVC, USB_PRODUCT_JVC_GR_DX95,
+ 0,
+ "JVC",
+ "GR-DX95",
+ },
+ {
USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
0,
"Japan Radio Company",
@@ -2800,6 +2806,12 @@
"Fusion Digital Gamepad",
},
{
+ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740,
+ 0,
+ "Toshiba Corporation",
+ "PocketPC e740",
+ },
+ {
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
0,
"Trek Technology",
@@ -3448,6 +3460,12 @@
NULL,
},
{
+ USB_VENDOR_JVC, 0,
+ USB_KNOWNDEV_NOPROD,
+ "JVC",
+ NULL,
+ },
+ {
USB_VENDOR_CHICONY, 0,
USB_KNOWNDEV_NOPROD,
"Chicony Electronics",
@@ -4414,6 +4432,12 @@
NULL,
},
{
+ USB_VENDOR_TOSHIBA, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Toshiba Corporation",
+ NULL,
+ },
+ {
USB_VENDOR_YANO, 0,
USB_KNOWNDEV_NOPROD,
"Yano",
==== //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#23 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.29 2003/07/07 07:57:35 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.30 2003/07/11 09:19:04 imp Exp $");
#include "opt_wi.h"
@@ -129,6 +129,7 @@
PCMCIA_CARD(ADDTRON, AWP100, 0),
PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0),
PCMCIA_CARD(ARTEM, ONAIR, 0),
+ PCMCIA_CARD(ASUS, WL100, 0),
PCMCIA_CARD(BAY, EMOBILITY_11B, 0),
PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0),
PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0),
==== //depot/projects/ia64/sys/i386/i386/locore.s#12 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/i386/i386/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $
+ * $FreeBSD: src/sys/i386/i386/locore.s,v 1.172 2003/07/11 21:39:25 peter Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -275,29 +275,13 @@
call identify_cpu
-/* clear bss */
/*
- * XXX this should be done a little earlier.
- *
- * XXX we don't check that there is memory for our bss and page tables
- * before using it.
- *
- * XXX the boot program somewhat bogusly clears the bss. We still have
- * to do it in case we were unzipped by kzipboot. Then the boot program
- * only clears kzipboot's bss.
- *
- * XXX the gdt and idt are still somewhere in the boot program. We
- * depend on the convention that the boot program is below 1MB and we
- * are above 1MB to keep the gdt and idt away from the bss and page
- * tables.
+ * We used to clear BSS here, but it isn't needed anymore and actually
+ * causes harm. gcc now optimizes 'int foo = 0' to be uninitialized in
+ * the bss. All the supported loaders already zero the bss. The a.out
+ * kgzip case does not, but we do not generate a.out kernels anymore.
+ * This is trivial to fix anyway, is a bug in kgzip.
*/
- movl $R(end),%ecx
- movl $R(edata),%edi
- subl %edi,%ecx
- xorl %eax,%eax
- cld
- rep
- stosb
call create_pagetables
==== //depot/projects/ia64/sys/ia64/ia64/exception.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/ia64/ia64/exception.S,v 1.47 2003/07/02 12:57:07 ru Exp $
+ * $FreeBSD: src/sys/ia64/ia64/exception.S,v 1.48 2003/07/11 08:49:26 marcel Exp $
*/
#include <machine/asm.h>
@@ -608,8 +608,7 @@
ivt_##name:
#define IVT_END(name) \
- .endp ivt_##name; \
- .align 0x100
+ .endp ivt_##name
/*
* The IA64 Interrupt Vector Table (IVT) contains 20 slots with 64
==== //depot/projects/ia64/sys/ia64/ia64/syscall.S#2 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/syscall.S,v 1.4 2003/07/02 12:57:07 ru Exp $
+ * $FreeBSD: src/sys/ia64/ia64/syscall.S,v 1.5 2003/07/11 08:52:48 marcel Exp $
*/
#include <sys/syscall.h>
@@ -249,6 +249,7 @@
.prologue
.unwabi @svr4, 'E'
.save rp, r0
+ .body
{ .mmi
mov r16=ar.rsc
mov ar.rsc=0
==== //depot/projects/ia64/sys/kern/kern_sig.c#58 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.249 2003/07/05 08:37:40 mtm Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.250 2003/07/11 13:42:23 davidxu Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -1553,10 +1553,11 @@
/*
* If we know the signal is bound for a specific thread then we
* assume that we are in that threads context. This is the case
- * for SIGXCPU, SIGILL, etc. Otherwise someone did a kill() from
- * userland and the real thread doesn't actually matter.
+ * for SIGXCPU, SIGILL, etc. Otherwise someone did a kill() from
+ * userland, if current thread can handle the signal, it should
+ * get the signal.
*/
- if ((prop & SA_PROC) != 0 && curthread->td_proc == p)
+ if (curthread->td_proc == p && !SIGISMEMBER(curthread->td_sigmask, sig))
return (curthread);
/*
==== //depot/projects/ia64/usr.bin/xinstall/xinstall.c#15 (text+ko) ====
@@ -44,7 +44,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.61 2002/11/30 23:12:59 fenner Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.62 2003/07/11 20:51:16 phk Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -97,7 +97,7 @@
u_long numeric_id(const char *, const char *);
void strip(const char *);
int trymmap(int);
-void usage(void);
+void usage(int);
int
main(int argc, char *argv[])
@@ -165,18 +165,18 @@
break;
case '?':
default:
- usage();
+ usage(__LINE__);
}
argc -= optind;
argv += optind;
/* some options make no sense when creating directories */
if (dostrip && dodir)
- usage();
+ usage(__LINE__);
/* must have at least two arguments, except when creating directories */
if (argc < 2 && !dodir)
- usage();
+ usage(__LINE__);
/* need to make a temp copy so we can compare stripped version */
if (docompare && dostrip)
@@ -216,7 +216,7 @@
/* can't do file1 file2 directory/file */
if (argc != 2)
- usage();
+ usage(__LINE__);
if (!no_target) {
if (stat(*argv, &from_sb))
@@ -757,14 +757,15 @@
* print a usage message and die
*/
void
-usage(void)
+usage(int line)
{
- (void)fprintf(stderr, "\
-usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n\
- [-o owner] file1 file2\n\
- install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n\
- [-o owner] file1 ... fileN directory\n\
- install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n");
+ (void)fprintf(stderr, "line %d\n"
+"usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+" [-o owner] file1 file2\n"
+" install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+" [-o owner] file1 ... fileN directory\n"
+" install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n",
+ line);
exit(EX_USAGE);
/* NOTREACHED */
}
==== //depot/projects/ia64/usr.sbin/rarpd/Makefile#2 (text+ko) ====
@@ -1,12 +1,11 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD: src/usr.sbin/rarpd/Makefile,v 1.12 2001/07/20 06:20:16 obrien Exp $
+# $FreeBSD: src/usr.sbin/rarpd/Makefile,v 1.14 2003/07/11 17:15:19 mux Exp $
PROG= rarpd
MAN= rarpd.8
-WARNS?= 2
+WARNS?= 3
# This breaks with format strings returned by expand_syslog_m().. argh!
#FORMAT_AUDIT?= 1
-CFLAGS+= -DTFTP_DIR=\"/tftpboot\"
.include <bsd.prog.mk>
==== //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.35 2003/06/15 03:00:22 jmg Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.37 2003/07/11 14:20:50 mux Exp $");
/*
* rarpd - Reverse ARP Daemon
@@ -56,7 +56,9 @@
#include <arpa/inet.h>
+#include <dirent.h>
#include <errno.h>
+#include <ifaddrs.h>
#include <netdb.h>
#include <stdarg.h>
#include <stdio.h>
@@ -65,16 +67,6 @@
#include <stdlib.h>
#include <unistd.h>
-#if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */
-#define HAVE_DIRENT_H
-#endif
-
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#endif
-
/* Cast a struct sockaddr to a structaddr_in */
#define SATOSIN(sa) ((struct sockaddr_in *)(sa))
@@ -82,42 +74,20 @@
#define TFTP_DIR "/tftpboot"
#endif
-#if BSD >= 199200
#define ARPSECS (20 * 60) /* as per code in netinet/if_ether.c */
#define REVARP_REQUEST ARPOP_REVREQUEST
#define REVARP_REPLY ARPOP_REVREPLY
-#endif
-
-#ifndef ETHERTYPE_REVARP
-#define ETHERTYPE_REVARP 0x8035
-#define REVARP_REQUEST 3
-#define REVARP_REPLY 4
-#endif
-
-/*
- * Map field names in ether_arp struct. What a pain in the neck.
- */
-#ifdef SUNOS3
-#undef arp_sha
-#undef arp_spa
-#undef arp_tha
-#undef arp_tpa
-#define arp_sha arp_xsha
-#define arp_spa arp_xspa
-#define arp_tha arp_xtha
-#define arp_tpa arp_xtpa
-#endif
/*
* The structure for each interface.
*/
struct if_info {
- struct if_info *ii_next;
- int ii_fd; /* BPF file descriptor */
- in_addr_t ii_ipaddr; /* IP address of this interface */
- in_addr_t ii_netmask; /* subnet or net mask */
- u_char ii_eaddr[6]; /* Ethernet address of this interface */
- char ii_ifname[sizeof(((struct ifreq *)0)->ifr_name) + 1];
+ struct if_info *ii_next;
+ int ii_fd; /* BPF file descriptor */
+ in_addr_t ii_ipaddr; /* IP address */
+ in_addr_t ii_netmask; /* subnet or net mask */
+ u_char ii_eaddr[ETHER_ADDR_LEN]; /* ethernet address */
+ char ii_ifname[IF_NAMESIZE];
};
/*
@@ -127,7 +97,6 @@
struct if_info *iflist;
int verbose; /* verbose messages */
-int s; /* inet datagram socket */
const char *tftp_dir = TFTP_DIR; /* tftp directory */
int dflag; /* messages to stdout/stderr, not syslog(3) */
@@ -140,7 +109,7 @@
static char *eatoa(u_char *);
static int expand_syslog_m(const char *fmt, char **newfmt);
static void init(char *);
-static void init_one(struct ifreq *, char *);
+static void init_one(struct ifaddrs *, char *);
static char *intoa(in_addr_t);
static in_addr_t ipaddrtonetmask(in_addr_t);
static void logmsg(int, const char *, ...) __printflike(2, 3);
@@ -230,48 +199,32 @@
/*
* Add to the interface list.
*/
-void
-init_one(struct ifreq *ifrp, char *target)
+static void
+init_one(struct ifaddrs *ifa, char *target)
{
struct if_info *ii;
struct sockaddr_dl *ll;
int family;
- struct ifreq ifr;
- family = ifrp->ifr_addr.sa_family;
+ family = ifa->ifa_addr->sa_family;
switch (family) {
-
case AF_INET:
-#if BSD >= 199100
case AF_LINK:
-#endif
- (void)strncpy(ifr.ifr_name, ifrp->ifr_name,
- sizeof(ifrp->ifr_name));
- if (ioctl(s, SIOCGIFFLAGS, (char *)&ifr) == -1) {
- logmsg(LOG_ERR,
- "SIOCGIFFLAGS: %.*s: %m",
- (int)sizeof(ifrp->ifr_name), ifrp->ifr_name);
- exit(1);
- }
- if ((ifr.ifr_flags & IFF_UP) == 0 ||
- (ifr.ifr_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) != 0)
+ if (!(ifa->ifa_flags & IFF_UP) ||
+ (ifa->ifa_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)))
return;
break;
-
-
default:
return;
}
/* Don't bother going any further if not the target interface */
- if (target != NULL &&
- strncmp(ifrp->ifr_name, target, sizeof(ifrp->ifr_name)) != 0)
+ if (target != NULL && strcmp(ifa->ifa_name, target) != 0)
return;
/* Look for interface in list */
for (ii = iflist; ii != NULL; ii = ii->ii_next)
- if (strncmp(ifrp->ifr_name, ii->ii_ifname,
- sizeof(ifrp->ifr_name)) == 0)
+ if (strcmp(ifa->ifa_name, ii->ii_ifname) == 0)
break;
/* Allocate a new one if not found */
@@ -283,92 +236,49 @@
}
bzero(ii, sizeof(*ii));
ii->ii_fd = -1;
- (void)strncpy(ii->ii_ifname, ifrp->ifr_name,
- sizeof(ifrp->ifr_name));
- ii->ii_ifname[sizeof(ii->ii_ifname) - 1] = '\0';
+ strlcpy(ii->ii_ifname, ifa->ifa_name, sizeof(ii->ii_ifname));
ii->ii_next = iflist;
iflist = ii;
}
switch (family) {
-
case AF_INET:
- if (ioctl(s, SIOCGIFADDR, (char *)&ifr) == -1) {
- logmsg(LOG_ERR, "ipaddr SIOCGIFADDR: %s: %m",
- ii->ii_ifname);
- exit(1);
- }
- ii->ii_ipaddr = SATOSIN(&ifr.ifr_addr)->sin_addr.s_addr;
- if (ioctl(s, SIOCGIFNETMASK, (char *)&ifr) == -1) {
- logmsg(LOG_ERR, "SIOCGIFNETMASK: %m");
- exit(1);
- }
- ii->ii_netmask = SATOSIN(&ifr.ifr_addr)->sin_addr.s_addr;
+ ii->ii_ipaddr = SATOSIN(ifa->ifa_addr)->sin_addr.s_addr;
+ ii->ii_netmask = SATOSIN(ifa->ifa_netmask)->sin_addr.s_addr;
if (ii->ii_netmask == 0)
ii->ii_netmask = ipaddrtonetmask(ii->ii_ipaddr);
- if (ii->ii_fd < 0) {
+ if (ii->ii_fd < 0)
ii->ii_fd = rarp_open(ii->ii_ifname);
-#if BSD < 199100
- /* Use BPF descriptor to get ethernet address. */
- if (ioctl(ii->ii_fd, SIOCGIFADDR, (char *)&ifr) == -1) {
- logmsg(LOG_ERR, "eaddr SIOCGIFADDR: %s: %m",
- ii->ii_ifname);
- exit(1);
- }
- bcopy(&ifr.ifr_addr.sa_data[0], ii->ii_eaddr, 6);
-#endif
- }
break;
-#if BSD >= 199100
- case AF_LINK:
- ll = (struct sockaddr_dl *)&ifrp->ifr_addr;
- if (ll->sdl_type == IFT_ETHER)
- bcopy(LLADDR(ll), ii->ii_eaddr, 6);
- break;
-#endif
- }
+ case AF_LINK:
+ ll = (struct sockaddr_dl *)ifa->ifa_addr;
+ if (ll->sdl_type == IFT_ETHER)
+ bcopy(LLADDR(ll), ii->ii_eaddr, 6);
+ break;
+ }
}
/*
* Initialize all "candidate" interfaces that are in the system
* configuration list. A "candidate" is up, not loopback and not
* point to point.
*/
-void
+static void
init(char *target)
{
- u_int n;
- struct ifreq *ifrp, *ifend;
struct if_info *ii, *nii, *lii;
- struct ifconf ifc;
- struct ifreq ibuf[16];
+ struct ifaddrs *ifhead, *ifa;
+ int error;
- if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
- logmsg(LOG_ERR, "socket: %m");
+ error = getifaddrs(&ifhead);
+ if (error) {
+ logmsg(LOG_ERR, "getifaddrs: %m");
exit(1);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list