PERFORCE change 123545 for review
Jesper Brix Rosenkilde
jbr at FreeBSD.org
Sun Jul 15 18:37:10 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123545
Change 123545 by jbr at jbr_bob on 2007/07/15 18:36:02
Integrate to newest current
Affected files ...
.. //depot/projects/soc2007/jbr-syscall/src/sys/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/board.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/00READ#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/README#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/TODO#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/cnode.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_fbsd.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_io.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_kernel.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_opstats.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_pioctl.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.c#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/files#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/options#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/altq/altq/altq_subr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/fb/splash_bmp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewirereg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/LICENSE#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_82598.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_api.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_api.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_common.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_common.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_osdep.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_phy.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_phy.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_type.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_ruereg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usb_quirks.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/README#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/TODO#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/cnode.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_fbsd.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_io.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_kernel.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_namecache.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_namecache.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_opstats.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_pioctl.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_psdev.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_psdev.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_subr.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_subr.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_venus.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_venus.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vfsops.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vfsops.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vnops.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vnops.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/include/pc/vesa.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_event.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netatm/atm_proto.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_cc_functions.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_cc_functions.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_timer.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/udp_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_output.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agppriv.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agpreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_page.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_page.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_zeroidle.c#2 integrate
Differences ...
==== //depot/projects/soc2007/jbr-syscall/src/sys/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $
+# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
.endif
# Directories to include in cscope name file and TAGS.
-CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
+CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \
i4b isa kern libkern modules net net80211 netatalk netatm \
netgraph netinet netinet6 netipsec netipx netnatm netncp \
netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -1023,7 +1023,8 @@
VM_PROT_ALL,
linux_copyout_strings,
exec_linux_setregs,
- linux32_fixlimit
+ linux32_fixlimit,
+ &linux32_maxssiz,
};
static Elf32_Brandinfo linux_brand = {
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile.inc#2 (text) ====
@@ -1,12 +1,12 @@
-# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.6 2006/12/20 17:47:54 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $
.if !target(__at91_boot_Makefile.inc__)
.PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm
__at91_boot_Makefile.inc__:
-# tsc, bwct, kb920x are the supported flavors
-BOOT_FLAVOR=kb920x
+# tsc, bwct, kb920x, centipad are the supported flavors
+BOOT_FLAVOR?=kb920x
CFLAGS=-Os -mcpu=arm9 -ffreestanding \
-I${.CURDIR}/../libat91 \
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/board.h#2 (text+ko) ====
@@ -21,8 +21,9 @@
* (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/boot/arm/at91/boot2/board.h,v 1.1 2006/11/09 20:07:26 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $
*/
void Update(void);
void board_init(void);
+int drvread(void *, unsigned, unsigned);
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@@ -26,9 +26,7 @@
#include <stdarg.h>
-#include "emac.h"
#include "lib.h"
-#include "sd-card.h"
#include "board.h"
#define RBX_ASKNAME 0x0 /* -a */
@@ -84,8 +82,6 @@
RBX_VERBOSE
};
-unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
-
unsigned dsk_start;
static char cmd[512];
static char kname[1024];
@@ -96,7 +92,6 @@
static int parse(void);
static int xfsread(ino_t, void *, size_t);
static int dskread(void *, unsigned, unsigned);
-static int drvread(void *, unsigned, unsigned);
#include "ufsread.c"
@@ -147,10 +142,6 @@
ino_t ino;
board_init();
- EMAC_Init();
- EMAC_SetMACAddress(mac);
- while (sdcard_init() == 0)
- printf("Looking for SD card\n");
dmadat = (void *)(0x20000000 + (16 << 20));
/* Process configuration file */
@@ -179,14 +170,11 @@
xputchar('\n');
autoboot = 0;
c = 0;
- printf("cmd is '%s'\n", cmd);
if (parse())
xputchar('\a');
#ifdef XMODEM_DL
else if (*cmd == '*')
- Update();
- else if (*cmd == '#')
- reset();
+ Update();
#endif
else
load();
@@ -281,14 +269,14 @@
dp = (void *)(sec + DOSPARTOFF);
for (i = 0; i < NDOSPART; i++) {
if (dp[i].dp_typ == DOSPTYP_386BSD)
- break;
+ break;
}
if (i == NDOSPART)
- return -1;
+ return -1;
// Although dp_start is aligned within the disk partition structure,
// DOSPARTOFF is 446, which is only word (2) aligned, not longword (4)
// aligned. Cope by using memcpy to fetch the start of this partition.
- memcpy(&dsk_start, &dp[i].dp_start, 4);
+ memcpy(&dsk_start, &dp[1].dp_start, 4);
if (drvread(sec, dsk_start + LABELSECTOR, 1))
return -1;
d = (void *)(sec + LABELOFFSET);
@@ -306,12 +294,3 @@
}
return drvread(buf, dsk_start + lba, nblk);
}
-
-static int
-drvread(void *buf, unsigned lba, unsigned nblk)
-{
- static unsigned c = 0x2d5c7c2f;
-
- printf("%c\b", c = c << 8 | c >> 24);
- return (MCI_read((char *)buf, lba << 9, nblk << 9));
-}
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ====
@@ -24,15 +24,16 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.3 2006/11/09 20:08:46 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $");
#include <sys/param.h>
#include "emac.h"
#include "lib.h"
#include "board.h"
+#include "sd-card.h"
-extern unsigned char mac[];
+unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
static void
MacFromEE()
@@ -40,7 +41,7 @@
uint32_t sig;
sig = 0;
ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig));
- if (sig != 0xaa55aa55)
+ if (sig != 0x92021054)
return;
ReadEEPROM(12 * 1024 + 4, mac, 6);
printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
@@ -57,4 +58,14 @@
{
InitEEPROM();
MacFromEE();
+ EMAC_Init();
+ EMAC_SetMACAddress(mac);
+ while (sdcard_init() == 0)
+ printf("Looking for SD card\n");
+}
+
+int
+drvread(void *buf, unsigned lba, unsigned nblk)
+{
+ return (MCI_read((char *)buf, lba << 9, nblk << 9));
}
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/Makefile#2 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.8 2007/03/15 03:31:49 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -8,7 +8,7 @@
putchar.c printf.c reset.c spi_flash.c xmodem.c \
sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \
memset.c memcmp.c
-SRCS+=ashldi3.c divsi3.S
+SRCS+=ashldi3.c divsi3.c
NO_MAN=
.if ${MK_TAG_LIST} != "no"
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 (text) ====
@@ -24,7 +24,7 @@
* This software is derived from software provide by Kwikbyte who specifically
* disclaimed copyright on the code.
*
- * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $
*/
#include "at91rm9200.h"
@@ -62,7 +62,7 @@
AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10;
#endif
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X)
AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 |
AT91C_PIO_PC20;
AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 |
@@ -136,7 +136,11 @@
AT91C_BASE_EBI->EBI_CSA = value;
AT91C_BASE_SDRC->SDRC_CR =
+#ifdef KB9202_B
+ AT91C_SDRC_NC_10 |
+#else
AT91C_SDRC_NC_9 |
+#endif
AT91C_SDRC_NR_13 |
AT91C_SDRC_NB_4_BANKS |
AT91C_SDRC_CAS_2 |
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 (text) ====
@@ -21,7 +21,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/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $
*/
#ifndef _AT91RM9200_LOWLEVEL_H_
@@ -39,6 +39,14 @@
#define OSC_MAIN_MULT 90
#endif
+#ifdef BOOT_CENTIPAD
+/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */
+#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */
+#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS
+typedef unsigned short sdram_size_t;
+#define OSC_MAIN_MULT 90
+#endif
+
#ifdef BOOT_BWCT
/* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */
#define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.c#2 (text) ====
@@ -19,7 +19,7 @@
* only.
* END_BLOCK
*
- * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $
******************************************************************************/
#include "at91rm9200.h"
@@ -380,7 +380,7 @@
static void
MII_GetLinkSpeed(AT91PS_EMAC pEmac)
{
-#if defined(BOOT_TSC) | defined(BOOT_KB920X)
+#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
unsigned short stat2;
#endif
unsigned update;
@@ -394,7 +394,7 @@
update |= AT91C_EMAC_SPD;
update |= AT91C_EMAC_FD;
#endif
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG);
if (!(stat2 & MII_STS2_LINK))
return ;
==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.h#2 (text) ====
@@ -17,7 +17,7 @@
* only.
* END_BLOCK
*
- * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.5 2006/11/09 20:32:36 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $
*****************************************************************************/
@@ -114,7 +114,7 @@
/* MII registers definition */
#define MII_STS_REG 0x01
#define MII_STS_LINK_STAT 0x04
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
#define MII_STS2_REG 0x11
#define MII_STS2_LINK 0x400
#define MII_STS2_100TX 0x4000
==== //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $");
#include "opt_compat.h"
@@ -100,6 +100,13 @@
SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode");
+static u_long ia32_maxdsiz = IA32_MAXDSIZ;
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
+static u_long ia32_maxssiz = IA32_MAXSSIZ;
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
+static u_long ia32_maxvmem = IA32_MAXVMEM;
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
+
struct sysentvec ia32_freebsd_sysvec = {
FREEBSD32_SYS_MAXSYSCALL,
freebsd32_sysent,
@@ -126,7 +133,8 @@
VM_PROT_ALL,
ia32_copyout_strings,
ia32_setregs,
- ia32_fixlimit
+ ia32_fixlimit,
+ &ia32_maxssiz
};
@@ -273,13 +281,6 @@
return ((register_t *)stack_base);
}
-static u_long ia32_maxdsiz = IA32_MAXDSIZ;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
-static u_long ia32_maxssiz = IA32_MAXSSIZ;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
-static u_long ia32_maxvmem = IA32_MAXVMEM;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
-
static void
ia32_fixlimit(struct rlimit *rl, int which)
{
==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/NOTES#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1441 2007/07/05 15:33:13 gnn Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1444 2007/07/14 21:49:23 rwatson Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -558,14 +558,6 @@
# faster.. if you are not debugging don't use.
options SCTP_DEBUG
#
-# High speed enables sally floyds HS TCP optioin
-# for congestion control increase, use only in
-# very HS networks and with caution since I doubt
-# it will compete fairly with peers. For the big-bad
-# internet its best NOT to enable.
-#
-options SCTP_HIGH_SPEED
-#
# This option turns off the CRC32c checksum. Basically
# You will not be able to talk to anyone else that
# has not done this. Its more for expermentation to
@@ -634,7 +626,7 @@
options NETGRAPH_ATM_ATMPIF
options NETGRAPH_BLUETOOTH # ng_bluetooth(4)
options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4)
-options NETGRAPH_BLUETOOTH_H4 # ng_h4(4)
+# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE
options NETGRAPH_BLUETOOTH_HCI # ng_hci(4)
options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4)
options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4)
@@ -899,6 +891,8 @@
#
# ATM (HARP version) options
#
+# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE.
+#
# ATM_CORE includes the base ATM functionality code. This must be included
# for ATM support.
#
@@ -917,14 +911,14 @@
#
# The `harp' pseudo-driver makes all NATM interface drivers available to HARP.
#
-options ATM_CORE #core ATM protocol family
-options ATM_IP #IP over ATM support
-options ATM_SIGPVC #SIGPVC signalling manager
-options ATM_SPANS #SPANS signalling manager
-options ATM_UNI #UNI signalling manager
+#options ATM_CORE #core ATM protocol family
+#options ATM_IP #IP over ATM support
+#options ATM_SIGPVC #SIGPVC signalling manager
+#options ATM_SPANS #SPANS signalling manager
+#options ATM_UNI #UNI signalling manager
-device hfa #FORE PCA-200E ATM PCI
-device harp #Pseudo-interface for NATM
+#device hfa #FORE PCA-200E ATM PCI
+#device harp #Pseudo-interface for NATM
#####################################################################
==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/files#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1234 2007/07/05 15:28:59 mlaier Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -103,13 +103,6 @@
cam/scsi/scsi_sg.c optional sg
cam/scsi/scsi_targ_bh.c optional targbh
cam/scsi/scsi_target.c optional targ
-coda/coda_fbsd.c optional vcoda
-coda/coda_namecache.c optional vcoda
-coda/coda_psdev.c optional vcoda
-coda/coda_subr.c optional vcoda
-coda/coda_venus.c optional vcoda
-coda/coda_vfsops.c optional vcoda
-coda/coda_vnops.c optional vcoda
contrib/altq/altq/altq_cbq.c optional altq \
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/altq/altq/altq_cdnr.c optional altq
@@ -666,28 +659,28 @@
dev/fxp/if_fxp.c optional fxp
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
-dev/harp/if_harp.c optional harp pci
+#dev/harp/if_harp.c optional harp pci
dev/hatm/if_hatm.c optional hatm pci
dev/hatm/if_hatm_intr.c optional hatm pci
dev/hatm/if_hatm_ioctl.c optional hatm pci
dev/hatm/if_hatm_rx.c optional hatm pci
dev/hatm/if_hatm_tx.c optional hatm pci
-dev/hfa/fore_buffer.c optional hfa
-dev/hfa/fore_command.c optional hfa
-dev/hfa/fore_globals.c optional hfa
-dev/hfa/fore_if.c optional hfa
-dev/hfa/fore_init.c optional hfa
-dev/hfa/fore_intr.c optional hfa
-dev/hfa/fore_output.c optional hfa
-dev/hfa/fore_receive.c optional hfa
-dev/hfa/fore_stats.c optional hfa
-dev/hfa/fore_timer.c optional hfa
-dev/hfa/fore_transmit.c optional hfa
-dev/hfa/fore_vcm.c optional hfa
-#dev/hfa/hfa_eisa.c optional hfa eisa
-dev/hfa/hfa_freebsd.c optional hfa
-dev/hfa/hfa_pci.c optional hfa pci
-#dev/hfa/hfa_sbus.c optional hfa sbus
+#dev/hfa/fore_buffer.c optional hfa
+#dev/hfa/fore_command.c optional hfa
+#dev/hfa/fore_globals.c optional hfa
+#dev/hfa/fore_if.c optional hfa
+#dev/hfa/fore_init.c optional hfa
+#dev/hfa/fore_intr.c optional hfa
+#dev/hfa/fore_output.c optional hfa
+#dev/hfa/fore_receive.c optional hfa
+#dev/hfa/fore_stats.c optional hfa
+#dev/hfa/fore_timer.c optional hfa
+#dev/hfa/fore_transmit.c optional hfa
+#dev/hfa/fore_vcm.c optional hfa
+##dev/hfa/hfa_eisa.c optional hfa eisa
+#dev/hfa/hfa_freebsd.c optional hfa
+#dev/hfa/hfa_pci.c optional hfa pci
+##dev/hfa/hfa_sbus.c optional hfa sbus
dev/hifn/hifn7751.c optional hifn
dev/hme/if_hme.c optional hme
dev/hme/if_hme_pci.c optional hme pci
@@ -739,6 +732,16 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
+dev/ixgbe/ixgbe.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_phy.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_api.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_common.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_82598.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
dev/joy/joy_pccard.c optional joy pccard
@@ -1148,6 +1151,13 @@
dev/wl/if_wl.c optional wl isa
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
+fs/coda/coda_fbsd.c optional vcoda
+fs/coda/coda_namecache.c optional vcoda
+fs/coda/coda_psdev.c optional vcoda
+fs/coda/coda_subr.c optional vcoda
+fs/coda/coda_venus.c optional vcoda
+fs/coda/coda_vfsops.c optional vcoda
+fs/coda/coda_vnops.c optional vcoda
fs/deadfs/dead_vnops.c standard
fs/devfs/devfs_devs.c standard
fs/devfs/devfs_rule.c standard
@@ -1650,88 +1660,92 @@
netatalk/ddp_output.c optional netatalk
netatalk/ddp_pcb.c optional netatalk
netatalk/ddp_usrreq.c optional netatalk
-netatm/atm_aal5.c optional atm_core
-netatm/atm_cm.c optional atm_core
-netatm/atm_device.c optional atm_core
-netatm/atm_if.c optional atm_core
-netatm/atm_proto.c optional atm_core
-netatm/atm_signal.c optional atm_core
-netatm/atm_socket.c optional atm_core
-netatm/atm_subr.c optional atm_core
-netatm/atm_usrreq.c optional atm_core
-netatm/ipatm/ipatm_event.c optional atm_ip atm_core
-netatm/ipatm/ipatm_if.c optional atm_ip atm_core
-netatm/ipatm/ipatm_input.c optional atm_ip atm_core
-netatm/ipatm/ipatm_load.c optional atm_ip atm_core
-netatm/ipatm/ipatm_output.c optional atm_ip atm_core
-netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core
-netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core
-netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core
-netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core
-netatm/spans/spans_arp.c optional atm_spans atm_core \
- dependency "spans_xdr.h"
-netatm/spans/spans_cls.c optional atm_spans atm_core
-netatm/spans/spans_if.c optional atm_spans atm_core
-netatm/spans/spans_kxdr.c optional atm_spans atm_core
-netatm/spans/spans_msg.c optional atm_spans atm_core
-netatm/spans/spans_print.c optional atm_spans atm_core
-netatm/spans/spans_proto.c optional atm_spans atm_core
-netatm/spans/spans_subr.c optional atm_spans atm_core
-netatm/spans/spans_util.c optional atm_spans atm_core
-spans_xdr.h optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
- clean "spans_xdr.h" \
- no-obj no-implicit-rule
-spans_xdr.c optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
- clean "spans_xdr.c" \
- no-obj no-implicit-rule local
-spans_xdr.o optional atm_spans atm_core \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "${NORMAL_C}" \
- no-implicit-rule local
-netatm/uni/q2110_sigaa.c optional atm_uni atm_core
-netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core
-netatm/uni/q2110_subr.c optional atm_uni atm_core
-netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core
-netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core
-netatm/uni/qsaal1_subr.c optional atm_uni atm_core
-netatm/uni/sscf_uni.c optional atm_uni atm_core
-netatm/uni/sscf_uni_lower.c optional atm_uni atm_core
-netatm/uni/sscf_uni_upper.c optional atm_uni atm_core
-netatm/uni/sscop.c optional atm_uni atm_core
-netatm/uni/sscop_lower.c optional atm_uni atm_core
-netatm/uni/sscop_pdu.c optional atm_uni atm_core
-netatm/uni/sscop_sigaa.c optional atm_uni atm_core
-netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core
-netatm/uni/sscop_subr.c optional atm_uni atm_core
-netatm/uni/sscop_timer.c optional atm_uni atm_core
-netatm/uni/sscop_upper.c optional atm_uni atm_core
-netatm/uni/uni_load.c optional atm_uni atm_core
-netatm/uni/uniarp.c optional atm_uni atm_core
-netatm/uni/uniarp_cache.c optional atm_uni atm_core
-netatm/uni/uniarp_input.c optional atm_uni atm_core
-netatm/uni/uniarp_output.c optional atm_uni atm_core
-netatm/uni/uniarp_timer.c optional atm_uni atm_core
-netatm/uni/uniarp_vcm.c optional atm_uni atm_core
-netatm/uni/uniip.c optional atm_uni atm_core
-netatm/uni/unisig_decode.c optional atm_uni atm_core
-netatm/uni/unisig_encode.c optional atm_uni atm_core
-netatm/uni/unisig_if.c optional atm_uni atm_core
-netatm/uni/unisig_mbuf.c optional atm_uni atm_core
-netatm/uni/unisig_msg.c optional atm_uni atm_core
-netatm/uni/unisig_print.c optional atm_uni atm_core
-netatm/uni/unisig_proto.c optional atm_uni atm_core
-netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
-netatm/uni/unisig_subr.c optional atm_uni atm_core
-netatm/uni/unisig_util.c optional atm_uni atm_core
-netatm/uni/unisig_vc_state.c optional atm_uni atm_core
-netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif
-netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
+#
+# netatm has been disconnected from the build until it is MPSAFE, or
+# alternatively, until it is removed.
+#
+#netatm/atm_aal5.c optional atm_core
+#netatm/atm_cm.c optional atm_core
+#netatm/atm_device.c optional atm_core
+#netatm/atm_if.c optional atm_core
+#netatm/atm_proto.c optional atm_core
+#netatm/atm_signal.c optional atm_core
+#netatm/atm_socket.c optional atm_core
+#netatm/atm_subr.c optional atm_core
+#netatm/atm_usrreq.c optional atm_core
+#netatm/ipatm/ipatm_event.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_if.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_input.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_load.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_output.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core
+#netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core
+#netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core
+#netatm/spans/spans_arp.c optional atm_spans atm_core \
+# dependency "spans_xdr.h"
+#netatm/spans/spans_cls.c optional atm_spans atm_core
+#netatm/spans/spans_if.c optional atm_spans atm_core
+#netatm/spans/spans_kxdr.c optional atm_spans atm_core
+#netatm/spans/spans_msg.c optional atm_spans atm_core
+#netatm/spans/spans_print.c optional atm_spans atm_core
+#netatm/spans/spans_proto.c optional atm_spans atm_core
+#netatm/spans/spans_subr.c optional atm_spans atm_core
+#netatm/spans/spans_util.c optional atm_spans atm_core
+#spans_xdr.h optional atm_spans atm_core \
+# before-depend \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
+# clean "spans_xdr.h" \
+# no-obj no-implicit-rule
+#spans_xdr.c optional atm_spans atm_core \
+# before-depend \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
+# clean "spans_xdr.c" \
+# no-obj no-implicit-rule local
+#spans_xdr.o optional atm_spans atm_core \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "${NORMAL_C}" \
+# no-implicit-rule local
+#netatm/uni/q2110_sigaa.c optional atm_uni atm_core
+#netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/q2110_subr.c optional atm_uni atm_core
+#netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core
+#netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/qsaal1_subr.c optional atm_uni atm_core
+#netatm/uni/sscf_uni.c optional atm_uni atm_core
+#netatm/uni/sscf_uni_lower.c optional atm_uni atm_core
+#netatm/uni/sscf_uni_upper.c optional atm_uni atm_core
+#netatm/uni/sscop.c optional atm_uni atm_core
+#netatm/uni/sscop_lower.c optional atm_uni atm_core
+#netatm/uni/sscop_pdu.c optional atm_uni atm_core
+#netatm/uni/sscop_sigaa.c optional atm_uni atm_core
+#netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/sscop_subr.c optional atm_uni atm_core
+#netatm/uni/sscop_timer.c optional atm_uni atm_core
+#netatm/uni/sscop_upper.c optional atm_uni atm_core
+#netatm/uni/uni_load.c optional atm_uni atm_core
+#netatm/uni/uniarp.c optional atm_uni atm_core
+#netatm/uni/uniarp_cache.c optional atm_uni atm_core
+#netatm/uni/uniarp_input.c optional atm_uni atm_core
+#netatm/uni/uniarp_output.c optional atm_uni atm_core
+#netatm/uni/uniarp_timer.c optional atm_uni atm_core
+#netatm/uni/uniarp_vcm.c optional atm_uni atm_core
+#netatm/uni/uniip.c optional atm_uni atm_core
+#netatm/uni/unisig_decode.c optional atm_uni atm_core
+#netatm/uni/unisig_encode.c optional atm_uni atm_core
+#netatm/uni/unisig_if.c optional atm_uni atm_core
+#netatm/uni/unisig_mbuf.c optional atm_uni atm_core
+#netatm/uni/unisig_msg.c optional atm_uni atm_core
+#netatm/uni/unisig_print.c optional atm_uni atm_core
+#netatm/uni/unisig_proto.c optional atm_uni atm_core
+#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
+#netatm/uni/unisig_subr.c optional atm_uni atm_core
+#netatm/uni/unisig_util.c optional atm_uni atm_core
+#netatm/uni/unisig_vc_state.c optional atm_uni atm_core
+#netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif
+#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
netgraph/atm/ng_atm.c optional ngatm_atm
@@ -1841,6 +1855,7 @@
netinet/sctp_asconf.c optional inet inet6 sctp
netinet/sctp_auth.c optional inet inet6 sctp
netinet/sctp_bsd_addr.c optional inet inet6 sctp
+netinet/sctp_cc_functions.c optional inet inet6 sctp
netinet/sctp_crc32.c optional inet inet6 sctp
netinet/sctp_indata.c optional inet inet6 sctp
netinet/sctp_input.c optional inet inet6 sctp
==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/kern.pre.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.88 2007/07/06 01:50:58 peter Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.90 2007/07/12 00:01:53 jfv Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -76,9 +76,6 @@
# .. and the same for twa
INCLUDES+= -I$S/dev/twa
-# .. and the same for em
-INCLUDES+= -I$S/dev/em
-
# ... and XFS
INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/kmod.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -145,12 +145,12 @@
${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//}
@${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}}
@if [ -e ${_firmw:C/\:.*$//} ]; then \
- ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \
- ${_firmw:C/\:.*$//}; \
+ ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \
+ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \
else \
ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \
- ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \
- ${_firmw:C/\:.*$//}; \
+ ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \
+ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \
rm ${_firmw:C/\:.*$//}; \
fi
==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/options#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.600 2007/07/06 13:20:43 attilio Exp $
+# $FreeBSD: src/sys/conf/options,v 1.602 2007/07/14 21:49:23 rwatson Exp $
#
# On the handling of kernel options
#
@@ -396,7 +396,6 @@
#
SCTP opt_sctp.h
SCTP_DEBUG opt_sctp.h # Enable debug printfs
-SCTP_HIGH_SPEED opt_sctp.h # Enable Sally Floyds HS TCP CC
SCTP_WITH_NO_CSUM opt_sctp.h # Use this at your peril
SCTP_LOCK_LOGGING opt_sctp.h # Log to KTR lock activity
SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free
@@ -481,12 +480,12 @@
TI_PRIVATE_JUMBOS opt_ti.h
TI_JUMBO_HDRSPLIT opt_ti.h
-# ATM (HARP version)
-ATM_CORE opt_atm.h
-ATM_IP opt_atm.h
-ATM_SIGPVC opt_atm.h
-ATM_SPANS opt_atm.h
-ATM_UNI opt_atm.h
+# ATM (HARP version) - disabled as not MPSAFE in 7.0
+#ATM_CORE opt_atm.h
+#ATM_IP opt_atm.h
+#ATM_SIGPVC opt_atm.h
+#ATM_SPANS opt_atm.h
+#ATM_UNI opt_atm.h
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list