CVS commit: src/share/man/man9lua
Module Name:src Committed By: mbalmer Date: Sat Oct 26 07:42:18 UTC 2013 Added Files: src/share/man/man9lua: Makefile intro.9lua Log Message: place for 9lua man pages To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man9lua/Makefile \ src/share/man/man9lua/intro.9lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/share/man/man9lua/Makefile diff -u /dev/null src/share/man/man9lua/Makefile:1.1 --- /dev/null Sat Oct 26 07:42:18 2013 +++ src/share/man/man9lua/Makefile Sat Oct 26 07:42:18 2013 @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2013/10/26 07:42:18 mbalmer Exp $ + +MAN= intro.9lua + +.include bsd.man.mk +.include bsd.subdir.mk Index: src/share/man/man9lua/intro.9lua diff -u /dev/null src/share/man/man9lua/intro.9lua:1.1 --- /dev/null Sat Oct 26 07:42:18 2013 +++ src/share/man/man9lua/intro.9lua Sat Oct 26 07:42:18 2013 @@ -0,0 +1,49 @@ +.\ $NetBSD: intro.9lua,v 1.1 2013/10/26 07:42:18 mbalmer Exp $ +.\ +.\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. All rights reserved. +.\ +.\ 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. +.\ 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. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\ +.\ +.Dd October 26, 2013 +.Dt INTRO 3lua +.Os +.Sh NAME +.Nm intro +.Nd introduction to the Lua kernel bindings +.Sh DESCRIPTION +This section provides an overview of the Lua kernel bindings, their +functions, error returns and other common definitions and concepts. +.El +.Sh SEE ALSO +.Xr lua 1 , +.Xr luac 1 , +.Xr intro 3lua , +.Xr lua 4 +.Sh HISTORY +An +.Nm +manual for Lua kernel bindings appeared in +.Nx 7.0 .
CVS commit: src/share/man/man9lua
Module Name:src Committed By: mbalmer Date: Sat Oct 26 07:51:25 UTC 2013 Modified Files: src/share/man/man9lua: intro.9lua Log Message: fix Dt To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9lua/intro.9lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9lua/intro.9lua diff -u src/share/man/man9lua/intro.9lua:1.1 src/share/man/man9lua/intro.9lua:1.2 --- src/share/man/man9lua/intro.9lua:1.1 Sat Oct 26 07:42:18 2013 +++ src/share/man/man9lua/intro.9lua Sat Oct 26 07:51:25 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.9lua,v 1.1 2013/10/26 07:42:18 mbalmer Exp $ +.\ $NetBSD: intro.9lua,v 1.2 2013/10/26 07:51:25 mbalmer Exp $ .\ .\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. All rights reserved. .\ @@ -28,7 +28,7 @@ .\ .\ .Dd October 26, 2013 -.Dt INTRO 3lua +.Dt INTRO 9lua .Os .Sh NAME .Nm intro
CVS commit: src
Module Name:src
Committed By: mbalmer
Date: Sat Oct 26 08:23:38 UTC 2013
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man: Makefile
Log Message:
build and install intro(3lua) and intro(9lua)
To generate a diff of this commit:
cvs rdiff -u -r1.1440 -r1.1441 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.30 -r1.31 src/share/man/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1440 src/distrib/sets/lists/man/mi:1.1441
--- src/distrib/sets/lists/man/mi:1.1440 Thu Oct 24 21:55:00 2013
+++ src/distrib/sets/lists/man/mi Sat Oct 26 08:23:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1440 2013/10/24 21:55:00 mbalmer Exp $
+# $NetBSD: mi,v 1.1441 2013/10/26 08:23:38 mbalmer Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -637,6 +637,7 @@
./usr/share/man/cat3/atari/ahdi_writelabel.0 man-obsolete obsolete
./usr/share/man/cat3/i386 man-obsolete obsolete
./usr/share/man/cat3/i386/keycap.0 man-obsolete obsolete
+./usr/share/man/cat3lua/intro.0 man-sys-catman .cat
./usr/share/man/cat4/aac.0 man-sys-catman .cat
./usr/share/man/cat4/ac97.0 man-sys-catman .cat
./usr/share/man/cat4/acardide.0 man-sys-catman .cat
@@ -3103,6 +3104,7 @@
./usr/share/man/cat8/zpool.0 man-zfs-catman zfs,.cat
./usr/share/man/cat8/zzz.0 man-sysutil-catman .cat
./usr/share/man/cat9/boot.0 man-obsolete obsolete
+./usr/share/man/cat9lua/intro.0 man-sys-catman .cat
./usr/share/man/html1/Mail.html man-mail-htmlman html
./usr/share/man/html1/[.html man-util-htmlman html
./usr/share/man/html1/agrep.html man-util-htmlman html
@@ -3667,6 +3669,7 @@
./usr/share/man/html1/zgrep.html man-util-htmlman html
./usr/share/man/html1/zmore.html man-util-htmlman html
./usr/share/man/html1/znew.html man-util-htmlman html
+./usr/share/man/html3lua/intro.html man-sys-htmlman html
./usr/share/man/html4/aac.html man-sys-htmlman html
./usr/share/man/html4/ac97.html man-sys-htmlman html
./usr/share/man/html4/acardide.html man-sys-htmlman html
@@ -5773,6 +5776,7 @@
./usr/share/man/html8/zic.html man-sysutil-htmlman html
./usr/share/man/html8/zpool.html man-zfs-htmlman zfs,html
./usr/share/man/html8/zzz.html man-sysutil-htmlman html
+./usr/share/man/html9lua/intro.html man-sys-htmlman html
./usr/share/man/man1/Mail.1 man-mail-man .man
./usr/share/man/man1/[.1 man-util-man .man
./usr/share/man/man1/agrep.1 man-util-man .man
@@ -6371,6 +6375,7 @@
./usr/share/man/man3/atari/ahdi_writelabel.3 man-obsolete obsolete
./usr/share/man/man3/i386 man-obsolete obsolete
./usr/share/man/man3/i386/keycap.3 man-obsolete obsolete
+./usr/share/man/man3lua/intro.3lua man-sys-man .man
./usr/share/man/man4/aac.4 man-sys-man .man
./usr/share/man/man4/ac97.4 man-sys-man .man
./usr/share/man/man4/acardide.4 man-sys-man .man
@@ -8832,4 +8837,5 @@
./usr/share/man/man8/zpool.8 man-zfs-man zfs,.man
./usr/share/man/man8/zzz.8 man-sysutil-man .man
./usr/share/man/man9/boot.9 man-obsolete obsolete
+./usr/share/man/man9lua/intro.9lua man-sys-man .man
./usr/share/man/style.css man-mdocml-htmlman html
Index: src/share/man/Makefile
diff -u src/share/man/Makefile:1.30 src/share/man/Makefile:1.31
--- src/share/man/Makefile:1.30 Tue Feb 7 19:13:31 2012
+++ src/share/man/Makefile Sat Oct 26 08:23:38 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2012/02/07 19:13:31 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/26 08:23:38 mbalmer Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/16/94
.include bsd.own.mk
.if ${MKSHARE} != no
-SUBDIR= man0 man1 man2 man3 man4 man5 man6 man7 man8 man9
+SUBDIR= man0 man1 man2 man3 man3lua man4 man5 man6 man7 man8 man9 man9lua
WHATISDBDIR?= /usr/share/man
CVS commit: src/share/man/man1
Module Name:src Committed By: mbalmer Date: Sat Oct 26 08:37:58 UTC 2013 Modified Files: src/share/man/man1: intro.1 Log Message: .Xr intro(3lua) and intro(9lua) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man1/intro.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man1/intro.1 diff -u src/share/man/man1/intro.1:1.12 src/share/man/man1/intro.1:1.13 --- src/share/man/man1/intro.1:1.12 Wed May 5 22:03:19 2010 +++ src/share/man/man1/intro.1 Sat Oct 26 08:37:58 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.1,v 1.12 2010/05/05 22:03:19 wiz Exp $ +.\ $NetBSD: intro.1,v 1.13 2013/10/26 08:37:58 mbalmer Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)intro.1 8.2 (Berkeley) 12/30/93 .\ -.Dd May 5, 2010 +.Dd October 26, 2013 .Dt INTRO 1 .Os .Sh NAME @@ -59,12 +59,14 @@ Traditionally, the value 0 signifies suc .Xr man 1 , .Xr intro 2 , .Xr intro 3 , +.Xr intro 3lua , .Xr intro 4 , .Xr intro 5 , .Xr intro 6 , .Xr intro 7 , .Xr intro 8 , -.Xr intro 9 +.Xr intro 9 , +.Xr intro 9lua .Rs .%A The Regents of the University of California .%I University of California, Berkeley
CVS commit: src/lib/lua/gpio
Module Name:src
Committed By: mbalmer
Date: Sat Oct 26 09:18:00 UTC 2013
Modified Files:
src/lib/lua/gpio: gpio.c
Log Message:
also register gpio_methods on the gpio table
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/lua/gpio/gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/lua/gpio/gpio.c
diff -u src/lib/lua/gpio/gpio.c:1.7 src/lib/lua/gpio/gpio.c:1.8
--- src/lib/lua/gpio/gpio.c:1.7 Thu Mar 15 02:02:21 2012
+++ src/lib/lua/gpio/gpio.c Sat Oct 26 09:18:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.7 2012/03/15 02:02:21 joerg Exp $ */
+/* $NetBSD: gpio.c,v 1.8 2013/10/26 09:18:00 mbalmer Exp $ */
/*
* Copyright (c) 2011 Marc Balmer m...@msys.ch
@@ -255,13 +255,14 @@ static void
gpio_set_info(lua_State *L)
{
lua_pushliteral(L, _COPYRIGHT);
- lua_pushliteral(L, Copyright (C) 2011 Marc Balmer m...@msys.ch);
+ lua_pushliteral(L, Copyright (C) 2011, 2013 Marc Balmer
+ m...@msys.ch);
lua_settable(L, -3);
lua_pushliteral(L, _DESCRIPTION);
lua_pushliteral(L, GPIO interface for Lua);
lua_settable(L, -3);
lua_pushliteral(L, _VERSION);
- lua_pushliteral(L, gpio 1.0.1);
+ lua_pushliteral(L, gpio 1.0.2);
lua_settable(L, -3);
}
@@ -288,6 +289,7 @@ luaopen_gpio(lua_State* L)
int n;
luaL_register(L, gpio, methods);
+ luaL_register(L, NULL, gpio_methods);
gpio_set_info(L);
/* The gpio metatable */
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Sat Oct 26 09:19:45 UTC 2013 Modified Files: src/doc: CHANGES Log Message: note axen(4). To generate a diff of this commit: cvs rdiff -u -r1.1856 -r1.1857 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1856 src/doc/CHANGES:1.1857 --- src/doc/CHANGES:1.1856 Wed Oct 23 09:32:10 2013 +++ src/doc/CHANGES Sat Oct 26 09:19:45 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1856 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1857 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -278,7 +278,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: xsh(4): Add driver for Individual Computers X-Surf 100 network interface card. [rkujawa 20130808] postfix(1): Import version 2.9.7 [tron 20130821] -less(1): Import version 458 [tron 20130804] + less(1): Import version 458 [tron 20130804] mpl115a(4): Add driver for Freescale MPL115A2 I2C absolute pressure sensor. [rkujawa 20130908] dhcpcd(8): Import dhcpcd-6.1.0 [roy 20130920] @@ -294,3 +294,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: systat(1): Accept shell patterns to select drives. [bad 20131019] gffb: add a driver for NVIDIA GeForce2 MX graphics controllers. [macallan 20131023] + axen(4): Add a driver for ASIX AX88178a and AX88179 Ethernet interface. + Ported from OpenBSD. [nonaka 20131026]
CVS commit: src
Module Name:src Committed By: mbalmer Date: Sat Oct 26 10:48:19 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man3lua: Makefile Added Files: src/share/man/man3lua: gpio.3lua Log Message: first shot at documenting gpio(3lua) To generate a diff of this commit: cvs rdiff -u -r1.1442 -r1.1443 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.2 src/share/man/man3lua/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3lua/gpio.3lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1442 src/distrib/sets/lists/man/mi:1.1443 --- src/distrib/sets/lists/man/mi:1.1442 Sat Oct 26 09:16:19 2013 +++ src/distrib/sets/lists/man/mi Sat Oct 26 10:48:19 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1442 2013/10/26 09:16:19 nonaka Exp $ +# $NetBSD: mi,v 1.1443 2013/10/26 10:48:19 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -637,6 +637,16 @@ ./usr/share/man/cat3/atari/ahdi_writelabel.0 man-obsolete obsolete ./usr/share/man/cat3/i386 man-obsolete obsolete ./usr/share/man/cat3/i386/keycap.0 man-obsolete obsolete +./usr/share/man/cat3lua/gpio.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.open.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.info.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.close.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.set.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.unset.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.read.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.write.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.toggle.0 man-sys-catman .cat +./usr/share/man/cat3lua/gpio.attach.0 man-sys-catman .cat ./usr/share/man/cat3lua/intro.0 man-sys-catman .cat ./usr/share/man/cat4/aac.0 man-sys-catman .cat ./usr/share/man/cat4/ac97.0 man-sys-catman .cat @@ -3670,6 +3680,16 @@ ./usr/share/man/html1/zgrep.html man-util-htmlman html ./usr/share/man/html1/zmore.html man-util-htmlman html ./usr/share/man/html1/znew.html man-util-htmlman html +./usr/share/man/html3lua/gpio.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.open.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.info.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.close.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.set.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.unset.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.read.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.write.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.toggle.html man-sys-htmlman html +./usr/share/man/html3lua/gpio.attach.html man-sys-htmlman html ./usr/share/man/html3lua/intro.html man-sys-htmlman html ./usr/share/man/html4/aac.html man-sys-htmlman html ./usr/share/man/html4/ac97.html man-sys-htmlman html @@ -6377,6 +6397,16 @@ ./usr/share/man/man3/atari/ahdi_writelabel.3 man-obsolete obsolete ./usr/share/man/man3/i386 man-obsolete obsolete ./usr/share/man/man3/i386/keycap.3 man-obsolete obsolete +./usr/share/man/man3lua/gpio.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.open.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.info.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.close.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.set.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.unset.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.read.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.write.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.toggle.3lua man-sys-man .man +./usr/share/man/man3lua/gpio.attach.3lua man-sys-man .man ./usr/share/man/man3lua/intro.3lua man-sys-man .man ./usr/share/man/man4/aac.4 man-sys-man .man ./usr/share/man/man4/ac97.4 man-sys-man .man Index: src/share/man/man3lua/Makefile diff -u src/share/man/man3lua/Makefile:1.1 src/share/man/man3lua/Makefile:1.2 --- src/share/man/man3lua/Makefile:1.1 Fri Oct 25 15:27:03 2013 +++ src/share/man/man3lua/Makefile Sat Oct 26 10:48:19 2013 @@ -1,6 +1,16 @@ -# $NetBSD: Makefile,v 1.1 2013/10/25 15:27:03 mbalmer Exp $ +# $NetBSD: Makefile,v 1.2 2013/10/26 10:48:19 mbalmer Exp $ -MAN= intro.3lua +MAN= gpio.3lua intro.3lua + +MLINKS+=gpio.3lua gpio.open.3lua \ + gpio.3lua gpio.info.3lua \ + gpio.3lua gpio.close.3lua \ + gpio.3lua gpio.set.3lua \ + gpio.3lua gpio.unset.3lua \ + gpio.3lua gpio.read.3lua \ + gpio.3lua gpio.write.3lua \ + gpio.3lua gpio.toggle.3lua \ + gpio.3lua gpio.attach.3lua .include bsd.man.mk .include bsd.subdir.mk Added files: Index: src/share/man/man3lua/gpio.3lua diff -u /dev/null src/share/man/man3lua/gpio.3lua:1.1 --- /dev/null Sat Oct 26 10:48:19 2013 +++ src/share/man/man3lua/gpio.3lua Sat Oct 26 10:48:19 2013 @@ -0,0 +1,178 @@ +.\ $NetBSD: gpio.3lua,v 1.1 2013/10/26
CVS commit: src/sys/dev/spi
Module Name:src
Committed By: rkujawa
Date: Sat Oct 26 15:18:21 UTC 2013
Modified Files:
src/sys/dev/spi: m25p.c
Log Message:
Add support for M25P16, tested on Raspberry PI with Digilent PmodSF.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spi/m25p.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/dev/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.3 src/sys/dev/spi/m25p.c:1.4
--- src/sys/dev/spi/m25p.c:1.3 Sun Apr 21 08:38:16 2013
+++ src/sys/dev/spi/m25p.c Sat Oct 26 15:18:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.3 2013/04/21 08:38:16 rkujawa Exp $ */
+/* $NetBSD: m25p.c,v 1.4 2013/10/26 15:18:21 rkujawa Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: m25p.c,v 1.3 2013/04/21 08:38:16 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: m25p.c,v 1.4 2013/10/26 15:18:21 rkujawa Exp $);
#include sys/param.h
#include sys/systm.h
@@ -92,6 +92,7 @@ static const struct m25p_info {
uint16_t mhz;
} m25p_infos[] = {
{ 0x16, 0x20, 0x2017, STMicro M25P64, 8192, 64 }, /* 64Mbit */
+ { 0x14, 0x20, 0x2015, STMicro M25P16, 2048, 64 }, /* 16Mbit */
{ 0x12, 0x20, 0x2013, STMicro M25P40, 512, 64 }, /* 4Mbit */
{ 0xc0, 0x20, 0x7117, STMicro M25PX64, 8192, 64 }, /* 64Mbit */
{ 0x0, 0x20, 0xBB18, Numonyx N25Q128, 16384, 64 }, /* 128Mbit */
CVS commit: src/share/man/man9lua
Module Name:src Committed By: njoly Date: Sat Oct 26 17:06:51 UTC 2013 Modified Files: src/share/man/man9lua: intro.9lua Log Message: Kill extra El macro. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9lua/intro.9lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9lua/intro.9lua diff -u src/share/man/man9lua/intro.9lua:1.2 src/share/man/man9lua/intro.9lua:1.3 --- src/share/man/man9lua/intro.9lua:1.2 Sat Oct 26 07:51:25 2013 +++ src/share/man/man9lua/intro.9lua Sat Oct 26 17:06:51 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.9lua,v 1.2 2013/10/26 07:51:25 mbalmer Exp $ +.\ $NetBSD: intro.9lua,v 1.3 2013/10/26 17:06:51 njoly Exp $ .\ .\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. All rights reserved. .\ @@ -36,7 +36,6 @@ .Sh DESCRIPTION This section provides an overview of the Lua kernel bindings, their functions, error returns and other common definitions and concepts. -.El .Sh SEE ALSO .Xr lua 1 , .Xr luac 1 ,
CVS commit: src/share/man/man3lua
Module Name:src Committed By: mbalmer Date: Sat Oct 26 17:46:48 UTC 2013 Modified Files: src/share/man/man3lua: intro.3lua Log Message: kill unused .El macro To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3lua/intro.3lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3lua/intro.3lua diff -u src/share/man/man3lua/intro.3lua:1.1 src/share/man/man3lua/intro.3lua:1.2 --- src/share/man/man3lua/intro.3lua:1.1 Fri Oct 25 15:27:03 2013 +++ src/share/man/man3lua/intro.3lua Sat Oct 26 17:46:48 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.3lua,v 1.1 2013/10/25 15:27:03 mbalmer Exp $ +.\ $NetBSD: intro.3lua,v 1.2 2013/10/26 17:46:48 mbalmer Exp $ .\ .\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. All rights reserved. .\ @@ -36,7 +36,6 @@ .Sh DESCRIPTION This section provides an overview of the Lua libraries, their functions, error returns and other common definitions and concepts. -.El .Sh SEE ALSO .Xr lua 1 , .Xr luac 1 ,
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: jdc Date: Sat Oct 26 18:28:15 UTC 2013 Modified Files: src/sys/dev/i2c: lm87.c Log Message: A fan reading of 0xff is also invalid (observed on AlphaServer DS20L). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/lm87.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/dev/i2c/lm87.c diff -u src/sys/dev/i2c/lm87.c:1.2 src/sys/dev/i2c/lm87.c:1.3 --- src/sys/dev/i2c/lm87.c:1.2 Fri Oct 18 15:16:08 2013 +++ src/sys/dev/i2c/lm87.c Sat Oct 26 18:28:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: lm87.c,v 1.2 2013/10/18 15:16:08 jdc Exp $ */ +/* $NetBSD: lm87.c,v 1.3 2013/10/26 18:28:15 jdc Exp $ */ /* $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $ */ /* @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lm87.c,v 1.2 2013/10/18 15:16:08 jdc Exp $); +__KERNEL_RCSID(0, $NetBSD: lm87.c,v 1.3 2013/10/26 18:28:15 jdc Exp $); #include sys/param.h #include sys/systm.h @@ -365,7 +365,7 @@ lmenv_refresh(struct sysmon_envsys *sme, break; } tmp = data * sc-sc_fan1_div; - if (tmp == 0) + if (tmp == 0 || tmp == 0xff) edata-state = ENVSYS_SINVALID; else edata-value_cur = 135 / tmp; @@ -378,7 +378,7 @@ lmenv_refresh(struct sysmon_envsys *sme, break; } tmp = data * sc-sc_fan2_div; - if (tmp == 0) + if (tmp == 0 || tmp == 0xff) edata-state = ENVSYS_SINVALID; else edata-value_cur = 135 / tmp;
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Sat Oct 26 18:31:29 UTC 2013 Modified Files: src/sys/sys: systm.h Log Message: change voidspace to voidtab for device_printf To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/sys/systm.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/sys/systm.h diff -u src/sys/sys/systm.h:1.258 src/sys/sys/systm.h:1.259 --- src/sys/sys/systm.h:1.258 Mon Mar 18 13:36:23 2013 +++ src/sys/sys/systm.h Sat Oct 26 18:31:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.258 2013/03/18 13:36:23 para Exp $ */ +/* $NetBSD: systm.h,v 1.259 2013/10/26 18:31:29 matt Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -185,7 +185,7 @@ void aprint_naive(const char *, ...) __p void aprint_verbose(const char *, ...) __printflike(1, 2); void aprint_debug(const char *, ...) __printflike(1, 2); -void device_printf(device_t, const char *fmt, ...) __printflike(2, 3); +void device_printf(device_t, const char *fmt, ...) __printflike(2, 3); void aprint_normal_dev(device_t, const char *, ...) __printflike(2, 3); void aprint_error_dev(device_t, const char *, ...) __printflike(2, 3);
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: jdc
Date: Sat Oct 26 18:47:27 UTC 2013
Modified Files:
src/sys/arch/sparc64/include: autoconf.h
Log Message:
Allow machine_banner and machine_model to be used outside autoconf.c, for
example, by drivers that need to match on model name. Suggested by mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/include/autoconf.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/sparc64/include/autoconf.h
diff -u src/sys/arch/sparc64/include/autoconf.h:1.31 src/sys/arch/sparc64/include/autoconf.h:1.32
--- src/sys/arch/sparc64/include/autoconf.h:1.31 Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/include/autoconf.h Sat Oct 26 18:47:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.31 2012/10/27 17:18:12 chs Exp $ */
+/* $NetBSD: autoconf.h,v 1.32 2013/10/26 18:47:27 jdc Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -76,6 +76,10 @@
#include sys/bus.h
#include machine/promlib.h
+/* Machine banner name and model name */
+extern char machine_banner[100];
+extern char machine_model[100];
+
/* This is used to map device classes to IPLs */
struct intrmap {
const char *in_class;
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: jdc
Date: Sat Oct 26 18:49:30 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: tda.c
Log Message:
Use machine_model from autoconf.c, instead of calling the firmware here.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/tda.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/sparc64/dev/tda.c
diff -u src/sys/arch/sparc64/dev/tda.c:1.8 src/sys/arch/sparc64/dev/tda.c:1.9
--- src/sys/arch/sparc64/dev/tda.c:1.8 Sun Feb 3 10:58:28 2013
+++ src/sys/arch/sparc64/dev/tda.c Sat Oct 26 18:49:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tda.c,v 1.8 2013/02/03 10:58:28 jdc Exp $ */
+/* $NetBSD: tda.c,v 1.9 2013/10/26 18:49:30 jdc Exp $ */
/* $OpenBSD: tda.c,v 1.4 2008/02/27 17:25:00 robert Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tda.c,v 1.8 2013/02/03 10:58:28 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: tda.c,v 1.9 2013/10/26 18:49:30 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -89,12 +89,9 @@ int
tda_match(device_t parent, cfdata_t match, void *aux)
{
struct i2c_attach_args *ia = aux;
- char name[32];
/* Only attach on the Sun Blade 1000/2000. */
- if (OF_getprop(findroot(), name, name, sizeof(name)) = 0)
- return (0);
- if (strcmp(name, SUNW,Sun-Blade-1000) != 0)
+ if (strcmp(machine_model, SUNW,Sun-Blade-1000) != 0)
return (0);
/*
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mbalmer Date: Sat Oct 26 20:06:38 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add sys/lua.h To generate a diff of this commit: cvs rdiff -u -r1.1846 -r1.1847 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1846 src/distrib/sets/lists/comp/mi:1.1847 --- src/distrib/sets/lists/comp/mi:1.1846 Sat Oct 19 19:59:05 2013 +++ src/distrib/sets/lists/comp/mi Sat Oct 26 20:06:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1846 2013/10/19 19:59:05 christos Exp $ +# $NetBSD: mi,v 1.1847 2013/10/26 20:06:38 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2590,6 +2590,7 @@ ./usr/include/sys/localedef.h comp-c-include ./usr/include/sys/lock.h comp-c-include ./usr/include/sys/lockf.h comp-c-include +./usr/include/sys/lua.hcomp-c-include ./usr/include/sys/lwp.hcomp-c-include ./usr/include/sys/lwpctl.h comp-c-include ./usr/include/sys/malloc.h comp-c-include
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sat Oct 26 20:31:23 UTC 2013
Modified Files:
src/sbin/gpt: map.c
Log Message:
cosmetic fix from drochner@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/map.c
diff -u src/sbin/gpt/map.c:1.2 src/sbin/gpt/map.c:1.3
--- src/sbin/gpt/map.c:1.2 Sun Oct 15 22:36:29 2006
+++ src/sbin/gpt/map.c Sat Oct 26 20:31:23 2013
@@ -29,7 +29,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/map.c,v 1.6 2005/08/31 01:47:19 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: map.c,v 1.2 2006/10/15 22:36:29 christos Exp $);
+__RCSID($NetBSD: map.c,v 1.3 2013/10/26 20:31:23 jnemeth Exp $);
#endif
#include sys/types.h
@@ -72,8 +72,8 @@ map_add(off_t start, off_t size, int typ
return (NULL);
if (n-map_start + n-map_size start + size) {
- warnx(error: bogus map);
- return (0);
+ warnx(error: map entry doesn't fit media);
+ return (NULL);
}
if (n-map_start == start n-map_size == size) {
CVS commit: src/common/lib/libc/hash/murmurhash
Module Name:src
Committed By: rmind
Date: Sat Oct 26 21:06:38 UTC 2013
Modified Files:
src/common/lib/libc/hash/murmurhash: murmurhash.c
Log Message:
murmurhash2: add an optimised path for the aligned pointer case.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/hash/murmurhash/murmurhash.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/hash/murmurhash/murmurhash.c
diff -u src/common/lib/libc/hash/murmurhash/murmurhash.c:1.5 src/common/lib/libc/hash/murmurhash/murmurhash.c:1.6
--- src/common/lib/libc/hash/murmurhash/murmurhash.c:1.5 Sun Jun 30 12:20:32 2013
+++ src/common/lib/libc/hash/murmurhash/murmurhash.c Sat Oct 26 21:06:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $ */
+/* $NetBSD: murmurhash.c,v 1.6 2013/10/26 21:06:38 rmind Exp $ */
/*
* MurmurHash2 -- from the original code:
@@ -14,18 +14,19 @@
#include sys/cdefs.h
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, $NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: murmurhash.c,v 1.6 2013/10/26 21:06:38 rmind Exp $);
#else
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $);
+__RCSID($NetBSD: murmurhash.c,v 1.6 2013/10/26 21:06:38 rmind Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
#endif
#include sys/types.h
+#include sys/param.h
#include sys/hash.h
#if !defined(_KERNEL) !defined(_STANDALONE)
@@ -48,23 +49,39 @@ murmurhash2(const void *key, size_t len,
const uint8_t *data = key;
uint32_t h = seed ^ (uint32_t)len;
- while (len = sizeof(uint32_t)) {
- uint32_t k;
-
- k = data[0];
- k |= data[1] 8;
- k |= data[2] 16;
- k |= data[3] 24;
-
- k *= m;
- k ^= k r;
- k *= m;
-
- h *= m;
- h ^= k;
-
- data += sizeof(uint32_t);
- len -= sizeof(uint32_t);
+ if (__predict_true(ALIGNED_POINTER(key, uint32_t))) {
+ while (len = sizeof(uint32_t)) {
+ uint32_t k = *(const uint32_t *)data;
+
+ k *= m;
+ k ^= k r;
+ k *= m;
+
+ h *= m;
+ h ^= k;
+
+ data += sizeof(uint32_t);
+ len -= sizeof(uint32_t);
+ }
+ } else {
+ while (len = sizeof(uint32_t)) {
+ uint32_t k;
+
+ k = data[0];
+ k |= data[1] 8;
+ k |= data[2] 16;
+ k |= data[3] 24;
+
+ k *= m;
+ k ^= k r;
+ k *= m;
+
+ h *= m;
+ h ^= k;
+
+ data += sizeof(uint32_t);
+ len -= sizeof(uint32_t);
+ }
}
/* Handle the last few bytes of the input array. */
CVS commit: src/external/bsd/elftosb/usr.sbin/elftosb
Module Name:src Committed By: wiz Date: Sat Oct 26 22:55:51 UTC 2013 Modified Files: src/external/bsd/elftosb/usr.sbin/elftosb: elftosb.8 Log Message: Syntax and formatting fixes. Add missing command. Explain 'sb'. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 diff -u src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.1 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.2 --- src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.1 Thu Nov 15 19:49:16 2012 +++ src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Sat Oct 26 22:55:51 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: elftosb.8,v 1.1 2012/11/15 19:49:16 jkunz Exp $ +.\ $NetBSD: elftosb.8,v 1.2 2013/10/26 22:55:51 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,41 +25,39 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd November 3, 2012 -.Dt elftosb 1 +.Dt ELFTOSB 8 .Os .Sh NAME .Nm elftosb .Nd generate secure boot images for Freescale processors .Sh SYNOPSIS .Nm -.Oo Fl ? Ns \| Ns Fl -help Oc -.Oo Fl C|--component Ar version Oc -.Oo Fl c|--command Ar file Oc -.Oo Fl D|--define Ar const Oc -.Oo Fl d|--debug Oc -.Oo Fl f|--chip-family Ar family Oc -.Oo Fl k|--key Ar file Oc -.Oo Fl O|--option Ar option Oc -.Oo Fl o|--output Ar file Oc -.Oo Fl P|--product Ar version Oc -.Oo Fl p|--search-path Ar path Oc -.Oo Fl q|--quiet Oc -.Oo Fl V|--verbose Oc -.Oo Fl v|--version Oc -.Oo Fl z|--zero-key Oc +.Oo Fl ?, Fl Fl help Oc +.Oo Fl C, Fl Fl component Ar version Oc +.Oo Fl c, Fl Fl command Ar file Oc +.Oo Fl D, Fl Fl define Ar const Oc +.Oo Fl d, Fl Fl debug Oc +.Oo Fl f, Fl Fl chip-family Ar family Oc +.Oo Fl k, Fl Fl key Ar file Oc +.Oo Fl O, Fl Fl option Ar option Oc +.Oo Fl o, Fl Fl output Ar file Oc +.Oo Fl P, Fl Fl product Ar version Oc +.Oo Fl p, Fl Fl search-path Ar path Oc +.Oo Fl q, Fl Fl quiet Oc +.Oo Fl V, Fl Fl verbose Oc +.Oo Fl v, Fl Fl version Oc +.Oo Fl z, Fl Fl zero-key Oc .Ar files... -.Oc -.Oc .Sh DESCRIPTION The .Nm -programm is used to create a digitaly signed sb boot file. +programm is used to create a digitaly signed secure boot (sb) file. This sb file can be booted by the first stage boot loader found in Freescale i.MX23 and i.MX28 application processors. -One or several ELF files and optionaly a key are taken as input and +One or several ELF files and optionally a key are taken as input and processed under the control of a command file to generate the sb file. .Sh SEE ALSO -.Xr sbkeygen 1 +.Xr sbkeygen 1 , .Xr sbtool 1 .br Freescale Application Note AN4555
CVS commit: src/external/bsd/elftosb/usr.sbin/sbkeygen
Module Name:src Committed By: wiz Date: Sat Oct 26 22:58:04 UTC 2013 Modified Files: src/external/bsd/elftosb/usr.sbin/sbkeygen: sbkeygen.8 Log Message: Formatting and macro usage fixes. Fix xrefs. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.1 src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.2 --- src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.1 Thu Nov 15 19:49:16 2012 +++ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 Sat Oct 26 22:58:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: sbkeygen.8,v 1.1 2012/11/15 19:49:16 jkunz Exp $ +.\ $NetBSD: sbkeygen.8,v 1.2 2013/10/26 22:58:04 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,41 +25,42 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd November 3, 2012 -.Dt sbkeygen 1 +.Dt SBKEYGEN 8 .Os .Sh NAME .Nm sbkeygen .Nd generate keys for use with -.Xr elftosb 1 +.Xr elftosb 8 and -.Xr sbtool 1 +.Xr sbtool 8 .Sh SYNOPSIS .Nm -.Oo Fl ? Ns \| Ns Fl -help Oc -.Oo Fl n|--number Ar int Oc -.Oo Fl q|--quiet Oc -.Oo Fl V|--verbose Oc -.Oo Fl v|--version Oc -.Ar key-files... -.Oc -.Oc +.Oo Fl ?, Fl Fl help Oc +.Oo Fl n, Fl Fl number Ar int Oc +.Oo Fl q, Fl Fl quiet Oc +.Oo Fl V, Fl Fl verbose Oc +.Oo Fl v, Fl Fl version Oc +.Ar key-files ... .Sh DESCRIPTION The .Nm programm is used to generate cryptographic keys for the -.Xr elftosb 1 +.Xr elftosb 8 and -.Xr sbtool 1 +.Xr sbtool 8 programms. .Pp The .Nm -programm is called keygen by Freescale. It was renamed to +programm is called keygen by Freescale. +It was renamed to .Nm -when imported into NetBSD to avoid the generic name keygen. +when imported into +.Nx +to avoid the generic name keygen. .Sh SEE ALSO -.Xr elftosb 1 -.Xr sbtool 1 +.Xr elftosb 8 , +.Xr sbtool 8 .br Freescale Application Note AN4555 .Sh COPYRIGHT
CVS commit: src/external/bsd/elftosb/usr.sbin/elftosb
Module Name:src Committed By: wiz Date: Sat Oct 26 22:58:29 UTC 2013 Modified Files: src/external/bsd/elftosb/usr.sbin/elftosb: elftosb.8 Log Message: Fix xrefs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 diff -u src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.2 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.3 --- src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.2 Sat Oct 26 22:55:51 2013 +++ src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Sat Oct 26 22:58:29 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: elftosb.8,v 1.2 2013/10/26 22:55:51 wiz Exp $ +.\ $NetBSD: elftosb.8,v 1.3 2013/10/26 22:58:29 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -57,8 +57,8 @@ Freescale i.MX23 and i.MX28 application One or several ELF files and optionally a key are taken as input and processed under the control of a command file to generate the sb file. .Sh SEE ALSO -.Xr sbkeygen 1 , -.Xr sbtool 1 +.Xr sbkeygen 8 , +.Xr sbtool 8 .br Freescale Application Note AN4555 .Sh COPYRIGHT
CVS commit: src/external/bsd/elftosb/usr.sbin/sbtool
Module Name:src Committed By: wiz Date: Sat Oct 26 22:59:28 UTC 2013 Modified Files: src/external/bsd/elftosb/usr.sbin/sbtool: sbtool.8 Log Message: Fix macro usage and xrefs. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 diff -u src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.1 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.2 --- src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.1 Thu Nov 15 19:49:17 2012 +++ src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Sat Oct 26 22:59:28 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: sbtool.8,v 1.1 2012/11/15 19:49:17 jkunz Exp $ +.\ $NetBSD: sbtool.8,v 1.2 2013/10/26 22:59:28 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,33 +25,31 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd November 3, 2012 -.Dt sbtool 1 +.Dt SBTOOL 8 .Os .Sh NAME .Nm sbtool .Nd manipulate sb files .Sh SYNOPSIS .Nm -.Oo Fl ? Ns \| Ns Fl -help Oc -.Oo Fl b|--binary Oc -.Oo Fl d|--debug Oc -.Oo Fl k|--key Ar file Oc -.Oo Fl q|--quiet Oc -.Oo Fl V|--verbose Oc -.Oo Fl v|--version Oc -.Oo Fl x|--extract value Oc -.Oo Fl z|--zero-key Oc +.Oo Fl ?, Fl Fl help Oc +.Oo Fl b, Fl Fl binary Oc +.Oo Fl d, Fl Fl debug Oc +.Oo Fl k, Fl Fl key Ar file Oc +.Oo Fl q, Fl Fl quiet Oc +.Oo Fl V, Fl Fl verbose Oc +.Oo Fl v, Fl Fl version Oc +.Oo Fl x, Fl Fl extract value Oc +.Oo Fl z, Fl Fl zero-key Oc .Ar sb-file -.Oc -.Oc .Sh DESCRIPTION The .Nm programm is used to manipulate sb boot files for Freescale i.MX23 and i.MX28 application processors. .Sh SEE ALSO -.Xr elftosb 1 -.Xr sbkeygen 1 +.Xr elftosb 8 , +.Xr sbkeygen 8 .br Freescale Application Note AN4555 .Sh COPYRIGHT
CVS commit: src/sys/arch/x68k/x68k
Module Name:src
Committed By: tsutsui
Date: Sun Oct 27 02:06:06 UTC 2013
Modified Files:
src/sys/arch/x68k/x68k: locore.s machdep.c pmap_bootstrap.c
Log Message:
Probe extended memories before pmap_boostrap() for actual fix of PR/45915.
Also expand expected maximum extended memory regions to recognize
upto 1008 MB RAM that is supported by the XM6i emulator.
See my post on port-x68k@ for more details:
http://mail-index.NetBSD.org/port-x68k/2013/10/19/msg39.html
Probably worth to pullup to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/x68k/x68k/locore.s
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x68k/x68k/pmap_bootstrap.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/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.110 src/sys/arch/x68k/x68k/locore.s:1.111
--- src/sys/arch/x68k/x68k/locore.s:1.110 Sat May 19 08:29:32 2012
+++ src/sys/arch/x68k/x68k/locore.s Sun Oct 27 02:06:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.110 2012/05/19 08:29:32 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.111 2013/10/27 02:06:06 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -777,6 +777,8 @@ Lstart1:
#endif
movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart2:
+ RELOC(setmemrange,%a0) | call setmemrange()
+ jbsr %a0@ | to probe all memory regions
addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.186 src/sys/arch/x68k/x68k/machdep.c:1.187
--- src/sys/arch/x68k/x68k/machdep.c:1.186 Tue Jan 22 11:58:39 2013
+++ src/sys/arch/x68k/x68k/machdep.c Sun Oct 27 02:06:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.186 2013/01/22 11:58:39 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.187 2013/10/27 02:06:06 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.186 2013/01/22 11:58:39 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.187 2013/10/27 02:06:06 tsutsui Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -130,10 +130,6 @@ void initcpu(void);
int cpu_dumpsize(void);
int cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
void cpu_init_kcore_hdr(void);
-#ifdef EXTENDED_MEMORY
-static int mem_exists(void *, u_long);
-static void setmemrange(void);
-#endif
/* functions called from locore.s */
void x68k_init(void);
@@ -142,6 +138,24 @@ void straytrap(int, u_short);
void nmihand(struct frame);
void intrhand(int);
+/* memory probe function called from locore.s */
+void setmemrange(void);
+#ifdef EXTENDED_MEMORY
+static bool mem_exists(paddr_t, paddr_t);
+#endif
+
+typedef struct {
+ paddr_t start;
+ paddr_t end;
+} phys_seg_t;
+
+static int basemem;
+static phys_seg_t phys_basemem_seg;
+#ifdef EXTENDED_MEMORY
+#define EXTMEM_SEGS (VM_PHYSSEG_MAX - 1)
+static phys_seg_t phys_extmem_seg[EXTMEM_SEGS];
+#endif
+
/*
* On the 68020/68030, the value of delay_divisor is roughly
* 2048 / cpuspeed (where cpuspeed is in MHz).
@@ -167,24 +181,35 @@ x68k_init(void)
{
u_int i;
paddr_t msgbuf_pa;
+ paddr_t s, e;
/*
- * Tell the VM system about available physical memory.
+ * Most m68k ports allocate msgbuf at the end of available memory
+ * (i.e. just after avail_end), but on x68k we allocate msgbuf
+ * at the end of main memory for compatibility.
*/
- uvm_page_physload(atop(avail_start), atop(avail_end),
- atop(avail_start), atop(avail_end),
- VM_FREELIST_MAINMEM);
+ msgbuf_pa = phys_basemem_seg.end - m68k_round_page(MSGBUFSIZE);
/*
- * avail_end was pre-decremented in pmap_bootstrap to compensate
- * for msgbuf pages, but avail_end is also used to check DMA'able
- * memory range for intio devices and it would be updated per
- * probed extended memories, so explicitly save msgbuf address here.
+ * Tell the VM system about available physical memory.
*/
- msgbuf_pa = avail_end;
+ /* load the main memory region */
+ s = avail_start;
+ e = msgbuf_pa;
+ uvm_page_physload(atop(s), atop(e), atop(s), atop(e),
+ VM_FREELIST_MAINMEM);
#ifdef EXTENDED_MEMORY
- setmemrange();
+ /* load extended memory regions */
+ for (i = 0; i EXTMEM_SEGS; i++) {
+ if (phys_extmem_seg[i].start == phys_extmem_seg[i].end)
+ continue;
+ uvm_page_physload(atop(phys_extmem_seg[i].start),
+ atop(phys_extmem_seg[i].end),
+ atop(phys_extmem_seg[i].start),
+ atop(phys_extmem_seg[i].end),
+ VM_FREELIST_HIGHMEM);
+ }
#endif
/*
@@ -1011,57 +1036,63 @@ module_init_md(void)
#endif
#ifdef EXTENDED_MEMORY
-#ifdef EM_DEBUG
-static int em_debug = 0;
-#define DPRINTF(str) do{ if (em_debug) printf str; } while (0);
-#else
-#define DPRINTF(str)
-#endif
-static struct memlist {
- void
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Sun Oct 27 02:25:03 UTC 2013 Modified Files: src/doc: CHANGES Log Message: Note that NetBSD/x68k now supports upto 1008 MB extended memory found on XM6i. To generate a diff of this commit: cvs rdiff -u -r1.1857 -r1.1858 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1857 src/doc/CHANGES:1.1858 --- src/doc/CHANGES:1.1857 Sat Oct 26 09:19:45 2013 +++ src/doc/CHANGES Sun Oct 27 02:25:03 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1857 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1858 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -296,3 +296,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [macallan 20131023] axen(4): Add a driver for ASIX AX88178a and AX88179 Ethernet interface. Ported from OpenBSD. [nonaka 20131026] + x68k: Support upto 1008 MB extended memory that is found on the XM6i + emulator. [tsutsui 20131027]
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: htodd Date: Sun Oct 27 02:39:21 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Revert mi because the added line refers to an imaginary file. To generate a diff of this commit: cvs rdiff -u -r1.1847 -r1.1848 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1847 src/distrib/sets/lists/comp/mi:1.1848 --- src/distrib/sets/lists/comp/mi:1.1847 Sat Oct 26 20:06:38 2013 +++ src/distrib/sets/lists/comp/mi Sun Oct 27 02:39:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1847 2013/10/26 20:06:38 mbalmer Exp $ +# $NetBSD: mi,v 1.1848 2013/10/27 02:39:21 htodd Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2590,7 +2590,6 @@ ./usr/include/sys/localedef.h comp-c-include ./usr/include/sys/lock.h comp-c-include ./usr/include/sys/lockf.h comp-c-include -./usr/include/sys/lua.hcomp-c-include ./usr/include/sys/lwp.hcomp-c-include ./usr/include/sys/lwpctl.h comp-c-include ./usr/include/sys/malloc.h comp-c-include
