PERFORCE change 104631 for review
Ryan Beasley
ryanb at FreeBSD.org
Sun Aug 20 23:25:21 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=104631
Change 104631 by ryanb at ryanb_yuki on 2006/08/20 23:24:34
IFC.
Affected files ...
.. //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_create/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_io/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_misc/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_open/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/file/ftruncate/Makefile#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/file/ftruncate/ftruncate.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/fsx/fsx.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/ia64/emulated/brl.t#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/ia64/emulated/test.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/lib/libmp/Makefile#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/lib/libmp/test-libmp.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/lib/libmp/test-libmp.t#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpdrop/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpsocktimewait/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet6/ip6_sockets/Makefile#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/regression/netipx/ipxdgramloopback/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netipx/spxabort/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/netipx/spxloopback/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/listen_backlog/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/rtsocket/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/sendfile/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/socketpair/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_bindconnect/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_passfd/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_socket/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/regression/ufs/uprintf/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/support.S#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0iic/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0iic/doit.c#2 delete
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0iic/main.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0spi/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0spi/doit.c#2 delete
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0spi/main.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/Makefile#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/arm_init.S#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/arm_init.s#2 delete
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/env_vars.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/env_vars.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/main.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/Makefile#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/delay.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/emac.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/emac.h#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/emac_init.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/mci_device.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/mci_device.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/reset.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/sd-card.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/sd-card.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/common/help.common#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/common/loader.8#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/ficl/arm/sysdep.c#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/ficl/arm/sysdep.h#1 branch
.. //depot/projects/soc2006/rbeasley_sound/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_emul.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/conf/NOTES#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/conf/options#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/arl/if_arlreg.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/ath/if_athvar.h#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/ips/ips.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/kern/sys_process.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/kern/syscalls.master#4 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/net/if_bridge.c#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/sys/dirent.h#2 integrate
.. //depot/projects/soc2006/rbeasley_sound/sys/ufs/ufs/ufs_vnops.c#3 integrate
Differences ...
==== //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_create/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/fifo/fifo_create/Makefile,v 1.1 2005/09/10 21:09:26 rwatson Exp $
+# $FreeBSD: src/tools/regression/fifo/fifo_create/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
PROG= fifo_create
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_io/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/fifo/fifo_io/Makefile,v 1.1 2005/09/12 09:42:29 rwatson Exp $
+# $FreeBSD: src/tools/regression/fifo/fifo_io/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
PROG= fifo_io
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_misc/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/fifo/fifo_misc/Makefile,v 1.1 2005/09/12 11:58:14 rwatson Exp $
+# $FreeBSD: src/tools/regression/fifo/fifo_misc/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
PROG= fifo_misc
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/fifo/fifo_open/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/fifo/fifo_open/Makefile,v 1.1 2005/09/11 13:03:36 rwatson Exp $
+# $FreeBSD: src/tools/regression/fifo/fifo_open/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
PROG= fifo_open
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/fsx/fsx.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*
* Updated license to APSL 2.0, 2004/7/27 - Jordan Hubbard
*
- * $FreeBSD: src/tools/regression/fsx/fsx.c,v 1.3 2004/07/27 20:01:43 jkh Exp $
+ * $FreeBSD: src/tools/regression/fsx/fsx.c,v 1.4 2006/08/04 21:45:08 jb Exp $
*
*/
@@ -475,7 +475,7 @@
void
check_eofpage(char *s, unsigned offset, char *p, int size)
{
- unsigned last_page, should_be_zero;
+ uintptr_t last_page, should_be_zero;
if (offset + size <= (file_size & ~page_mask))
return;
@@ -485,7 +485,7 @@
* beyond the true end of the file mapping
* (as required by mmap def in 1996 posix 1003.1)
*/
- last_page = ((int)p + (offset & page_mask) + size) & ~page_mask;
+ last_page = ((uintptr_t)p + (offset & page_mask) + size) & ~page_mask;
for (should_be_zero = last_page + (file_size & page_mask);
should_be_zero < last_page + page_size;
==== //depot/projects/soc2006/rbeasley_sound/regression/netinet/msocket_ifnet_remove/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/netinet/msocket_ifnet_remove/Makefile,v 1.2 2006/03/15 10:46:35 ru Exp $
+# $FreeBSD: src/tools/regression/netinet/msocket_ifnet_remove/Makefile,v 1.3 2006/07/09 11:51:12 maxim Exp $
PROG= msocket_ifnet_remove
-WARNS= 3
+WARNS?= 3
NO_MAN=
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpdrop/Makefile#2 (text) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/tools/regression/netinet/tcpdrop/Makefile,v 1.1 2006/04/03 11:34:36 rwatson Exp $
+# $FreeBSD: src/tools/regression/netinet/tcpdrop/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= tcpdrop
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 (text) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile,v 1.1 2006/04/03 10:08:35 rwatson Exp $
+# $FreeBSD: src/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= tcpsockclosebeforeaccept
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netinet/tcpsocktimewait/Makefile#2 (text) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/tools/regression/netinet/tcpsocktimewait/Makefile,v 1.1 2006/04/02 10:50:46 rwatson Exp $
+# $FreeBSD: src/tools/regression/netinet/tcpsocktimewait/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= tcpsocktimewait
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netipx/ipxdgramloopback/Makefile#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/tools/regression/netipx/ipxdgramloopback/Makefile,v 1.1 2006/03/26 18:25:53 rwatson Exp $
+# $FreeBSD: src/tools/regression/netipx/ipxdgramloopback/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= ipxdgramloopback
@@ -7,6 +7,6 @@
DPADD= ${LIBIPX};
LDADD= -lipx
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netipx/spxabort/Makefile#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/tools/regression/netipx/spxabort/Makefile,v 1.1 2006/03/27 00:03:37 rwatson Exp $
+# $FreeBSD: src/tools/regression/netipx/spxabort/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= spxabort
@@ -7,6 +7,6 @@
DPADD= ${LIBIPX};
LDADD= -lipx
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/netipx/spxloopback/Makefile#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/tools/regression/netipx/spxloopback/Makefile,v 1.1 2006/03/26 19:10:27 rwatson Exp $
+# $FreeBSD: src/tools/regression/netipx/spxloopback/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
#
PROG= spxloopback
@@ -7,6 +7,6 @@
DPADD= ${LIBIPX};
LDADD= -lipx
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/listen_backlog/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/sockets/listen_backlog/Makefile,v 1.1 2005/09/18 13:42:19 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/listen_backlog/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
PROG= listen_backlog
-WARNS= 3
+WARNS?= 3
NO_MAN=
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/rtsocket/Makefile#2 (text) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/sockets/rtsocket/Makefile,v 1.1 2006/04/09 14:48:38 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/rtsocket/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
PROG= rtsocket
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/sendfile/Makefile#2 (text) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/tools/regression/sockets/sendfile/Makefile,v 1.2 2006/05/25 10:46:43 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/sendfile/Makefile,v 1.3 2006/07/09 11:51:13 maxim Exp $
#
PROG= sendfile
NO_MAN=
-WARNS= 2
+WARNS?= 2
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/socketpair/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/tools/regression/sockets/socketpair/Makefile,v 1.4 2006/05/25 10:46:43 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/socketpair/Makefile,v 1.5 2006/07/09 11:51:13 maxim Exp $
#
PROG= socketpair
NO_MAN=
-WARNS= 2
+WARNS?= 2
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_bindconnect/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/sockets/unix_bindconnect/Makefile,v 1.1 2005/02/20 22:21:53 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/unix_bindconnect/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
PROG= unix_bindconnect
NO_MAN=
-WARNS= 2
+WARNS?= 2
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_passfd/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/sockets/unix_passfd/Makefile,v 1.1 2005/11/09 21:41:20 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/unix_passfd/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
PROG= unix_passfd
NO_MAN=
-WARNS= 2
+WARNS?= 2
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/sockets/unix_socket/Makefile#2 (text) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/sockets/unix_socket/Makefile,v 1.1 2006/04/09 14:30:11 rwatson Exp $
+# $FreeBSD: src/tools/regression/sockets/unix_socket/Makefile,v 1.2 2006/07/09 11:51:14 maxim Exp $
PROG= unix_socket
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/regression/ufs/uprintf/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/tools/regression/ufs/uprintf/Makefile,v 1.1 2005/09/19 16:29:36 rwatson Exp $
+# $FreeBSD: src/tools/regression/ufs/uprintf/Makefile,v 1.2 2006/07/09 11:51:14 maxim Exp $
PROG= ufs_uprintf
-WARNS= 3
+WARNS?= 3
NO_MAN=
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/support.S#3 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.119 2006/08/16 22:22:28 davidxu Exp $
*/
#include "opt_ddb.h"
@@ -432,7 +432,7 @@
ja fusufault
movq %rsi,(%rdi)
- xorq %rax,%rax
+ xorl %eax,%eax
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux.h#3 (text+ko) ====
@@ -27,17 +27,13 @@
* (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/amd64/linux32/linux.h,v 1.3 2006/08/15 12:54:29 netchild Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.5 2006/08/19 15:13:01 netchild Exp $
*/
#ifndef _AMD64_LINUX_LINUX_H_
#define _AMD64_LINUX_LINUX_H_
#include <sys/signal.h> /* for sigval union */
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/sx.h>
#include <amd64/linux32/linux32_syscall.h>
@@ -766,7 +762,8 @@
#define LINUX_LOWERWORD 0x0000ffff
-/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h
+/*
+ * macros which does the same thing as those in linux include/asm-um/ldt-i386.h
* these convert linux user-space descriptor to machine one
*/
#define LDT_entry_a(info) \
==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.13 2006/08/15 12:54:29 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.15 2006/08/20 13:50:27 netchild Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -60,6 +60,7 @@
#include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_util.h>
+#include <compat/linux/linux_emul.h>
struct l_old_select_argv {
l_int nfds;
@@ -211,6 +212,14 @@
free(path, M_TEMP);
if (error == 0)
error = kern_execve(td, &eargs, NULL);
+ if (error == 0)
+ /* linux process can exec fbsd one, dont attempt
+ * to create emuldata for such process using
+ * linux_proc_init, this leads to a panic on KASSERT
+ * because such process has p->p_emuldata == NULL
+ */
+ if (td->td_proc->p_sysent == &elf_linux_sysvec)
+ error = linux_proc_init(td, 0, 0);
return (error);
}
@@ -452,6 +461,10 @@
if (td->td_retval[1] == 1)
td->td_retval[0] = 0;
+ error = linux_proc_init(td, td->td_retval[0], 0);
+ if (error)
+ return (error);
+
return (0);
}
@@ -470,6 +483,9 @@
/* Are we the child? */
if (td->td_retval[1] == 1)
td->td_retval[0] = 0;
+ error = linux_proc_init(td, td->td_retval[0], 0);
+ if (error)
+ return (error);
return (0);
}
@@ -480,12 +496,14 @@
struct proc *p2;
struct thread *td2;
int exit_signal;
+ struct linux_emuldata *em;
#ifdef DEBUG
if (ldebug(clone)) {
- printf(ARGS(clone, "flags %x, stack %x"),
- (unsigned int)(uintptr_t)args->flags,
- (unsigned int)(uintptr_t)args->stack);
+ printf(ARGS(clone, "flags %x, stack %x, parent tid: %x, child tid: %x"),
+ (unsigned int)args->flags, (unsigned int)(uintptr_t)args->stack,
+ (unsigned int)(uintptr_t)args->parent_tidptr,
+ (unsigned int)(uintptr_t)args->child_tidptr);
}
#endif
@@ -503,21 +521,90 @@
if (!(args->flags & CLONE_FILES))
ff |= RFFDG;
+ /*
+ * Attempt to detect when linux_clone(2) is used for creating
+ * kernel threads. Unfortunately despite the existence of the
+ * CLONE_THREAD flag, version of linuxthreads package used in
+ * most popular distros as of beginning of 2005 doesn't make
+ * any use of it. Therefore, this detection relay fully on
+ * empirical observation that linuxthreads sets certain
+ * combination of flags, so that we can make more or less
+ * precise detection and notify the FreeBSD kernel that several
+ * processes are in fact part of the same threading group, so
+ * that special treatment is necessary for signal delivery
+ * between those processes and fd locking.
+ */
+ if ((args->flags & 0xffffff00) == THREADING_FLAGS)
+ ff |= RFTHREAD;
+
error = fork1(td, ff, 0, &p2);
if (error)
return (error);
+ /* create the emuldata */
+ error = linux_proc_init(td, p2->p_pid, args->flags);
+ /* reference it - no need to check this */
+ em = em_find(p2, EMUL_UNLOCKED);
+ KASSERT(em != NULL, ("clone: emuldata not found.\n"));
+ /* and adjust it */
+ if (args->flags & CLONE_PARENT_SETTID) {
+ if (args->parent_tidptr == NULL) {
+ EMUL_UNLOCK(&emul_lock);
+ return (EINVAL);
+ }
+ error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid));
+ if (error) {
+ EMUL_UNLOCK(&emul_lock);
+ return (error);
+ }
+ }
+ if (args->flags & CLONE_PARENT) {
+#ifdef DEBUG
+ printf("linux_clone: CLONE_PARENT\n");
+#endif
+ }
+
+ if (args->flags & CLONE_THREAD) {
+ /* XXX: linux mangles pgrp and pptr somehow
+ * I think it might be this but I am not sure.
+ */
+#ifdef notyet
+ p2->p_pgrp = td->td_proc->p_pgrp;
+ p2->p_pptr = td->td_proc->p_pptr;
+#endif
+ exit_signal = 0;
+#ifdef DEBUG
+ printf("linux_clone: CLONE_THREADS\n");
+#endif
+ }
+
+ if (args->flags & CLONE_CHILD_SETTID)
+ em->child_set_tid = args->child_tidptr;
+ else
+ em->child_set_tid = NULL;
+
+ if (args->flags & CLONE_CHILD_CLEARTID)
+ em->child_clear_tid = args->child_tidptr;
+ else
+ em->child_clear_tid = NULL;
+ EMUL_UNLOCK(&emul_lock);
+
PROC_LOCK(p2);
p2->p_sigparent = exit_signal;
PROC_UNLOCK(p2);
td2 = FIRST_THREAD_IN_PROC(p2);
- /* in a case of stack = NULL we are supposed to COW calling process stack
+ /*
+ * in a case of stack = NULL we are supposed to COW calling process stack
* this is what normal fork() does so we just keep the tf_rsp arg intact
*/
if (args->stack)
td2->td_frame->tf_rsp = PTROUT(args->stack);
+ if (args->flags & CLONE_SETTLS) {
+ /* XXX: todo */
+ }
+
#ifdef DEBUG
if (ldebug(clone))
printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"),
@@ -628,7 +715,8 @@
if (linux_args->flags & LINUX_MAP_GROWSDOWN) {
bsd_args.flags |= MAP_STACK;
- /* The linux MAP_GROWSDOWN option does not limit auto
+ /*
+ * The linux MAP_GROWSDOWN option does not limit auto
* growth of the region. Linux mmap with this option
* takes as addr the inital BOS, and as len, the initial
* region size. It can then grow down from addr without
@@ -655,7 +743,8 @@
if ((caddr_t)PTRIN(bsd_args.addr) >
p->p_vmspace->vm_maxsaddr) {
- /* Some linux apps will attempt to mmap
+ /*
+ * Some linux apps will attempt to mmap
* thread stacks near the top of their
* address space. If their TOS is greater
* than vm_maxsaddr, vm_map_growstack()
@@ -683,7 +772,8 @@
else
bsd_args.len = STACK_SIZE - GUARD_SIZE;
- /* This gives us a new BOS. If we're using VM_STACK, then
+ /*
+ * This gives us a new BOS. If we're using VM_STACK, then
* mmap will just map the top SGROWSIZ bytes, and let
* the stack grow down to the limit at BOS. If we're
* not using VM_STACK we map the full stack, since we
==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.21 2006/08/15 14:58:15 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.23 2006/08/17 21:06:48 netchild Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -125,8 +125,6 @@
extern LIST_HEAD(futex_list, futex) futex_list;
extern struct mtx futex_mtx;
-extern struct sx emul_shared_lock;
-extern struct sx emul_lock;
static eventhandler_tag linux_exit_tag;
static eventhandler_tag linux_schedtail_tag;
@@ -1079,6 +1077,7 @@
linux_ioctl_register_handler(*lihp);
SET_FOREACH(ldhp, linux_device_handler_set)
linux_device_register_handler(*ldhp);
+ sx_init(&emul_lock, "emuldata lock");
sx_init(&emul_shared_lock, "emuldata->shared lock");
LIST_INIT(&futex_list);
mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF);
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/boot/arm/Makefile,v 1.1 2006/08/10 06:29:15 imp Exp $
+# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $
-SUBDIR=
+SUBDIR=at91
.include <bsd.subdir.mk>
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0/Makefile#2 (text) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.3 2006/04/19 17:16:48 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.4 2006/08/18 20:26:54 imp Exp $
P=boot0
FILES=${P}
SRCS=arm_init.s main.c
NO_MAN=
-LDFLAGS=-e 0 -T linker.cfg
+LDFLAGS=-e 0 -T ${.CURDIR}/linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
.include <bsd.prog.mk>
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0iic/Makefile#2 (text) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.1 2006/04/21 06:48:52 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.2 2006/08/16 23:14:52 imp Exp $
.PATH: ${.CURDIR}/../boot0
P=boot0iic
FILES=${P}
-SRCS=arm_init.s main.c doit.c
+SRCS=arm_init.s main.c
NO_MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0iic/main.c#2 (text) ====
@@ -21,15 +21,13 @@
* (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/boot0iic/main.c,v 1.1 2006/04/21 06:48:52 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.2 2006/08/16 23:14:52 imp Exp $
*/
#include "at91rm9200.h"
#include "lib.h"
#include "at91rm9200_lowlevel.h"
-extern void doit(void *);
-
int
main(void)
{
@@ -37,6 +35,9 @@
while (xmodem_rx(addr) == -1)
continue;
- doit(addr);
+ InitEEPROM();
+ printf("Writing EEPROM from 0x%x to addr 0\r\n", addr);
+ WriteEEPROM(0, addr, 8192);
+ printf("Write complete. Press reset\r\n");
return (1);
}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0spi/Makefile#2 (text) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.1 2006/04/21 06:51:08 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $
.PATH: ${.CURDIR}/../boot0
P=boot0spi
FILES=${P}
-SRCS=arm_init.s main.c doit.c
+SRCS=arm_init.s main.c
NO_MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/boot0spi/main.c#2 (text) ====
@@ -21,22 +21,41 @@
* (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/boot0spi/main.c,v 1.1 2006/04/21 06:51:08 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $
*/
#include "at91rm9200.h"
#include "lib.h"
#include "at91rm9200_lowlevel.h"
+#include "spi_flash.h"
-extern void doit(void *);
+#define OFFSET 0
int
main(void)
{
+ int len, i, j, off;
char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
+ char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */
+ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */
- while (xmodem_rx(addr) == -1)
+ SPI_InitFlash();
+ printf("Waiting for data\r\n");
+ while ((len = xmodem_rx(addr)) == -1)
continue;
- doit(addr);
+ printf("\r\nDownloaded %u bytes.\r\n", len);
+ p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE);
+ printf("Writing %u bytes to flash at %u\r\n", len, OFFSET);
+ for (i = 0; i < len; i+= FLASH_PAGE_SIZE) {
+ for (j = 0; j < 10; j++) {
+ off = i + OFFSET;
+ SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE);
+ SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE);
+ if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0)
+ break;
+ }
+ if (j >= 10)
+ printf("Bad Readback at %u\r\n", i);
+ }
return (1);
}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/loader_prompt.c#2 (text+ko) ====
@@ -19,7 +19,7 @@
* only.
* END_BLOCK
*
- * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.1 2006/08/10 19:55:52 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.2 2006/08/16 23:39:58 imp Exp $
*****************************************************************************/
#include "at91rm9200_lowlevel.h"
@@ -266,7 +266,7 @@
if (argc > 6) {
for (i = 0; i < 6; i++)
mac[i] = p_ASCIIToHex(argv[i + 1]);
- SetMACAddress(mac);
+ EMAC_SetMACAddress(mac);
}
break;
}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/Makefile#2 (text) ====
@@ -1,10 +1,14 @@
-# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.2 2006/08/16 23:39:58 imp Exp $
P=bootspi
FILES=${P}
-SRCS=arm_init.s main.c
+SRCS=arm_init.S main.c loader_prompt.c env_vars.c
NO_MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
.include <bsd.prog.mk>
+
+.if ${MK_FPGA} != "no"
+CFLAGS += -DTSC_FPGA
+.endif
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootspi/main.c#2 (text) ====
@@ -1,57 +1,58 @@
-/*******************************************************************************
+/*-
+ * Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
- * Filename: main.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
- * Basic entry points for top-level functions
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Revision information:
- *
- * 20AUG2004 kb_admin initial creation
- * 12JAN2005 kb_admin cosmetic changes
- * 29APR2005 kb_admin modified boot delay
+ * This software is derived from software provided by kwikbyte without
+ * copyright as follows:
*
- * BEGIN_KBDD_BLOCK
* No warranty, expressed or implied, is included with this software. It is
* provided "AS IS" and no warranty of any kind including statutory or aspects
* relating to merchantability or fitness for any purpose is provided. All
* intellectual property rights of others is maintained with the respective
* owners. This software is not copyrighted and is intended for reference
* only.
- * END_BLOCK
*
- * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.1 2006/04/19 17:16:48 imp Exp $
- ******************************************************************************/
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.2 2006/08/16 23:39:58 imp Exp $
+ */
#include "env_vars.h"
+#include "at91rm9200.h"
#include "at91rm9200_lowlevel.h"
#include "loader_prompt.h"
#include "emac.h"
#include "lib.h"
+#include "spi_flash.h"
-/*
- * .KB_C_FN_DEFINITION_START
- * int main(void)
- * This global function waits at least one second, but not more than two
- * seconds, for input from the serial port. If no response is recognized,
- * it acts according to the parameters specified by the environment. For
- * example, the function might boot an operating system. Do not return
- * from this function.
- * .KB_C_FN_DEFINITION_END
- */
int
main(void)
{
-
+ printf("\r\nBoot\r\n");
+ SPI_InitFlash();
EMAC_Init();
-
LoadBootCommands();
-
- printf("\r\nSPI Boot loader.\r\nAutoboot...\r\n");
-
- if (getc(1) == -1)
+ if (getc(1) == -1) {
+ start_wdog(30);
ExecuteEnvironmentFunctions();
-
- Bootloader(0);
-
+ }
+ Bootloader(getc);
return (1);
}
==== //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/Makefile#3 (text) ====
@@ -1,11 +1,12 @@
-# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.3 2006/08/10 18:14:35 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.4 2006/08/16 23:39:58 imp Exp $
.include "${.CURDIR}/../Makefile.inc"
LIB= at91
INTERNALLIB=
-SRCS=at91rm9200_lowlevel.c eeprom.c emac.c getc.c \
- p_string.c putchar.c printf.c spi_flash.c xmodem.c
+SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c getc.c \
+ p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c \
+ sd-card.c mci_device.c
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list