CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sun Nov 15 10:03:16 UTC 2009 Modified Files: src/usr.bin/ftp: version.h Log Message: Crank version to 20090915: * rename internal getline() to get_line() to avoid conflict with libc * avoid NULL deref in verbose output in an error path * improve man page markup To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/usr.bin/ftp/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/version.h diff -u src/usr.bin/ftp/version.h:1.79 src/usr.bin/ftp/version.h:1.80 --- src/usr.bin/ftp/version.h:1.79 Fri Apr 24 08:57:26 2009 +++ src/usr.bin/ftp/version.h Sun Nov 15 10:03:16 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.79 2009/04/24 08:57:26 lukem Exp $ */ +/* $NetBSD: version.h,v 1.80 2009/11/15 10:03:16 lukem Exp $ */ /*- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc. @@ -34,5 +34,5 @@ #endif #ifndef FTP_VERSION -#define FTP_VERSION 20090424 +#define FTP_VERSION 20090915 #endif
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sun Nov 15 10:08:25 UTC 2009 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv26109 Log Message: Sync to 20090915: * rename getline() to get_line() to avoid libc conflict with latter * avoid NULL deref in error message Status: Vendor Tag: TNF Release Tags: NetBSD-20090915 U othersrc/usr.bin/tnftp/src/Makefile C othersrc/usr.bin/tnftp/src/cmds.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/complete.c U othersrc/usr.bin/tnftp/src/domacro.c C othersrc/usr.bin/tnftp/src/extern.h C othersrc/usr.bin/tnftp/src/fetch.c C othersrc/usr.bin/tnftp/src/ftp.1 U othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/progressbar.c U othersrc/usr.bin/tnftp/src/progressbar.h U othersrc/usr.bin/tnftp/src/ruserpass.c C othersrc/usr.bin/tnftp/src/util.c C othersrc/usr.bin/tnftp/src/version.h 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF othersrc/usr.bin/tnftp/src
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Nov 15 12:26:02 UTC 2009 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Put PMAP_NOCACHE in the MD space. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.22 src/sys/arch/hppa/include/pmap.h:1.23 --- src/sys/arch/hppa/include/pmap.h:1.22 Wed Nov 11 16:08:31 2009 +++ src/sys/arch/hppa/include/pmap.h Sun Nov 15 12:26:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.22 2009/11/11 16:08:31 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.23 2009/11/15 12:26:02 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -209,7 +209,7 @@ /* * MD flags that we use for pmap_kenter_pa: */ -#define PMAP_NOCACHE0x01 /* set the non-cacheable bit */ +#define PMAP_NOCACHE 0x0100 /* set the non-cacheable bit */ #endif /* _KERNEL */
CVS commit: src/sys/conf
Module Name:src
Committed By: dsl
Date: Sun Nov 15 13:39:00 UTC 2009
Modified Files:
src/sys/conf: osrelease.sh
Log Message:
Use shell builtins instead of awk and sed.
Avoids problems with awk processing floating point numbers when LC_NUMERIC
give a decimal point of ','.
Fixes PR/42321
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/conf/osrelease.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.117 src/sys/conf/osrelease.sh:1.118
--- src/sys/conf/osrelease.sh:1.117 Thu Oct 29 06:33:27 2009
+++ src/sys/conf/osrelease.sh Sun Nov 15 13:39:00 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.117 2009/10/29 06:33:27 apb Exp $
+# $NetBSD: osrelease.sh,v 1.118 2009/11/15 13:39:00 dsl Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,28 +32,43 @@
# We use the number specified in sys/param.h
-AWK=${AWK:-awk}
-SED=${TOOL_SED:-sed}
-PARAMH=`dirname $0`/../sys/param.h
-release=`$AWK '/^#define[ ]*__NetBSD_Version__/ { print $6 }' $PARAMH`
+path=./$0
+exec ${path%/*}/../sys/param.h
-# default: return nn.nn.nn
-# -m: return nn, representing only the major number; however, for -current,
+while
+ read define ver_tag release comment || exit 1
+do
+ [ $define = #define ] || continue;
+ [ $ver_tag = __NetBSD_Version__ ] || continue
+ break
+done
+
+# ${release} is [M]Mmm00pp00
+#
+# default: return MM.mm.pp
+# -m: return MM, representing only the major number; however, for -current,
# return the next major number (e.g. for 5.99.nn, return 6)
-# -n: return nn.nn
-# -s: return nn (no dots)
+# -n: return MM.mm
+# -s: return MMmmpp (no dots)
+
+release=${release%??}
+
+rel_MMmm=${release%}
+rel_MM=${rel_MMmm%??}
+rel_mm=${rel_MMmm#${rel_MM}}
+rel_pp=${release#${rel_MMmm}00}
case $1 in
-m)
- echo $release | $AWK -F. '{print int($1+$2/100+0.01)}'
+ echo $(((${rel_MMmm}+1)/100))
;;
-n)
- echo $release | $AWK -F. '{print $1 . $2}'
+ echo $rel_MM.$rel_mm
;;
-s)
- echo $release | $SED -e 's,\.,,g'
+ echo $rel_MM$rel_mm$rel_pp
;;
*)
- echo $release
+ echo $rel_MM.$rel_mm.$rel_pp
;;
esac
CVS commit: src/sys/conf
Module Name:src
Committed By: dsl
Date: Sun Nov 15 14:40:18 UTC 2009
Modified Files:
src/sys/conf: osrelease.sh
Log Message:
Get patch part of version from comment.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/conf/osrelease.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.118 src/sys/conf/osrelease.sh:1.119
--- src/sys/conf/osrelease.sh:1.118 Sun Nov 15 13:39:00 2009
+++ src/sys/conf/osrelease.sh Sun Nov 15 14:40:18 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.118 2009/11/15 13:39:00 dsl Exp $
+# $NetBSD: osrelease.sh,v 1.119 2009/11/15 14:40:18 dsl Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,40 +35,54 @@
path=./$0
exec ${path%/*}/../sys/param.h
+# Search for line
+# #define __NetBSD_Version__ ver_num /* NetBSD ver_text */
+#
+# ver_num and ver_text should match!
+
while
- read define ver_tag release comment || exit 1
+ read define ver_tag rel_num comment_start NetBSD rel_text rest || exit 1
do
[ $define = #define ] || continue;
[ $ver_tag = __NetBSD_Version__ ] || continue
break
done
-# ${release} is [M]Mmm00pp00
-#
# default: return MM.mm.pp
# -m: return MM, representing only the major number; however, for -current,
# return the next major number (e.g. for 5.99.nn, return 6)
# -n: return MM.mm
# -s: return MMmmpp (no dots)
-release=${release%??}
+option=$1
-rel_MMmm=${release%}
+# ${rel_num} is [M]Mmm00pp00
+rel_num=${rel_num%??}
+rel_MMmm=${rel_num%}
rel_MM=${rel_MMmm%??}
rel_mm=${rel_MMmm#${rel_MM}}
-rel_pp=${release#${rel_MMmm}00}
+# rel_pp=${rel_num#${rel_MMmm}00}
+
+# Get patch from text version
+IFS=.
+set -- - $rel_text
+shift 3
+IFS=' '
+set -- $rel_MM ${rel_mm#0} $*
-case $1 in
+case $option in
-m)
echo $(((${rel_MMmm}+1)/100))
;;
-n)
- echo $rel_MM.$rel_mm
+ echo ${rel_MM}.${rel_mm#0}
;;
-s)
- echo $rel_MM$rel_mm$rel_pp
+ IFS=
+ echo $*
;;
*)
- echo $rel_MM.$rel_mm.$rel_pp
+ IFS=.
+ echo $*
;;
esac
CVS commit: src/share/mk
Module Name:src Committed By: pgoyette Date: Sun Nov 15 14:59:47 UTC 2009 Modified Files: src/share/mk: bsd.README Log Message: Add a period at the end of a sentence. To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.258 src/share/mk/bsd.README:1.259 --- src/share/mk/bsd.README:1.258 Thu Nov 12 14:46:37 2009 +++ src/share/mk/bsd.README Sun Nov 15 14:59:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.258 2009/11/12 14:46:37 tron Exp $ +# $NetBSD: bsd.README,v 1.259 2009/11/15 14:59:47 pgoyette Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make include files for the NetBSD @@ -387,7 +387,7 @@ USE_SSP If no, disables GCC stack protection code, which detects stack overflows and aborts the program. The stack protecion code imposes a performance penalty - of about 5% + of about 5%. Default: no, unless USE_FORT is set to yes USE_FORT If yes turns on substitute wrappers for commonly used
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Sun Nov 15 15:53:05 UTC 2009 Modified Files: src/sys/arch/hp700/dev: uturn.c Log Message: Reformat comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/dev/uturn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/dev/uturn.c diff -u src/sys/arch/hp700/dev/uturn.c:1.5 src/sys/arch/hp700/dev/uturn.c:1.6 --- src/sys/arch/hp700/dev/uturn.c:1.5 Sun May 24 06:53:34 2009 +++ src/sys/arch/hp700/dev/uturn.c Sun Nov 15 15:53:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uturn.c,v 1.5 2009/05/24 06:53:34 skrll Exp $ */ +/* $NetBSD: uturn.c,v 1.6 2009/11/15 15:53:05 skrll Exp $ */ /* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */ @@ -102,11 +102,10 @@ ((struct iomod *)ioh)-io_control = 0x80; /* - * U2/UTurn is actually a combination of an Upper Bus - * Converter (UBC) and a Lower Bus Converter (LBC). This - * driver attaches to the UBC; the LBC isn't very interesting, - * so we skip it. This is easy, since it always is module 63, - * hence the MAXMODBUS - 1 below. + * U2/UTurn is actually a combination of an Upper Bus Converter (UBC) + * and a Lower Bus Converter (LBC). This driver attaches to the UBC; + * the LBC isn't very interesting, so we skip it. This is easy, since + * it always is module 63, hence the MAXMODBUS - 1 below. */ nca = *ca; nca.ca_hpabase = 0;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: tsutsui Date: Sun Nov 15 17:33:28 UTC 2009 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add IDs for DisplayLink DL-1x0/1x5 based USB LCDs and USB-VGA adaptors. Info from FUKAUMI Naoki's udl(4) driver patch. To generate a diff of this commit: cvs rdiff -u -r1.536 -r1.537 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.536 src/sys/dev/usb/usbdevs:1.537 --- src/sys/dev/usb/usbdevs:1.536 Thu Nov 5 03:44:50 2009 +++ src/sys/dev/usb/usbdevs Sun Nov 15 17:33:28 2009 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.536 2009/11/05 03:44:50 rafal Exp $ +$NetBSD: usbdevs,v 1.537 2009/11/15 17:33:28 tsutsui Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -482,6 +482,7 @@ vendor LINKSYS4 0x1737 Linksys vendor SENAO 0x1740 Senao vendor METAGEEK 0x1781 MetaGeek +vendor DISPLAYLINK 0x17e9 DisplayLink vendor AMIT 0x18c5 AMIT vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys @@ -957,6 +958,25 @@ /* Digital Stream Corp. products */ product DIGITALSTREAM PS2 0x0001 PS/2 Active Adapter +/* DisplayLink products */ +product DISPLAYLINK LD220 0x0100 Samsung LD220 +product DISPLAYLINK U70 0x0103 Samsung U70 +product DISPLAYLINK VCUD60 0x0136 Rextron DVI +product DISPLAYLINK DLDVI 0x0141 DisplayLink DVI +product DISPLAYLINK USBRGB 0x0150 IO-DATA USB-RGB +product DISPLAYLINK LCDUSB7X 0x0153 IO-DATA LCD-USB7X +product DISPLAYLINK VGA10 0x015a CMP-USBVGA10 +product DISPLAYLINK WSDVI 0x0198 WS Tech DVI +product DISPLAYLINK EC008 0x019b EasyCAP008 DVI +product DISPLAYLINK GXDVIU2 0x01ac BUFFALO GX-DVI/U2 +product DISPLAYLINK LCD4300U 0x01ba LCD-4300U +product DISPLAYLINK LCD8000U 0x01bb LCD-8000U +product DISPLAYLINK HPDOCK 0x01d4 HP USB Docking +product DISPLAYLINK M01061 0x01e2 Lenovo DVI +product DISPLAYLINK SWDVI 0x024c SUNWEIT DVI +product DISPLAYLINK LDEWX015U 0x02e3 Logitec LDE-WX015U +product DISPLAYLINK UM7X0 0x401a nanovision MiMo + /* D-Link products */ /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ product DLINK DUBE100 0x1a00 10/100 ethernet adapter
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: tsutsui
Date: Sun Nov 15 17:42:24 UTC 2009
Modified Files:
src/sys/dev/wscons: wsconsio.h
Log Message:
Reserve WSDISPLAY_TYPE for DisplayLink DL-1x0/DL-1x5 USB LCDs and
USB-VGA adaptors (which may require a new ioctl for DUMBFB ops). From
FUKAUMI Naoki.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/wscons/wsconsio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.90 src/sys/dev/wscons/wsconsio.h:1.91
--- src/sys/dev/wscons/wsconsio.h:1.90 Sun Feb 8 22:58:56 2009
+++ src/sys/dev/wscons/wsconsio.h Sun Nov 15 17:42:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.90 2009/02/08 22:58:56 uwe Exp $ */
+/* $NetBSD: wsconsio.h,v 1.91 2009/11/15 17:42:24 tsutsui Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -320,6 +320,7 @@
#define WSDISPLAY_TYPE_CRIME 46 /* SGI O2 */
#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */
#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */
+#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: dholland Date: Sun Nov 15 18:17:18 UTC 2009 Modified Files: src/sys/arch/hppa/hppa: db_interface.c Log Message: Declare trap name array as extern const char *[] to match how it's defined in trap.c. (Should really be in a header, of course.) Compile-tested. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/hppa/db_interface.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/db_interface.c diff -u src/sys/arch/hppa/hppa/db_interface.c:1.18 src/sys/arch/hppa/hppa/db_interface.c:1.19 --- src/sys/arch/hppa/hppa/db_interface.c:1.18 Tue Nov 3 05:07:26 2009 +++ src/sys/arch/hppa/hppa/db_interface.c Sun Nov 15 18:17:18 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.18 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: db_interface.c,v 1.19 2009/11/15 18:17:18 dholland Exp $ */ /* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.18 2009/11/03 05:07:26 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.19 2009/11/15 18:17:18 dholland Exp $); #include sys/param.h #include sys/systm.h @@ -56,7 +56,7 @@ extern label_t *db_recover; extern int db_active; -extern char *trap_type[]; +extern const char *trap_type[]; extern int trap_types; db_regs_t ddb_regs;
CVS commit: src/dist/nvi/cl
Module Name:src
Committed By: dsl
Date: Sun Nov 15 18:23:08 UTC 2009
Modified Files:
src/dist/nvi/cl: cl_funcs.c
Log Message:
Need %zu for size_t
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/cl/cl_funcs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/cl/cl_funcs.c
diff -u src/dist/nvi/cl/cl_funcs.c:1.2 src/dist/nvi/cl/cl_funcs.c:1.3
--- src/dist/nvi/cl/cl_funcs.c:1.2 Fri Dec 5 22:51:42 2008
+++ src/dist/nvi/cl/cl_funcs.c Sun Nov 15 18:23:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_funcs.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/* $NetBSD: cl_funcs.c,v 1.3 2009/11/15 18:23:08 dsl Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -532,7 +532,7 @@
win = CLSP(sp) ? CLSP(sp) : stdscr;
/* See the comment in cl_cursor. */
if (wmove(win, RLNO(sp, lno), RCNO(sp, cno)) == ERR) {
- msgq(sp, M_ERR, Error: move: l(%u + %u) c(%u + %u),
+ msgq(sp, M_ERR, Error: move: l(%u + %zu) c(%u + %zu),
lno, sp-roff, cno, sp-coff);
return (1);
}
CVS commit: src/sys/arch/x68k/stand/aout2hux
Module Name:src
Committed By: dholland
Date: Sun Nov 15 18:24:23 UTC 2009
Modified Files:
src/sys/arch/x68k/stand/aout2hux: aout2hux.c
Log Message:
Since this is a host program, fix some 64-bit cleanliness issues.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/aout2hux/aout2hux.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/aout2hux/aout2hux.c
diff -u src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.10 src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.11
--- src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.10 Wed Mar 18 16:00:16 2009
+++ src/sys/arch/x68k/stand/aout2hux/aout2hux.c Sun Nov 15 18:24:23 2009
@@ -21,7 +21,7 @@
* % cc -N -static -Wl,-Ttext,10203040 -o aout2 *.o
* % aout2hux -o foo.x aout1 0 aout2 10203040
*
- * $NetBSD: aout2hux.c,v 1.10 2009/03/18 16:00:16 cegger Exp $
+ * $NetBSD: aout2hux.c,v 1.11 2009/11/15 18:24:23 dholland Exp $
*/
#include sys/types.h
@@ -200,20 +200,20 @@
if ((i = get_uint16(hdr-e_shentsize)) != SIZE_ELF68K_SHDR) {
fprintf(stderr, %s: size shdr %d should be %d\n, fn, i,
- SIZE_ELF68K_SHDR);
+ (int)SIZE_ELF68K_SHDR);
return 1;
}
if ((i = get_uint16(hdr-e_phentsize)) != SIZE_ELF68K_PHDR) {
fprintf(stderr, %s: size phdr %d should be %d\n, fn, i,
- SIZE_ELF68K_PHDR);
+ (int)SIZE_ELF68K_PHDR);
return 1;
}
if ((nphdr = get_uint16(hdr-e_phnum)) != 1 nphdr != 2) {
fprintf(stderr,
- %s: has %d loadable segments (should be 1 or 2)\n,
- fn, nphdr);
+ %s: has %lu loadable segments (should be 1 or 2)\n,
+ fn, (unsigned long)nphdr);
return 1;
}
CVS commit: src/sys/arch/x68k/stand/aout2hux
Module Name:src Committed By: dholland Date: Sun Nov 15 18:27:41 UTC 2009 Modified Files: src/sys/arch/x68k/stand/aout2hux: aout2hux.c type_local.h Log Message: Remove PROTO(), which is like _P() only spelled differently. The change causes gcc to harmlessly permute two instructions in the output for some reason, but otherwise has no effect on the generated code. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/aout2hux/aout2hux.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/aout2hux/type_local.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/stand/aout2hux/aout2hux.c diff -u src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.11 src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.12 --- src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.11 Sun Nov 15 18:24:23 2009 +++ src/sys/arch/x68k/stand/aout2hux/aout2hux.c Sun Nov 15 18:27:40 2009 @@ -21,7 +21,7 @@ * % cc -N -static -Wl,-Ttext,10203040 -o aout2 *.o * % aout2hux -o foo.x aout1 0 aout2 10203040 * - * $NetBSD: aout2hux.c,v 1.11 2009/11/15 18:24:23 dholland Exp $ + * $NetBSD: aout2hux.c,v 1.12 2009/11/15 18:27:40 dholland Exp $ */ #include sys/types.h @@ -61,23 +61,22 @@ u_int32_t entry_addr; /* entry point address */ }; -unsigned get_uint16 PROTO((be_uint16_t *be)); -u_int32_t get_uint32 PROTO((be_uint32_t *be)); -void put_uint16 PROTO((be_uint16_t *be, unsigned v)); -void put_uint32 PROTO((be_uint32_t *be, u_int32_t v)); -void *do_realloc PROTO((void *p, size_t s)); +unsigned get_uint16(be_uint16_t *be); +u_int32_t get_uint32(be_uint32_t *be); +void put_uint16(be_uint16_t *be, unsigned v); +void put_uint32(be_uint32_t *be, u_int32_t v); +void *do_realloc(void *p, size_t s); static int open_aout(const char *fn, struct aout_m68k *hdr, struct exec_info *inf); -static int open_elf PROTO((const char *fn, FILE *fp, struct elf_m68k_hdr *hdr, - struct exec_info *inf)); -FILE *open_exec PROTO((const char *fn, struct exec_info *inf)); -int check_2_exec_inf PROTO((struct exec_info *inf1, struct exec_info *inf2)); -int aout2hux PROTO((const char *fn1, const char *fn2, - u_int32_t loadadr1, u_int32_t loadadr2, const char *fnx)); -int gethex PROTO((u_int32_t *pval, const char *str)); -void usage PROTO((const char *name)); -int main PROTO((int argc, char *argv[])); +static int open_elf(const char *fn, FILE *fp, struct elf_m68k_hdr *hdr, + struct exec_info *inf); +FILE *open_exec(const char *fn, struct exec_info *inf); +int check_2_exec_inf(struct exec_info *inf1, struct exec_info *inf2); +int aout2hux(const char *fn1, const char *fn2, + u_int32_t loadadr1, u_int32_t loadadr2, const char *fnx); +int gethex(u_int32_t *pval, const char *str); +void usage(const char *name); #if !defined(bzero) defined(__SVR4) # define bzero(d, n) memset((d), 0, (n)) @@ -724,7 +723,7 @@ } #ifndef NO_BIST -void bist PROTO((void)); +void bist(void); /* * built-in self test Index: src/sys/arch/x68k/stand/aout2hux/type_local.h diff -u src/sys/arch/x68k/stand/aout2hux/type_local.h:1.1 src/sys/arch/x68k/stand/aout2hux/type_local.h:1.2 --- src/sys/arch/x68k/stand/aout2hux/type_local.h:1.1 Tue Sep 1 19:51:09 1998 +++ src/sys/arch/x68k/stand/aout2hux/type_local.h Sun Nov 15 18:27:40 2009 @@ -4,13 +4,10 @@ * written by Yasha (ITOH Yasufumi) * public domain * - * $NetBSD: type_local.h,v 1.1 1998/09/01 19:51:09 itohy Exp $ + * $NetBSD: type_local.h,v 1.2 2009/11/15 18:27:40 dholland Exp $ */ -#ifdef __STDC__ -# define PROTO(x) x -#else -# define PROTO(x) () +#ifndef __STDC__ # ifndef const # define const # endif
CVS commit: src/sys/conf
Module Name:src
Committed By: dsl
Date: Sun Nov 15 18:41:08 UTC 2009
Modified Files:
src/sys/conf: osrelease.sh
Log Message:
Fix borkeage
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/conf/osrelease.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.119 src/sys/conf/osrelease.sh:1.120
--- src/sys/conf/osrelease.sh:1.119 Sun Nov 15 14:40:18 2009
+++ src/sys/conf/osrelease.sh Sun Nov 15 18:41:08 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.119 2009/11/15 14:40:18 dsl Exp $
+# $NetBSD: osrelease.sh,v 1.120 2009/11/15 18:41:08 dsl Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,7 +32,8 @@
# We use the number specified in sys/param.h
-path=./$0
+path=$0
+[ ${path#/*} = $path ] path=./$path
exec ${path%/*}/../sys/param.h
# Search for line
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: dholland Date: Sun Nov 15 18:41:32 UTC 2009 Modified Files: src/sys/arch/amd64/amd64: db_interface.c Log Message: Declare trap name array as extern const char *const [] to match how it's defined in trap.c. (Should really be in a header, of course.) Compile-tested. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/amd64/db_interface.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/db_interface.c diff -u src/sys/arch/amd64/amd64/db_interface.c:1.20 src/sys/arch/amd64/amd64/db_interface.c:1.21 --- src/sys/arch/amd64/amd64/db_interface.c:1.20 Thu Jan 29 13:52:20 2009 +++ src/sys/arch/amd64/amd64/db_interface.c Sun Nov 15 18:41:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.20 2009/01/29 13:52:20 joerg Exp $ */ +/* $NetBSD: db_interface.c,v 1.21 2009/11/15 18:41:31 dholland Exp $ */ /* * Mach Operating System @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.20 2009/01/29 13:52:20 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.21 2009/11/15 18:41:31 dholland Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -63,7 +63,7 @@ #include ddb/db_output.h #include ddb/ddbvar.h -extern const char *trap_type[]; +extern const char *const trap_type[]; extern int trap_types; int db_active;
CVS commit: src/dist/nvi
Module Name:src
Committed By: dsl
Date: Sun Nov 15 18:43:28 UTC 2009
Modified Files:
src/dist/nvi/cl: cl_funcs.c
src/dist/nvi/ex: ex_shell.c ex_util.c
src/dist/nvi/vi: vi.c
Log Message:
Fix all formats for 64bit builds
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/nvi/cl/cl_funcs.c
cvs rdiff -u -r1.3 -r1.4 src/dist/nvi/ex/ex_shell.c
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/ex/ex_util.c
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/vi/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/cl/cl_funcs.c
diff -u src/dist/nvi/cl/cl_funcs.c:1.3 src/dist/nvi/cl/cl_funcs.c:1.4
--- src/dist/nvi/cl/cl_funcs.c:1.3 Sun Nov 15 18:23:08 2009
+++ src/dist/nvi/cl/cl_funcs.c Sun Nov 15 18:43:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_funcs.c,v 1.3 2009/11/15 18:23:08 dsl Exp $ */
+/* $NetBSD: cl_funcs.c,v 1.4 2009/11/15 18:43:28 dsl Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -532,7 +532,7 @@
win = CLSP(sp) ? CLSP(sp) : stdscr;
/* See the comment in cl_cursor. */
if (wmove(win, RLNO(sp, lno), RCNO(sp, cno)) == ERR) {
- msgq(sp, M_ERR, Error: move: l(%u + %zu) c(%u + %zu),
+ msgq(sp, M_ERR, Error: move: l(%zu + %zu) c(%zu + %zu),
lno, sp-roff, cno, sp-coff);
return (1);
}
Index: src/dist/nvi/ex/ex_shell.c
diff -u src/dist/nvi/ex/ex_shell.c:1.3 src/dist/nvi/ex/ex_shell.c:1.4
--- src/dist/nvi/ex/ex_shell.c:1.3 Sun Jan 18 03:45:50 2009
+++ src/dist/nvi/ex/ex_shell.c Sun Nov 15 18:43:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_shell.c,v 1.3 2009/01/18 03:45:50 lukem Exp $ */
+/* $NetBSD: ex_shell.c,v 1.4 2009/11/15 18:43:28 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -173,7 +173,7 @@
p = msg_print(sp, cmd, nf);
len = strlen(p);
msgq(sp, M_ERR, %.*s%s: received signal: %s%s,
- MIN(len, 20), p, len 20 ? ... : ,
+ (int)MIN(len, 20), p, len 20 ? ... : ,
sigmsg(WTERMSIG(pstat)),
WCOREDUMP(pstat) ? ; core dumped : );
if (nf)
@@ -195,7 +195,7 @@
p = msg_print(sp, cmd, nf);
len = strlen(p);
msgq(sp, M_ERR, %.*s%s: exited with status %d,
- MIN(len, 20), p, len 20 ? ... : ,
+ (int)MIN(len, 20), p, len 20 ? ... : ,
WEXITSTATUS(pstat));
if (nf)
FREE_SPACE(sp, p, 0);
Index: src/dist/nvi/ex/ex_util.c
diff -u src/dist/nvi/ex/ex_util.c:1.2 src/dist/nvi/ex/ex_util.c:1.3
--- src/dist/nvi/ex/ex_util.c:1.2 Fri Dec 5 22:51:42 2008
+++ src/dist/nvi/ex/ex_util.c Sun Nov 15 18:43:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_util.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/* $NetBSD: ex_util.c,v 1.3 2009/11/15 18:43:28 dsl Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -111,7 +111,7 @@
for (ap = sp-cargv + 1; *ap != NULL; ++ap);
msgq(sp, M_ERR,
- 167|%d more files to edit, (ap - sp-cargv) - 1);
+ 167|%zd more files to edit, (ap - sp-cargv) - 1);
return (1);
}
Index: src/dist/nvi/vi/vi.c
diff -u src/dist/nvi/vi/vi.c:1.2 src/dist/nvi/vi/vi.c:1.3
--- src/dist/nvi/vi/vi.c:1.2 Fri Dec 5 22:51:43 2008
+++ src/dist/nvi/vi/vi.c Sun Nov 15 18:43:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.2 2008/12/05 22:51:43 christos Exp $ */
+/* $NetBSD: vi.c,v 1.3 2009/11/15 18:43:28 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -981,7 +981,7 @@
if (sp-t_rows sp-rows - 1) {
sp-t_minrows = sp-t_rows = sp-rows - 1;
msgq(sp, M_INFO,
- 214|Windows option value is too large, max is %u,
+ 214|Windows option value is too large, max is %zu,
sp-t_rows);
}
sp-t_maxrows = sp-rows - 1;
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: snj
Date: Sun Nov 15 20:10:11 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-arm.c
Log Message:
Pull in fixes from upstream revision 1.362 to avoid string formatting
warnings. Fixes build with newer GCC, like the one in Snow Leopard.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils/dist/gas/config/tc-arm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-arm.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.2
--- src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.1.1.1 Tue Aug 18 09:34:02 2009
+++ src/external/gpl3/binutils/dist/gas/config/tc-arm.c Sun Nov 15 20:10:11 2009
@@ -3456,7 +3456,7 @@
if (reg == FAIL)
{
- as_bad (_(reg_expected_msgs[REG_TYPE_MMXWR]));
+ as_bad (%s, _(reg_expected_msgs[REG_TYPE_MMXWR]));
goto error;
}
@@ -3470,7 +3470,7 @@
hi_reg = arm_reg_parse (input_line_pointer, REG_TYPE_MMXWR);
if (hi_reg == FAIL)
{
- as_bad (_(reg_expected_msgs[REG_TYPE_MMXWR]));
+ as_bad (%s, _(reg_expected_msgs[REG_TYPE_MMXWR]));
goto error;
}
else if (reg = hi_reg)
@@ -3588,7 +3588,7 @@
if (reg == FAIL)
{
- as_bad (_(reg_expected_msgs[REG_TYPE_MMXWCG]));
+ as_bad (%s, _(reg_expected_msgs[REG_TYPE_MMXWCG]));
goto error;
}
@@ -3603,7 +3603,7 @@
hi_reg = arm_reg_parse (input_line_pointer, REG_TYPE_MMXWCG);
if (hi_reg == FAIL)
{
- as_bad (_(reg_expected_msgs[REG_TYPE_MMXWCG]));
+ as_bad (%s, _(reg_expected_msgs[REG_TYPE_MMXWCG]));
goto error;
}
else if (reg = hi_reg)
@@ -3709,7 +3709,7 @@
reg = arm_reg_parse (input_line_pointer, REG_TYPE_RN);
if (reg == FAIL)
{
- as_bad (_(reg_expected_msgs[REG_TYPE_RN]));
+ as_bad (%s, _(reg_expected_msgs[REG_TYPE_RN]));
ignore_rest_of_line ();
return;
}
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Nov 15 20:16:41 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: mDNSResponder-214 out. To generate a diff of this commit: cvs rdiff -u -r1.732 -r1.733 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.732 src/doc/3RDPARTY:1.733 --- src/doc/3RDPARTY:1.732 Wed Nov 11 15:35:57 2009 +++ src/doc/3RDPARTY Sun Nov 15 20:16:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.732 2009/11/11 15:35:57 plunky Exp $ +# $NetBSD: 3RDPARTY,v 1.733 2009/11/15 20:16:41 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -619,7 +619,7 @@ Package: mDNSResponder Version: 212.1 -Current Vers: 212.1 +Current Vers: 214 Maintainer: Apple Archive Site: http://www.opensource.apple.com/tarballs/mDNSResponder/ Home Page: http://developer.apple.com/opensource/internet/bonjour.html
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src Committed By: snj Date: Sun Nov 15 19:51:50 UTC 2009 Modified Files: src/external/gpl3/binutils/dist/gas/config: tc-alpha.c Log Message: Pull in fixes from upstream revision 1.83 to avoid string formatting warnings. Fixes build with newer GCC, like the one in Snow Leopard. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/binutils/dist/gas/config/tc-alpha.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/gas/config/tc-alpha.c diff -u src/external/gpl3/binutils/dist/gas/config/tc-alpha.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/config/tc-alpha.c:1.2 --- src/external/gpl3/binutils/dist/gas/config/tc-alpha.c:1.1.1.1 Tue Aug 18 09:33:48 2009 +++ src/external/gpl3/binutils/dist/gas/config/tc-alpha.c Sun Nov 15 19:51:49 2009 @@ -549,7 +549,7 @@ strcpy (info-string, buffer); errmsg = hash_insert (alpha_literal_hash, info-string, (void *) info); if (errmsg) - as_fatal (errmsg); + as_fatal (%s, errmsg); } return info; @@ -1829,7 +1829,7 @@ insn = (*operand-insert) (insn, val, errmsg); if (errmsg) - as_warn (errmsg); + as_warn (%s, errmsg); } else insn |= ((val ((1 operand-bits) - 1)) operand-shift);
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: snj Date: Sun Nov 15 20:38:36 UTC 2009 Modified Files: src/sys/arch/amiga/dev: bztzsc.c src/sys/arch/amiga/stand/bootblock/boot: main.c startit.s src/sys/arch/amiga/stand/bootblock/bootxx_ffs: main.c startit.s Log Message: Drop 3rd and 4th clauses (except in one case, where copyright is shared with UCB and only the 3rd clause is dropped). Approved by mhitch@ and is@ (copyright holders). To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/bztzsc.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/stand/bootblock/boot/main.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/boot/startit.s cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/dev/bztzsc.c diff -u src/sys/arch/amiga/dev/bztzsc.c:1.31 src/sys/arch/amiga/dev/bztzsc.c:1.32 --- src/sys/arch/amiga/dev/bztzsc.c:1.31 Sun Apr 13 04:55:52 2008 +++ src/sys/arch/amiga/dev/bztzsc.c Sun Nov 15 20:38:35 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $ */ +/* $NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $ */ /* * Copyright (c) 1997 Michael L. Hitch @@ -14,11 +14,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product contains software written by Ignatios Souvatzis and - * Michael L. Hitch for the NetBSD project. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. * @@ -42,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $); #include sys/types.h #include sys/param.h Index: src/sys/arch/amiga/stand/bootblock/boot/main.c diff -u src/sys/arch/amiga/stand/bootblock/boot/main.c:1.24 src/sys/arch/amiga/stand/bootblock/boot/main.c:1.25 --- src/sys/arch/amiga/stand/bootblock/boot/main.c:1.24 Mon Jan 12 07:42:30 2009 +++ src/sys/arch/amiga/stand/bootblock/boot/main.c Sun Nov 15 20:38:35 2009 @@ -1,5 +1,5 @@ /* - * $NetBSD: main.c,v 1.24 2009/01/12 07:42:30 tsutsui Exp $ + * $NetBSD: main.c,v 1.25 2009/11/15 20:38:35 snj Exp $ * * * Copyright (c) 1996,1999 Ignatios Souvatzis @@ -14,11 +14,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Michael L. Hitch. - * 4. The name of the authors may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/amiga/stand/bootblock/boot/startit.s diff -u src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.8 src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.9 --- src/sys/arch/amiga/stand/bootblock/boot/startit.s:1.8 Fri Mar 2 16:43:26 2001 +++ src/sys/arch/amiga/stand/bootblock/boot/startit.s Sun Nov 15 20:38:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: startit.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $ */ +/* $NetBSD: startit.s,v 1.9 2009/11/15 20:38:36 snj Exp $ */ /* * Copyright (c) 1996 Ignatios Souvatzis @@ -13,11 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Michael L. Hitch. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Sun Nov 15 20:45:36 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Three ad clauses down: one for mhitch@ is@, and two for mhi...@. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.85 src/distrib/notes/common/legal.common:1.86 --- src/distrib/notes/common/legal.common:1.85 Mon Nov 9 20:54:51 2009 +++ src/distrib/notes/common/legal.common Sun Nov 15 20:45:36 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.85 2009/11/09 20:54:51 snj Exp $ +.\ $NetBSD: legal.common,v 1.86 2009/11/15 20:45:36 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -55,15 +55,9 @@ NetBSD Project. See http://www.netbsd.org/ for information about NetBSD. .It -This product contains software written by Ignatios Souvatzis and -Michael L. Hitch for the NetBSD project. -.It This product includes software developed by Intel Corporation and its contributors. .It -This product contains software written by Michael L. Hitch for -the NetBSD project. -.It This product includes cryptographic software written by Eric Young (e...@cryptsoft.com) .It @@ -328,8 +322,6 @@ .It This product includes software developed by Michael Graff. .It -This product includes software developed by Michael L. Hitch. -.It This product includes software developed by Michael Smith. .It This product includes software developed by Mike Pritchard.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Sun Nov 15 20:48:35 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Argh. Missed another now-unnecessary mhitch@ acknowledgement. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.86 src/distrib/notes/common/legal.common:1.87 --- src/distrib/notes/common/legal.common:1.86 Sun Nov 15 20:45:36 2009 +++ src/distrib/notes/common/legal.common Sun Nov 15 20:48:34 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.86 2009/11/15 20:45:36 snj Exp $ +.\ $NetBSD: legal.common,v 1.87 2009/11/15 20:48:34 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -501,9 +501,6 @@ by Matthias Drochner. .It This product includes software developed for the NetBSD Project -by Michael L. Hitch. -.It -This product includes software developed for the NetBSD Project by Perry E. Metzger. .It This product includes software developed for the NetBSD Project
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: snj
Date: Sun Nov 15 20:56:40 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-m68k.c
Log Message:
Pull in fixes from upstream revision 1.108 to avoid string formatting
warnings. Fixes build with newer GCC, like the one in Snow Leopard.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils/dist/gas/config/tc-m68k.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-m68k.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.2
--- src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.1.1.1 Tue Aug 18 09:34:48 2009
+++ src/external/gpl3/binutils/dist/gas/config/tc-m68k.c Sun Nov 15 20:56:40 2009
@@ -7545,7 +7545,7 @@
{
if (i)
fprintf (stream, | );
- fprintf (stream, m68k_archs[i].name);
+ fprintf (stream, %s, m68k_archs[i].name);
}
fprintf (stream, \n);
@@ -7554,7 +7554,7 @@
{
if (i)
fprintf (stream, | );
- fprintf (stream, m68k_cpus[i].name);
+ fprintf (stream, %s, m68k_cpus[i].name);
}
fprintf (stream, _(\n));
}
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: snj
Date: Sun Nov 15 21:19:35 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/bfd: elfxx-mips.c
Log Message:
Fix unbalanced parentheses to make this build again.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/bfd/elfxx-mips.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elfxx-mips.c
diff -u src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.2 src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.3
--- src/external/gpl3/binutils/dist/bfd/elfxx-mips.c:1.2 Sun Nov 15 10:25:16 2009
+++ src/external/gpl3/binutils/dist/bfd/elfxx-mips.c Sun Nov 15 21:19:35 2009
@@ -7714,7 +7714,7 @@
|| rel[-1].r_offset != rel-r_offset
|| r_type != R_MIPS_64
|| ELF_R_TYPE(abfd, rel[-1].r_info) != R_MIPS_GPREL32)
- (MIPS_ELF_READONLY_SECTION (sec))
+ MIPS_ELF_READONLY_SECTION (sec))
{
/* We tell the dynamic linker that there are
relocations against the text segment. */
CVS commit: src/dist/nawk
Module Name:src
Committed By: christos
Date: Sun Nov 15 21:56:06 UTC 2009
Modified Files:
src/dist/nawk: main.c
Log Message:
PR/42320: Alexander Nasonov: According to:
http://www.opengroup.org/onlinepubs/7990989775/xcu/awk.html
the LC_NUMERIC decimal point recognized is always period. Make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/dist/nawk/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nawk/main.c
diff -u src/dist/nawk/main.c:1.9 src/dist/nawk/main.c:1.10
--- src/dist/nawk/main.c:1.9 Sun Mar 1 18:30:52 2009
+++ src/dist/nawk/main.c Sun Nov 15 16:56:06 2009
@@ -35,7 +35,6 @@
#include stdlib.h
#include string.h
#include signal.h
-#include locale.h
#include awk.h
#include awkgram.h
@@ -102,6 +101,7 @@
int main(int argc, char *argv[])
{
const char *fs = NULL;
+ struct lconv *lconv;
setlocale(LC_CTYPE, );
setlocale(LC_NUMERIC, C); /* for parsing cmdline prog */
@@ -114,6 +114,9 @@
}
(void) setlocale(LC_ALL, );
+ lconv = localeconv();
+ lconv-decimal_point = .;
+
#ifdef SA_SIGINFO
{
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: snj
Date: Sun Nov 15 21:57:49 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-mips.c
Log Message:
Pull in fixes from upstream revision 1.406 to avoid string formatting
warnings. Fixes build with newer GCC, like the one in Snow Leopard.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils/dist/gas/config/tc-mips.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.2
--- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.1.1.1 Tue Aug 18 09:35:02 2009
+++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Sun Nov 15 21:57:49 2009
@@ -3456,7 +3456,7 @@
warning now. */
const char *msg = macro_warning (subtype);
if (msg != 0)
- as_warn (msg);
+ as_warn (%s, msg);
}
else
{
@@ -14449,7 +14449,7 @@
{
const char *msg = macro_warning (fragp-fr_subtype);
if (msg != 0)
- as_warn_where (fragp-fr_file, fragp-fr_line, msg);
+ as_warn_where (fragp-fr_file, fragp-fr_line, %s, msg);
}
/* Go through all the fixups for the first sequence. Disable them
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: snj
Date: Sun Nov 15 22:17:03 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-ppc.c
Log Message:
Pull in fixes from upstream revision 1.146 to avoid string formatting
warnings. Fixes build with newer GCC, like the one in Snow Leopard.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils/dist/gas/config/tc-ppc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-ppc.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-ppc.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/config/tc-ppc.c:1.2
--- src/external/gpl3/binutils/dist/gas/config/tc-ppc.c:1.1.1.1 Tue Aug 18 09:35:16 2009
+++ src/external/gpl3/binutils/dist/gas/config/tc-ppc.c Sun Nov 15 22:17:03 2009
@@ -1656,7 +1656,7 @@
errmsg = NULL;
insn = (*operand-insert) (insn, (long) val, ppc_cpu, errmsg);
if (errmsg != (const char *) NULL)
- as_bad_where (file, line, errmsg);
+ as_bad_where (file, line, %s, errmsg);
}
else
insn |= ((long) val operand-bitm) operand-shift;
@@ -2387,7 +2387,7 @@
{
insn = (*operand-insert) (insn, 0L, ppc_cpu, errmsg);
if (errmsg != (const char *) NULL)
- as_bad (errmsg);
+ as_bad (%s, errmsg);
continue;
}
@@ -2400,7 +2400,7 @@
{
insn = (*operand-insert) (insn, 0L, ppc_cpu, errmsg);
if (errmsg != (const char *) NULL)
- as_bad (errmsg);
+ as_bad (%s, errmsg);
}
if ((operand-flags PPC_OPERAND_NEXT) != 0)
next_opindex = *opindex_ptr + 1;
CVS commit: src/include
Module Name:src Committed By: christos Date: Sun Nov 15 22:21:03 UTC 2009 Modified Files: src/include: inttypes.h stddef.h stdlib.h wchar.h Log Message: Don't define wchar_t for c++; it is native in the language. From Alexander Nasonov To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/include/inttypes.h cvs rdiff -u -r1.15 -r1.16 src/include/stddef.h cvs rdiff -u -r1.89 -r1.90 src/include/stdlib.h cvs rdiff -u -r1.27 -r1.28 src/include/wchar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/inttypes.h diff -u src/include/inttypes.h:1.6 src/include/inttypes.h:1.7 --- src/include/inttypes.h:1.6 Mon Aug 4 17:19:45 2008 +++ src/include/inttypes.h Sun Nov 15 17:21:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: inttypes.h,v 1.6 2008/08/04 21:19:45 matt Exp $ */ +/* $NetBSD: inttypes.h,v 1.7 2009/11/15 22:21:03 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include sys/inttypes.h #include machine/ansi.h -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stddef.h diff -u src/include/stddef.h:1.15 src/include/stddef.h:1.16 --- src/include/stddef.h:1.15 Mon Aug 21 12:58:29 2006 +++ src/include/stddef.h Sun Nov 15 17:21:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: stddef.h,v 1.15 2006/08/21 16:58:29 thorpej Exp $ */ +/* $NetBSD: stddef.h,v 1.16 2009/11/15 22:21:03 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -45,7 +45,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stdlib.h diff -u src/include/stdlib.h:1.89 src/include/stdlib.h:1.90 --- src/include/stdlib.h:1.89 Mon Jul 20 13:03:37 2009 +++ src/include/stdlib.h Sun Nov 15 17:21:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.89 2009/07/20 17:03:37 joerg Exp $ */ +/* $NetBSD: stdlib.h,v 1.90 2009/11/15 22:21:03 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -48,7 +48,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/wchar.h diff -u src/include/wchar.h:1.27 src/include/wchar.h:1.28 --- src/include/wchar.h:1.27 Mon Apr 28 16:22:54 2008 +++ src/include/wchar.h Sun Nov 15 17:21:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: wchar.h,v 1.27 2008/04/28 20:22:54 martin Exp $ */ +/* $NetBSD: wchar.h,v 1.28 2009/11/15 22:21:03 christos Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -66,7 +66,7 @@ #include stdio.h /* for FILE* */ -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src
Committed By: cliff
Date: Sun Nov 15 22:58:15 UTC 2009
Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obiovar.h
Added Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio_space.c
Removed Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_eb_space.c
rmixl_el_space.c
Log Message:
- we don't need -el bus space for obio, get rid of it and clean up the naming
- delete rmixl_eb_space.c, rmixl_el_space.c
- add mixl_obio_space.c, provides -eb bus space for obio devices
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/conf/files.rmixl
cvs rdiff -u -r1.1.2.1 -r0 src/sys/arch/mips/rmi/rmixl_eb_space.c \
src/sys/arch/mips/rmi/rmixl_el_space.c
cvs rdiff -u -r0 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_obio_space.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_obiovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.5 src/sys/arch/mips/conf/files.rmixl:1.1.2.6
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.5 Sat Nov 14 21:59:15 2009
+++ src/sys/arch/mips/conf/files.rmixl Sun Nov 15 22:58:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.5 2009/11/14 21:59:15 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -11,8 +11,9 @@
device obio: obio
attach obio at mainbus
file arch/mips/rmi/rmixl_obio.c obio needs-count
-filearch/mips/rmi/rmixl_el_space.c obio
-filearch/mips/rmi/rmixl_eb_space.c obio
+filearch/mips/rmi/rmixl_obio_space.c obio
+filearch/mips/rmi/rmixl_pcie_cfg_space.c pci
+filearch/mips/rmi/rmixl_pcie_ecfg_space.c pci
filearch/mips/rmi/rmixl_pcie_io_space.c pci
filearch/mips/rmi/rmixl_pcie_mem_space.c pci
Index: src/sys/arch/mips/rmi/rmixl_obiovar.h
diff -u src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.5 src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.5 Fri Nov 13 05:26:42 2009
+++ src/sys/arch/mips/rmi/rmixl_obiovar.h Sun Nov 15 22:58:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obiovar.h,v 1.1.2.5 2009/11/13 05:26:42 cliff Exp $ */
+/* $NetBSD: rmixl_obiovar.h,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $ */
#ifndef _MIPS_RMI_RMIXL_OBIOVAR_H_
#define _MIPS_RMI_RMIXL_OBIOVAR_H_
@@ -8,8 +8,7 @@
#include mips/pci_machdep.h
struct obio_attach_args {
- bus_space_tag_t obio_el_bst;
- bus_space_tag_t obio_eb_bst;
+ bus_space_tag_t obio_bst;
bus_addr_t obio_addr;
bus_size_t obio_size;
int obio_intr;
@@ -21,8 +20,7 @@
typedef struct obio_softc {
device_t sc_dev;
- bus_space_tag_t sc_el_bst;
- bus_space_tag_t sc_eb_bst;
+ bus_space_tag_t sc_bst;
bus_dma_tag_t sc_29bit_dmat;
bus_dma_tag_t sc_32bit_dmat;
bus_dma_tag_t sc_64bit_dmat;
Added files:
Index: src/sys/arch/mips/rmi/rmixl_obio_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4
--- /dev/null Sun Nov 15 22:58:16 2009
+++ src/sys/arch/mips/rmi/rmixl_obio_space.c Sun Nov 15 22:58:15 2009
@@ -0,0 +1,58 @@
+/* $NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+/*
+ * Big Endian bus_space(9) support for RMI {XLP,XLR,XLS} chips
+ */
+
+#include sys/cdefs.h
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src Committed By: cliff Date: Sun Nov 15 22:58:39 UTC 2009 Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: std.rmixl Log Message: - delete un-needed options MIPS32 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbmips/conf/std.rmixl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/std.rmixl diff -u src/sys/arch/evbmips/conf/std.rmixl:1.1.2.1 src/sys/arch/evbmips/conf/std.rmixl:1.1.2.2 --- src/sys/arch/evbmips/conf/std.rmixl:1.1.2.1 Sun Sep 13 03:27:38 2009 +++ src/sys/arch/evbmips/conf/std.rmixl Sun Nov 15 22:58:39 2009 @@ -1,4 +1,4 @@ -# $NetBSD: std.rmixl,v 1.1.2.1 2009/09/13 03:27:38 cliff Exp $ +# $NetBSD: std.rmixl,v 1.1.2.2 2009/11/15 22:58:39 cliff Exp $ machine evbmips mips include conf/std # MI standard options @@ -6,7 +6,6 @@ options MIPS3_ENABLE_CLOCK_INTR # Platform support -options MIPS32 options MIPS64 options MIPS64_XLS options ENABLE_MIPS_16KB_PAGE
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/rmixl
Module Name:src
Committed By: cliff
Date: Sun Nov 15 22:59:36 UTC 2009
Modified Files:
src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c
Log Message:
- make infop work for N32 or N64; firmware gives us a
non-sign-extended 32 bit pointer in a 64 bit variable
- in rmixlfw_init(), when PSB version not found,
fix rc_io_pbase initialization, and add the missing return MEMSIZE.
- use PRIx64 format to make some printfs work for N32 or N64
- use (intptr_t) as needed to make int to pointer casts work for N32 and N64
- init rc_obio_memt replaces init of rc_eb_memt, rc_el_memt
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/evbmips/rmixl/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.6 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.7
--- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.6 Mon Nov 9 09:55:11 2009
+++ src/sys/arch/evbmips/rmixl/machdep.c Sun Nov 15 22:59:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.2.6 2009/11/09 09:55:11 cliff Exp $ */
+/* $NetBSD: machdep.c,v 1.1.2.7 2009/11/15 22:59:36 cliff Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.6 2009/11/09 09:55:11 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.7 2009/11/15 22:59:36 cliff Exp $);
#include opt_ddb.h
#include opt_com.h
@@ -162,6 +162,7 @@
#include mips/rmi/rmixl_firmware.h
#include mips/rmi/rmixlreg.h
+#define MACHDEP_DEBUG 1
#ifdef MACHDEP_DEBUG
int machdep_debug=MACHDEP_DEBUG;
# define DPRINTF(x) do { if (machdep_debug) printf x ; } while(0)
@@ -196,8 +197,8 @@
* please add them
*/
static uint64_t rmiclfw_psb_versions[] = {
- 0x4958d4fb0056,
- 0x49a5a8fa0056,
+ 0x4958d4fb0056ULL,
+ 0x49a5a8fa0056ULL,
};
#define RMICLFW_PSB_VERSIONS_LEN \
(sizeof(rmiclfw_psb_versions)/sizeof(rmiclfw_psb_versions[0]))
@@ -242,8 +243,8 @@
void configure(void);
-void mach_init(int, int32_t *, void *, void *);
-static u_long rmixlfw_init(void *);
+void mach_init(int, int32_t *, void *, int64_t);
+static u_long rmixlfw_init(int64_t);
static u_long mem_clusters_init(rmixlfw_mmap_t *, rmixlfw_mmap_t *);
static void __attribute__((__noreturn__)) rmixl_exit(int);
static void rmixl_physaddr_init(void);
@@ -263,7 +264,7 @@
* Do all the stuff that locore normally does before calling main().
*/
void
-mach_init(int argc, int32_t *argv, void *envp, void *infop)
+mach_init(int argc, int32_t *argv, void *envp, int64_t infop)
{
struct rmixl_config *rcp = rmixl_configuration;
void *kernend, *v;
@@ -294,8 +295,7 @@
physmem = btoc(memsize);
- rmixl_eb_bus_mem_init(rcp-rc_eb_memt, rcp); /* need for console */
- rmixl_el_bus_mem_init(rcp-rc_el_memt, rcp); /* XXX defer ? */
+ rmixl_obio_bus_mem_init(rcp-rc_obio_memt, rcp); /* need for console */
#if NCOM 0
rmixl_com_cnattach(comcnaddr, comcnspeed, -1,
@@ -328,7 +328,7 @@
*/
boothowto = RB_AUTOBOOT;
for (int i = 1; i argc; i++) {
- for (char *cp = (char *)(uint64_t)argv[i]; *cp; cp++) {
+ for (char *cp = (char *)(intptr_t)argv[i]; *cp; cp++) {
int howto;
/* Ignore superfluous '-', if there is one */
if (*cp == '-')
@@ -375,7 +375,8 @@
first = trunc_page(vm_clusters[i].start);
last = round_page(vm_clusters[i].start + vm_clusters[i].size);
- DPRINTF((%s: %d: %#lx, %#lx\n, __func__, i, first, last));
+ DPRINTF((%s: %d: %#PRIx64, %#PRIx64\n,
+ __func__, i, first, last));
uvm_page_physload(atop(first), atop(last), atop(first),
atop(last), VM_FREELIST_DEFAULT);
}
@@ -591,24 +592,21 @@
}
static u_long
-rmixlfw_init(void *infop)
+rmixlfw_init(int64_t infop)
{
struct rmixl_config *rcp = rmixl_configuration;
- uint64_t tmp;
strcpy(cpu_model, RMI XLS616ATX VIIA); /* XXX */
- tmp = (int64_t)infop;
- tmp |= 0xULL 32;
- infop = (void *)tmp;
- rmixlfw_info = *(rmixlfw_info_t *)infop;
+ infop |= MIPS_KSEG0_START;
+ rmixlfw_info = *(rmixlfw_info_t *)(intptr_t)infop;
for (int i=0; i RMICLFW_PSB_VERSIONS_LEN; i++) {
if (rmiclfw_psb_versions[i] == rmixlfw_info.psb_version)
goto found;
}
- rcp-rc_io_pbase = MIPS_KSEG1_TO_PHYS(RMIXL_IO_DEV_PBASE);
+ rcp-rc_io_pbase = RMIXL_IO_DEV_PBASE;
rmixl_putchar_init(rcp-rc_io_pbase);
#ifdef DIAGNOSTIC
@@ -616,13 +614,14 @@
rmixl_puthex64(rmixlfw_info.psb_version);
rmixl_puts(\r\n);
#endif
+ return MEMSIZE;
found:
rcp-rc_io_pbase = MIPS_KSEG1_TO_PHYS(rmixlfw_info.io_base);
rmixl_putchar_init(rcp-rc_io_pbase);
#ifdef MACHDEP_DEBUG
rmixl_puts(\r\ninfop: );
- rmixl_puthex64((uint64_t)infop);
+ rmixl_puthex64((uint64_t)(intptr_t)infop);
#endif
#ifdef DIAGNOSTIC
rmixl_puts(\r\nrecognized psb_version: );
@@ -631,8 +630,8 @@
#endif
return mem_clusters_init(
- (rmixlfw_mmap_t
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: cliff Date: Sun Nov 15 23:00:00 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c Log Message: - make infop work for N32 or N64; firmware gives us a non-sign-extended 32 bit pointer in a 64 bit variable - in rmixlfw_init(), when PSB version not found, fix rc_io_pbase initialization, and add the missing return MEMSIZE. - use PRIx64 format to make some printfs work for N32 or N64 - use (intptr_t) as needed to make int to pointer casts work for N32 and N64 - init rc_obio_memt replaces init of rc_eb_memt, rc_el_memt To generate a diff of this commit: cvs rdiff -u -r1.22.16.6 -r1.22.16.7 src/sys/arch/mips/mips/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/bus_dma.c diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.6 src/sys/arch/mips/mips/bus_dma.c:1.22.16.7 --- src/sys/arch/mips/mips/bus_dma.c:1.22.16.6 Mon Nov 9 09:58:45 2009 +++ src/sys/arch/mips/mips/bus_dma.c Sun Nov 15 23:00:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $ */ +/* $NetBSD: bus_dma.c,v 1.22.16.7 2009/11/15 23:00:00 cliff Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.7 2009/11/15 23:00:00 cliff Exp $); #include sys/param.h #include sys/systm.h @@ -422,8 +422,9 @@ #ifdef DIAGNOSTIC if (offset = map-dm_mapsize) - panic(_bus_dmamap_sync: bad offset %lu (map size is %lu), - offset, map-dm_mapsize); + panic(_bus_dmamap_sync: bad offset %PRIxPADDR + (map size is %PRIxPSIZE), +offset, map-dm_mapsize); if (len == 0 || (offset + len) map-dm_mapsize) panic(_bus_dmamap_sync: bad length); #endif
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:09:18 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: bus_space.h
Log Message:
- need to be able to handle 32 bit bus addrs in N32 kernel
- bus_addr_t is now paddr_t
- bus_size_t is now psize_t
- bus_space_handle_t is now intptr_t
- this will impact other MIPS ports, TBD
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.18.1 src/sys/arch/mips/include/bus_space.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/bus_space.h
diff -u src/sys/arch/mips/include/bus_space.h:1.4 src/sys/arch/mips/include/bus_space.h:1.4.18.1
--- src/sys/arch/mips/include/bus_space.h:1.4 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mips/include/bus_space.h Sun Nov 15 23:09:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.4 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: bus_space.h,v 1.4.18.1 2009/11/15 23:09:18 cliff Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -107,14 +107,14 @@
/*
* Addresses (in bus space).
*/
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef paddr_t bus_addr_t;
+typedef psize_t bus_size_t;
/*
* Access methods for bus space.
*/
typedef struct mips_bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
+typedef intptr_t bus_space_handle_t;
struct mips_bus_space {
/* cookie */
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:09:45 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]:
bus_space_alignstride_chipdep.c
Log Message:
- use (intptr_t) as needed to make int to pointer casts work for N32 and N64
- in BS(map), when not _LP64, if the bus address cannot fit
in KSEG0/KSEG1, then use uvm_km_alloc() and pmap_kenter_pa()
to make page table mappings.
To generate a diff of this commit:
cvs rdiff -u -r1.10.18.4 -r1.10.18.5 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.4 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.5
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.4 Mon Nov 9 09:59:27 2009
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Sun Nov 15 23:09:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.4 2009/11/09 09:59:27 cliff Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.5 2009/11/15 23:09:45 cliff Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.4 2009/11/09 09:59:27 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.5 2009/11/15 23:09:45 cliff Exp $);
#ifdef CHIP_EXTENT
#include sys/extent.h
@@ -742,20 +742,43 @@
mapit:
#endif /* CHIP_EXTENT */
+
+ addr = mbst.mbst_sys_start + (addr - mbst.mbst_bus_start);
+
#ifdef _LP64
if (flags BUS_SPACE_MAP_CACHEABLE)
- *hp = MIPS_PHYS_TO_XKPHYS_CACHED(mbst.mbst_sys_start +
- (addr - mbst.mbst_bus_start));
+ *hp = MIPS_PHYS_TO_XKPHYS_CACHED(addr);
else
- *hp = MIPS_PHYS_TO_XKPHYS_UNCACHED(mbst.mbst_sys_start +
- (addr - mbst.mbst_bus_start));
+ *hp = MIPS_PHYS_TO_XKPHYS_UNCACHED(addr);
#else
- if (flags BUS_SPACE_MAP_CACHEABLE)
- *hp = MIPS_PHYS_TO_KSEG0(mbst.mbst_sys_start +
- (addr - mbst.mbst_bus_start));
- else
- *hp = MIPS_PHYS_TO_KSEG1(mbst.mbst_sys_start +
- (addr - mbst.mbst_bus_start));
+ if (((addr + size) ~MIPS_PHYS_MASK) != 0) {
+ vaddr_t va;
+ paddr_t pa;
+ int s;
+
+ size = round_page((addr % PAGE_SIZE) + size);
+ va = uvm_km_alloc(kernel_map, size, PAGE_SIZE,
+ UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
+ if (va == 0)
+ return ENOMEM;
+ *hp = va + (addr PAGE_MASK);
+ pa = trunc_page(addr);
+
+ s = splhigh();
+ while (size != 0) {
+ pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
+ pa += PAGE_SIZE;
+ va += PAGE_SIZE;
+ size -= PAGE_SIZE;
+ }
+ pmap_update(pmap_kernel());
+ splx(s);
+ } else {
+ if (flags BUS_SPACE_MAP_CACHEABLE)
+ *hp = MIPS_PHYS_TO_KSEG0(addr);
+ else
+ *hp = MIPS_PHYS_TO_KSEG1(addr);
+ }
#endif
return (0);
@@ -1251,7 +1274,7 @@
volatile uint8_t *ptr;
#endif /* CHIP_ACCESS_SIZE 1 */
- ptr = (void *)(h + CHIP_OFF8(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF8(off));
return *ptr 0xff;
}
@@ -1264,7 +1287,7 @@
volatile uint16_t *ptr;
#endif /* CHIP_ACCESS_SIZE 2 */
- ptr = (void *)(h + CHIP_OFF16(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF16(off));
return *ptr 0x;
}
@@ -1277,7 +1300,7 @@
volatile uint32_t *ptr;
#endif
- ptr = (void *)(h + CHIP_OFF32(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF32(off));
return *ptr 0x;
}
@@ -1286,7 +1309,7 @@
{
volatile uint64_t *ptr;
- ptr = (void *)(h + CHIP_OFF64(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF64(off));
return *ptr;
}
@@ -1333,7 +1356,7 @@
volatile uint8_t *ptr;
#endif /* CHIP_ACCESS_SIZE 1 */
- ptr = (void *)(h + CHIP_OFF8(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF8(off));
*ptr = val;
}
@@ -1347,7 +1370,7 @@
volatile uint16_t *ptr;
#endif /* CHIP_ACCESS_SIZE 2 */
- ptr = (void *)(h + CHIP_OFF16(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF16(off));
*ptr = val;
}
@@ -1361,7 +1384,7 @@
volatile uint32_t *ptr;
#endif /* CHIP_ACCESS_SIZE 4 */
- ptr = (void *)(h + CHIP_OFF32(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF32(off));
*ptr = val;
}
@@ -1371,7 +1394,7 @@
{
volatile uint64_t *ptr;
- ptr = (void *)(h + CHIP_OFF64(off));
+ ptr = (void *)(intptr_t)(h + CHIP_OFF64(off));
*ptr = val;
}
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Sun Nov 15 23:10:04 UTC 2009 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_com.c Log Message: - use new obio bus space To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/rmi/rmixl_com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/rmi/rmixl_com.c diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.6 src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.7 --- src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.6 Fri Sep 25 22:22:52 2009 +++ src/sys/arch/mips/rmi/rmixl_com.c Sun Nov 15 23:10:04 2009 @@ -1,4 +1,4 @@ -/* $Id: rmixl_com.c,v 1.1.2.6 2009/09/25 22:22:52 cliff Exp $ */ +/* $Id: rmixl_com.c,v 1.1.2.7 2009/11/15 23:10:04 cliff Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -101,7 +101,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_com.c,v 1.1.2.6 2009/09/25 22:22:52 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_com.c,v 1.1.2.7 2009/11/15 23:10:04 cliff Exp $); #include sys/param.h #include sys/systm.h @@ -227,7 +227,7 @@ struct com_regs regs; int rv; - bst = obio-obio_eb_bst; /* com is always big endian */ + bst = obio-obio_bst; addr = obio-obio_addr; size = obio-obio_size; @@ -264,7 +264,7 @@ sc-sc_dev = self; sc-sc_frequency = -1; /* XXX */ - bst = obio-obio_eb_bst; + bst = obio-obio_bst; addr = obio-obio_addr; size = obio-obio_size; @@ -308,7 +308,7 @@ bus_size_t sz; struct com_regs regs; - bst = (bus_space_tag_t)rmixl_configuration.rc_eb_memt; + bst = (bus_space_tag_t)rmixl_configuration.rc_obio_memt; sz = COM_NPORTS * sizeof(uint32_t); /* span of UART regs in bytes */ memset(regs, 0, sizeof(regs));
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:10:22 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio.c
Log Message:
- use PRIxPADDR and PRIxPSIZE as needed when printing
bus address and size following change in typedef
- use new obio bus space
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_obio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.5 Mon Nov 9 10:05:06 2009
+++ src/sys/arch/mips/rmi/rmixl_obio.c Sun Nov 15 23:10:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.1.2.5 2009/11/09 10:05:06 cliff Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.1.2.6 2009/11/15 23:10:22 cliff Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rmixl_obio.c,v 1.1.2.5 2009/11/09 10:05:06 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: rmixl_obio.c,v 1.1.2.6 2009/11/15 23:10:22 cliff Exp $);
#include locators.h
#include obio.h
@@ -105,7 +105,8 @@
obio_bus_init(sc);
- aprint_normal( addr %#lx size %#x\n, ba, RMIXL_IO_DEV_SIZE);
+ aprint_normal( addr %#PRIxPADDR size %#PRIxPSIZE\n,
+ ba, (bus_size_t)RMIXL_IO_DEV_SIZE);
aprint_naive(\n);
/*
@@ -121,9 +122,9 @@
struct obio_attach_args *obio = aux;
if (obio-obio_addr != OBIOCF_ADDR_DEFAULT) {
- aprint_normal( addr 0x%08lx, obio-obio_addr);
+ aprint_normal( addr %#PRIxPADDR, obio-obio_addr);
if (obio-obio_size != OBIOCF_SIZE_DEFAULT)
- aprint_normal(-0x%08lx,
+ aprint_normal(-%#PRIxPADDR,
obio-obio_addr + (obio-obio_size - 1));
}
if (obio-obio_mult != OBIOCF_MULT_DEFAULT)
@@ -140,8 +141,7 @@
struct obio_softc *sc = device_private(parent);
struct obio_attach_args obio;
- obio.obio_el_bst = sc-sc_el_bst;
- obio.obio_eb_bst = sc-sc_eb_bst;
+ obio.obio_bst = sc-sc_bst;
obio.obio_addr = cf-cf_loc[OBIOCF_ADDR];
obio.obio_size = cf-cf_loc[OBIOCF_SIZE];
obio.obio_mult = cf-cf_loc[OBIOCF_MULT];
@@ -166,13 +166,9 @@
return;
done = 1;
- /* little endian space */
- if (rcp-rc_el_memt.bs_cookie == 0)
- rmixl_el_bus_mem_init(rcp-rc_el_memt, rcp);
-
- /* big endian space */
- if (rcp-rc_eb_memt.bs_cookie == 0)
- rmixl_eb_bus_mem_init(rcp-rc_eb_memt, rcp);
+ /* obio (devio) space */
+ if (rcp-rc_obio_memt.bs_cookie == 0)
+ rmixl_obio_bus_mem_init(rcp-rc_obio_memt, rcp);
/* dma space for addr 512MB */
if (rcp-rc_29bit_dmat._cookie == 0)
@@ -188,8 +184,7 @@
sc-sc_base = (bus_addr_t)rcp-rc_io_pbase;
sc-sc_size = (bus_size_t)RMIXL_IO_DEV_SIZE;
- sc-sc_el_bst = (bus_space_tag_t)rcp-rc_el_memt;
- sc-sc_eb_bst = (bus_space_tag_t)rcp-rc_eb_memt;
+ sc-sc_bst = (bus_space_tag_t)rcp-rc_obio_memt;
sc-sc_29bit_dmat = rcp-rc_29bit_dmat;
#ifdef NOTYET
sc-sc_32bit_dmat = rcp-rc_32bit_dmat;
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:11:06 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c rmixl_pcievar.h
Log Message:
- abandon XKPHYS mapping for access PCIe CFG and ECFG space, useless for N32
- rmixl_pcie_conf_read() and rmixl_pcie_conf_write() now use
rmixl_pcie_conf_setup() to establish bus space mappings for
access to PCIe CFG, ECFG space. The mappings are lazy
to allow successive accesses to the same (bus) in CFG space,
or to the same (bus, device) in ECFG space, to reuse the mapping.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcievar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.2 Fri Nov 13 05:22:19 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Sun Nov 15 23:11:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.2 2009/11/13 05:22:19 cliff Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.2 2009/11/13 05:22:19 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $);
#include opt_pci.h
#include pci.h
@@ -89,16 +89,6 @@
/*
- * use XKPHYS in order to accomodate XLS 40 bit PCIe bus address
- * PCIe config space is all little endian for now
- */
-#define RMIXL_PCI_VADDR(ba) \
- (volatile uint32_t *)MIPS_PHYS_TO_XKPHYS_UNCACHED(ba)
-#define RMIXL_PCI_READ(o) le32toh(*RMIXL_PCI_VADDR(o))
-#define RMIXL_PCI_WRITE(o,v) *RMIXL_PCI_VADDR(o) = htole32(v)
-
-
-/*
* XLS PCIe Extended Configuration Registers
*/
#define RMIXL_PCIE_ECFG_UESR 0x104 /* Uncorrectable Error Status Reg */
@@ -149,9 +139,13 @@
static void rmixl_pcie_errata(struct rmixl_pcie_softc *);
static void rmixl_conf_interrupt(void *, int, int, int, int, int *);
static int rmixl_pcie_bus_maxdevs(void *, int);
+static pcitag_t rmixl_tag_to_ecfg(pcitag_t);
static pcitag_t rmixl_pcie_make_tag(void *, int, int, int);
static void rmixl_pcie_decompose_tag(void *, pcitag_t, int *, int *, int *);
void rmixl_pcie_tag_print(const char *restrict, void *, pcitag_t,int, vaddr_t, u_long);
+static int rmixl_pcie_conf_setup(struct rmixl_pcie_softc *,
+ pcitag_t, int *, bus_space_tag_t *,
+ bus_space_handle_t *);
static pcireg_t rmixl_pcie_conf_read(void *, pcitag_t, int);
static void rmixl_pcie_conf_write(void *, pcitag_t, int, pcireg_t);
@@ -306,7 +300,8 @@
u_long n = RMIXL_PCIE_CFG_SIZE / (1024 * 1024);
RMIXL_PCIE_BAR_INIT(CFG, bar, n, n);
}
- sc-sc_pcie_cfg_pbase = RMIXL_PCIE_CFG_BAR_TO_BA(bar);
+ rcp-rc_pcie_cfg_pbase = (bus_addr_t)RMIXL_PCIE_CFG_BAR_TO_BA(bar);
+ rcp-rc_pcie_cfg_size = (bus_size_t)RMIXL_PCIE_CFG_SIZE;
/*
* get PCIE Extended config space base addr from SBC PCIe ECFG BAR
@@ -318,7 +313,8 @@
u_long n = RMIXL_PCIE_ECFG_SIZE / (1024 * 1024);
RMIXL_PCIE_BAR_INIT(ECFG, bar, n, n);
}
- sc-sc_pcie_ecfg_pbase = RMIXL_PCIE_ECFG_BAR_TO_BA(bar);
+ rcp-rc_pcie_ecfg_pbase = (bus_addr_t)RMIXL_PCIE_ECFG_BAR_TO_BA(bar);
+ rcp-rc_pcie_ecfg_size = (bus_size_t)RMIXL_PCIE_ECFG_SIZE;
/*
* get PCI MEM space base [addr, size] from SBC PCIe MEM BAR
@@ -347,7 +343,16 @@
rcp-rc_pci_io_size = (bus_size_t)RMIXL_PCIE_IO_BAR_TO_SIZE(bar);
/*
- * initialize the PCI bus spaces tag
+ * initialize the PCI CFG, ECFG bus space tags
+ */
+ rmixl_pcie_cfg_bus_mem_init(rcp-rc_pcie_cfg_memt, rcp);
+ sc-sc_pcie_cfg_memt = rcp-rc_pcie_cfg_memt;
+
+ rmixl_pcie_ecfg_bus_mem_init(rcp-rc_pcie_ecfg_memt, rcp);
+ sc-sc_pcie_ecfg_memt = rcp-rc_pcie_ecfg_memt;
+
+ /*
+ * initialize the PCI MEM and IO bus space tags
*/
rmixl_pcie_bus_mem_init(rcp-rc_pci_memt, rcp);
rmixl_pcie_bus_io_init(rcp-rc_pci_iot, rcp);
@@ -769,18 +774,38 @@
}
/*
+ * rmixl_tag_to_ecfg - convert cfg address (generic tag) to ecfg address
+ *
+ * 39:29 (reserved)
+ * 28 Swap (0=little, 1=big endian)
+ * 27:20 Bus number
+ * 19:15 Device number
+ * 14:12 Function number
+ * 11:8Extended Register number
+ * 7:0 Register number
+ */
+static pcitag_t
+rmixl_tag_to_ecfg(pcitag_t tag)
+{
+ KASSERT((tag __BITS(7,0)) == 0);
+ return (tag 4);
+}
+
+/*
* XLS pci tag is a 40 bit address composed thusly:
* 39:25 (reserved)
* 24 Swap (0=little, 1=big endian)
* 23:16 Bus number
* 15:11 Device number
* 10:8Function number
- * 0:7 Register number
+ * 7:0 Register number
+ *
+ * Note: this is the native composition for addressing CFG space, but not for ECFG space.
*/
pcitag_t
-rmixl_pcie_make_tag(void *v,
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:11:32 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlvar.h
Log Message:
- use new obio bus space
- add bus space stuff for PCIe CFG and ECFG spaces
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/rmi/rmixlvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.6 src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.7
--- src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.6 Fri Nov 13 05:27:30 2009
+++ src/sys/arch/mips/rmi/rmixlvar.h Sun Nov 15 23:11:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.1.2.6 2009/11/13 05:27:30 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.1.2.7 2009/11/15 23:11:32 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -92,14 +92,19 @@
struct rmixl_config {
uint64_t rc_io_pbase;
+ bus_addr_t rc_pcie_cfg_pbase;
+ bus_size_t rc_pcie_cfg_size;
+ bus_addr_t rc_pcie_ecfg_pbase;
+ bus_size_t rc_pcie_ecfg_size;
bus_addr_t rc_pci_mem_pbase;
bus_size_t rc_pci_mem_size;
bus_addr_t rc_pci_io_pbase;
bus_size_t rc_pci_io_size;
- struct mips_bus_space rc_el_memt; /* little endian bus */
- struct mips_bus_space rc_eb_memt; /* bigendian bus */
- struct mips_bus_space rc_pci_memt; /* PCI MEM */
- struct mips_bus_space rc_pci_iot; /* PCI IO */
+ struct mips_bus_space rc_obio_memt; /* DEVIO */
+ struct mips_bus_space rc_pcie_cfg_memt; /* PCI CFG */
+ struct mips_bus_space rc_pcie_ecfg_memt; /* PCI ECFG */
+ struct mips_bus_space rc_pci_memt; /* PCI MEM */
+ struct mips_bus_space rc_pci_iot; /* PCI IO */
struct mips_bus_dma_tag rc_29bit_dmat;
struct mips_bus_dma_tag rc_32bit_dmat;
struct mips_bus_dma_tag rc_64bit_dmat;
@@ -109,8 +114,9 @@
extern struct rmixl_config rmixl_configuration;
-extern void rmixl_el_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_eb_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_obio_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pcie_cfg_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pcie_ecfg_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_pcie_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_pcie_bus_io_init(bus_space_tag_t, void *);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Sun Nov 15 23:29:18 UTC 2009
Added Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie_cfg_space.c
rmixl_pcie_ecfg_space.c
Log Message:
add bus space for PCIe CFG and ECFG spaces
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.1
--- /dev/null Sun Nov 15 23:29:18 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c Sun Nov 15 23:29:18 2009
@@ -0,0 +1,62 @@
+/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+/*
+ * Little Endian bus_space(9) support for PCI CFG space access
+ * on RMI {XLP,XLR,XLS} chips
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $);
+
+#include sys/types.h
+#include sys/param.h
+
+#include machine/bus.h
+#include mips/rmi/rmixl_obiovar.h
+#include mips/rmi/rmixlreg.h
+#include mips/rmi/rmixlvar.h
+
+#define CHIP rmixl_pcie_cfg
+#define CHIP_MEM /* defined */
+#define CHIP_ACCESS_SIZE 1
+#define CHIP_LITTLE_ENDIAN
+
+/* MEM region 1 */
+#define CHIP_W1_BUS_START(v) \
+ (((struct rmixl_config *)(v))-rc_pcie_cfg_pbase)
+#define CHIP_W1_BUS_END(v) \
+ (CHIP_W1_SYS_START(v) + \
+ (((struct rmixl_config *)(v))-rc_pcie_cfg_size) - 1)
+#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
+#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
+
+#include mips/mips/bus_space_alignstride_chipdep.c
Index: src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.1
--- /dev/null Sun Nov 15 23:29:18 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c Sun Nov 15 23:29:18 2009
@@ -0,0 +1,62 @@
+/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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
CVS commit: othersrc
Module Name:othersrc Committed By: stacktic Date: Mon Nov 16 07:22:17 UTC 2009 Modified Files: othersrc/bin/fsu_cat: fsu_cat.1 othersrc/bin/fsu_chmod: fsu_chmod.1 othersrc/bin/fsu_cp: fsu_cp.1 othersrc/bin/fsu_ln: fsu_ln.1 othersrc/bin/fsu_ls: fsu_ls.1 othersrc/bin/fsu_mkdir: fsu_mkdir.1 othersrc/bin/fsu_mv: fsu_mv.1 othersrc/bin/fsu_rm: fsu_rm.1 othersrc/bin/fsu_rmdir: fsu_rmdir.1 othersrc/sbin/fsu_mknod: fsu_mknod.1 othersrc/usr.bin/fsu_chflags: fsu_chflags.1 othersrc/usr.bin/fsu_du: fsu_du.1 othersrc/usr.bin/fsu_mkfifo: fsu_mkfifo.1 othersrc/usr.bin/fsu_touch: fsu_touch.1 othersrc/usr.sbin/fsu_chown: Makefile fsu_chgrp.1 fsu_chown.1 Log Message: Updated fs-utils man pages To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_cat/fsu_cat.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_chmod/fsu_chmod.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_cp/fsu_cp.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ln/fsu_ln.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ls/fsu_ls.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_mkdir/fsu_mkdir.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_mv/fsu_mv.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_rm/fsu_rm.1 cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_rmdir/fsu_rmdir.1 cvs rdiff -u -r1.1 -r1.2 othersrc/sbin/fsu_mknod/fsu_mknod.1 cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_chflags/fsu_chflags.1 cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_du/fsu_du.1 cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_mkfifo/fsu_mkfifo.1 cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_touch/fsu_touch.1 cvs rdiff -u -r1.3 -r1.4 othersrc/usr.sbin/fsu_chown/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/usr.sbin/fsu_chown/fsu_chgrp.1 \ othersrc/usr.sbin/fsu_chown/fsu_chown.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/bin/fsu_cat/fsu_cat.1 diff -u othersrc/bin/fsu_cat/fsu_cat.1:1.1 othersrc/bin/fsu_cat/fsu_cat.1:1.2 --- othersrc/bin/fsu_cat/fsu_cat.1:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/fsu_cat/fsu_cat.1 Mon Nov 16 07:22:16 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsu_cat.1,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +.\ $NetBSD: fsu_cat.1,v 1.2 2009/11/16 07:22:16 stacktic Exp $ .\ from .\ NetBSD: cat.1,v 1.32 2006/09/23 11:24:44 wiz Exp .\ @@ -34,7 +34,7 @@ .\ .\ @(#)cat.1 8.3 (Berkeley) 5/2/95 .\ -.Dd June 19, 2008 +.Dd November 15, 2009 .Dt FSU_CAT 1 .Os .Sh NAME @@ -42,8 +42,12 @@ .Nd concatenate and print files from a file system image through rump .Sh SYNOPSIS .Nm +.Op Fl o Ar opt_args +.Op Fl s Ar fs_spec_args +.Op Fl t Ar fstype +.Op Fl f +.Ar fsdevice .Op Fl benstv -.Ar fstype fsdevice .Op - .Op Ar .Sh DESCRIPTION @@ -51,7 +55,7 @@ .Nm utility reads files sequentially, writing them to the standard output. The .Ar file -operands are absolute path in the +operands are absolute path in the .Ar fstype file system image contained in .Ar fsdevice @@ -100,7 +104,7 @@ .Sh EXAMPLES The command: .Bd -literal -offset indent -.Ic fsu_cat cd9660 cd9660_image.iso file1 +.Ic fsu_cat -t cd9660 cd9660_image.iso file1 .Ed .Pp will print the contents of @@ -109,7 +113,7 @@ .Pp The command: .Bd -literal -offset indent -.Ic fsu_cat ufs ufs_image.iso file1 file2 \*[Gt] file3 +.Ic fsu_cat -t ffs ffs_image.iso file1 file2 \*[Gt] file3 .Ed .Pp will sequentially print the contents of Index: othersrc/bin/fsu_chmod/fsu_chmod.1 diff -u othersrc/bin/fsu_chmod/fsu_chmod.1:1.1 othersrc/bin/fsu_chmod/fsu_chmod.1:1.2 --- othersrc/bin/fsu_chmod/fsu_chmod.1:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/fsu_chmod/fsu_chmod.1 Mon Nov 16 07:22:16 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsu_chmod.1,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +.\ $NetBSD: fsu_chmod.1,v 1.2 2009/11/16 07:22:16 stacktic Exp $ .\ from .\ NetBSD: chmod.1,v 1.21 2005/12/09 20:27:02 wiz Exp .\ @@ -34,7 +34,7 @@ .\ .\ @(#)chmod.1 8.4 (Berkeley) 3/31/94 .\ -.Dd August 11, 2008 +.Dd November 15, 2009 .Dt FSU_CHMOD 1 .Os .Sh NAME @@ -42,8 +42,10 @@ .Nd change file modes from a file system image through rump .Sh SYNOPSIS .Nm -.Op MNT_OPTIONS -.Op fstype +.Op Fl o Ar opt_args +.Op Fl s Ar fs_spec_args +.Op Fl t Ar fstype +.Op Fl f .Ar fsdevice .Oo .Fl R Index: othersrc/bin/fsu_cp/fsu_cp.1 diff -u othersrc/bin/fsu_cp/fsu_cp.1:1.1 othersrc/bin/fsu_cp/fsu_cp.1:1.2 --- othersrc/bin/fsu_cp/fsu_cp.1:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_cp/fsu_cp.1 Mon Nov 16 07:22:16 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsu_cp.1,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +.\ $NetBSD: fsu_cp.1,v 1.2 2009/11/16 07:22:16 stacktic Exp $ .\ .\ Copyright (c) 1989, 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -32,14 +32,19 @@ .\ .\ @(#)cp.1 8.3 (Berkeley) 4/18/94 .\ -.Dd August 15, 2005 -.Dt CP 1 +.Dd November 15, 2009 +.Dt FSU_CP 1 .Os .Sh
CVS commit: src
Module Name:src Committed By: dholland Date: Mon Nov 16 07:45:50 UTC 2009 Modified Files: src: UPDATING Log Message: Note briefly that new amd64 kernels don't build with old binutils. To generate a diff of this commit: cvs rdiff -u -r1.205 -r1.206 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.205 src/UPDATING:1.206 --- src/UPDATING:1.205 Mon Nov 16 07:39:54 2009 +++ src/UPDATING Mon Nov 16 07:45:50 2009 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.205 2009/11/16 07:39:54 dholland Exp $ +$NetBSD: UPDATING,v 1.206 2009/11/16 07:45:50 dholland Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -23,6 +23,10 @@ src/tools/lex/ and src/usr.bin/lex/. 20091001: + On amd64 you must rebuild tools (to get the new binutils) + before building a kernel, or the build fails on cpufunc.S. + +20091001: An error will create a ./usr/X11R7/lib/X11/xkb/compiled/xkb symlink, failing the build. Delete the link, and the subdir it is in, and retry your build.
