CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Mar 26 08:55:17 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 643 To generate a diff of this commit: cvs rdiff -u -r1.1.2.238 -r1.1.2.239 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.238 src/doc/CHANGES-7.0:1.1.2.239 --- src/doc/CHANGES-7.0:1.1.2.238 Wed Mar 25 17:18:11 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 08:55:16 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.238 2015/03/25 17:18:11 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.239 2015/03/26 08:55:16 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19008,3 +19008,9 @@ include/unistd.h1.145 namespace. [wiz, ticket #642] +sys/arch/arm/vfp/vfp_init.c 1.47 + + Fix some inverted return values. Don't return SIGILL if there + is an active FPU exception. + [skrll, ticket #643] +
CVS commit: [netbsd-7] xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: martin Date: Thu Mar 26 09:45:57 UTC 2015 Modified Files: xsrc/external/mit/freetype/dist [netbsd-7]: CMakeLists.txt ChangeLog ChangeLog.21 Jamfile README xsrc/external/mit/freetype/dist/builds [netbsd-7]: detect.mk freetype.mk toplevel.mk xsrc/external/mit/freetype/dist/builds/mac [netbsd-7]: ftmac.c xsrc/external/mit/freetype/dist/builds/unix [netbsd-7]: config.guess config.sub configure configure.ac configure.raw freetype-config.in freetype2.in freetype2.m4 ftconfig.in unix-def.in xsrc/external/mit/freetype/dist/builds/vms [netbsd-7]: ftconfig.h xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce [netbsd-7]: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce [netbsd-7]: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/vc2005 [netbsd-7]: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/vc2008 [netbsd-7]: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/vc2010 [netbsd-7]: freetype.sln freetype.vcxproj index.html xsrc/external/mit/freetype/dist/builds/windows/visualc [netbsd-7]: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/visualce [netbsd-7]: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/devel [netbsd-7]: ftoption.h xsrc/external/mit/freetype/dist/docs [netbsd-7]: CHANGES VERSION.DLL freetype-config.1 release xsrc/external/mit/freetype/dist/docs/reference [netbsd-7]: ft2-auto_hinter.html ft2-base_interface.html ft2-basic_types.html ft2-bdf_fonts.html ft2-bitmap_handling.html ft2-bzip2.html ft2-cache_subsystem.html ft2-cff_driver.html ft2-cid_fonts.html ft2-computations.html ft2-font_formats.html ft2-gasp_table.html ft2-glyph_management.html ft2-glyph_stroker.html ft2-glyph_variants.html ft2-gx_validation.html ft2-gzip.html ft2-header_file_macros.html ft2-header_inclusion.html ft2-incremental.html ft2-index.html ft2-lcd_filtering.html ft2-list_processing.html ft2-lzw.html ft2-mac_specific.html ft2-module_management.html ft2-multiple_masters.html ft2-ot_validation.html ft2-outline_processing.html ft2-pfr_fonts.html ft2-quick_advance.html ft2-raster.html ft2-sfnt_names.html ft2-sizes_management.html ft2-system_interface.html ft2-toc.html ft2-truetype_engine.html ft2-truetype_tables.html ft2-tt_driver.html ft2-type1_tables.html ft2-user_allocation.html ft2-version.html ft2-winfnt_fonts.html xsrc/external/mit/freetype/dist/include [netbsd-7]: freetype.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftcid.h fterrdef.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmm.h ftmodapi.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h ftxf86.h t1tables.h ttnameid.h tttables.h ttunpat.h xsrc/external/mit/freetype/dist/include/config [netbsd-7]: ftconfig.h ftoption.h xsrc/external/mit/freetype/dist/include/internal [netbsd-7]: ftcalc.h ftgloadr.h ftobjs.h ftvalid.h pshints.h sfnt.h xsrc/external/mit/freetype/dist/src/autofit [netbsd-7]: afangles.c afblue.c afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afglobal.c afglobal.h afhints.c afhints.h aflatin.c aflatin.h aflatin2.c afloader.c afmodule.c afranges.c afscript.h afstyles.h hbshim.c xsrc/external/mit/freetype/dist/src/base [netbsd-7]: ftadvanc.c ftbbox.c ftbdf.c ftbitmap.c ftcalc.c ftfstype.c ftglyph.c ftgxval.c ftinit.c ftlcdfil.c ftmac.c ftmm.c ftobjs.c ftoutln.c ftpfr.c ftrfork.c ftstream.c ftstroke.c ftsynth.c fttrigon.c fttype1.c ftutil.c ftwinfnt.c xsrc/external/mit/freetype/dist/src/bdf [netbsd-7]: bdfdrivr.c bdflib.c xsrc/external/mit/freetype/dist/src/bzip2 [netbsd-7]: ftbzip2.c xsrc/external/mit/freetype/dist/src/cache [netbsd-7]: ftcbasic.c ftccmap.c ftcmanag.c ftcsbits.c xsrc/external/mit/freetype/dist/src/cff [netbsd-7]: cf2font.c cf2ft.c cf2hints.c cf2intrp.c cffcmap.c cffdrivr.c cffgload.c cffobjs.c cffparse.c xsrc/external/mit/freetype/dist/src/gxvalid [netbsd-7]: gxvbsln.c gxvcommn.c gxvcommn.h gxvfeat.c gxvjust.c gxvkern.c gxvlcar.c gxvmort.c gxvmort.h gxvmort0.c gxvmort1.c gxvmort2.c gxvmort4.c gxvmort5.c gxvmorx.c
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Thu Mar 26 10:01:03 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: shl.mi
src/distrib/sets/lists/xdebug [netbsd-7]: shl.mi
src/external/mit/xorg/lib/freetype [netbsd-7]: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #619):
external/mit/xorg/lib/freetype/Makefile: revision 1.15
distrib/sets/lists/xdebug/shl.mi: revision 1.21 (patch)
distrib/sets/lists/xbase/shl.mi: revision 1.60 (patch)
external/mit/xorg/lib/freetype/shlib_version: revision 1.8
external/mit/xorg/lib/freetype/freetype/Makefile: revision 1.19
Update for freetype 2.5.5.
Bring back rpath fixup that was lost in revision 1.11
To generate a diff of this commit:
cvs rdiff -u -r1.55.4.2 -r1.55.4.3 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.14.4.3 -r1.14.4.4 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 \
src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.7 -r1.7.4.1 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.17.4.1 -r1.17.4.2 \
src/external/mit/xorg/lib/freetype/freetype/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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.55.4.2 src/distrib/sets/lists/xbase/shl.mi:1.55.4.3
--- src/distrib/sets/lists/xbase/shl.mi:1.55.4.2 Mon Jan 5 21:23:52 2015
+++ src/distrib/sets/lists/xbase/shl.mi Thu Mar 26 10:01:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55.4.2 2015/01/05 21:23:52 martin Exp $
+# $NetBSD: shl.mi,v 1.55.4.3 2015/03/26 10:01:03 martin Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -323,7 +323,7 @@
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfreetype.so -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
+./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg
./usr/X11R7/lib/libglut.so -unknown- xorg
./usr/X11R7/lib/libglut.so.4 -unknown- xorg
./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.14.4.3 src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4
--- src/distrib/sets/lists/xdebug/shl.mi:1.14.4.3 Tue Mar 3 08:28:12 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Mar 26 10:01:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14.4.3 2015/03/03 08:28:12 snj Exp $
+# $NetBSD: shl.mi,v 1.14.4.4 2015/03/26 10:01:02 martin Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -105,7 +105,7 @@
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.2.11.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.12.4.2 src/external/mit/xorg/lib/freetype/Makefile:1.12.4.3
--- src/external/mit/xorg/lib/freetype/Makefile:1.12.4.2 Wed Feb 11 09:43:58 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Thu Mar 26 10:01:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12.4.2 2015/02/11 09:43:58 martin Exp $
+# $NetBSD: Makefile,v 1.12.4.3 2015/03/26 10:01:02 martin Exp $
.include bsd.own.mk
@@ -96,7 +96,7 @@ LIBDPLIBS= \
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
-PKGCONFIG_VERSION.freetype2= 17.2.11
+PKGCONFIG_VERSION.freetype2= 17.4.11
.include bsd.x11.mk
.include bsd.lib.mk
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.7 src/external/mit/xorg/lib/freetype/shlib_version:1.7.4.1
--- src/external/mit/xorg/lib/freetype/shlib_version:1.7 Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/shlib_version Thu Mar 26 10:01:02 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.7 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: shlib_version,v 1.7.4.1 2015/03/26 10:01:02 martin Exp $
#
major=17
-minor=2
+minor=4
teeny=11
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u
CVS commit: [netbsd-7] src/sys/arch/arm/vfp
Module Name:src Committed By: snj Date: Thu Mar 26 08:53:48 UTC 2015 Modified Files: src/sys/arch/arm/vfp [netbsd-7]: vfp_init.c Log Message: Pull up following revision(s) (requested by skrll in ticket #643): sys/arch/arm/vfp/vfp_init.c: revision 1.47 Fix some inverted return values. Don't return SIGILL if there is an active FPU exception. To generate a diff of this commit: cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/arm/vfp/vfp_init.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/arm/vfp/vfp_init.c diff -u src/sys/arch/arm/vfp/vfp_init.c:1.41.2.1 src/sys/arch/arm/vfp/vfp_init.c:1.41.2.2 --- src/sys/arch/arm/vfp/vfp_init.c:1.41.2.1 Sat Mar 21 17:51:21 2015 +++ src/sys/arch/arm/vfp/vfp_init.c Thu Mar 26 08:53:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vfp_init.c,v 1.41.2.1 2015/03/21 17:51:21 snj Exp $ */ +/* $NetBSD: vfp_init.c,v 1.41.2.2 2015/03/26 08:53:48 snj Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -394,15 +394,19 @@ vfp_handler(u_int address, u_int insn, t } /* - * If we are just changing/fetching FPSCR, don't bother loading it. + * If we are just changing/fetching FPSCR, don't bother loading it + * just emulate the instruction. */ if (!vfp_fpscr_handler(address, insn, frame, fault_code)) - return 1; + return 0; - /* if we already own the FPU and it's enabled, raise SIGILL */ + /* + * If we already own the FPU and it's enabled (and no exception), raise + * SIGILL. If there is an exception, drop through to raise a SIGFPE. + */ if (curcpu()-ci_pcu_curlwp[PCU_FPU] == curlwp - (armreg_fpexc_read() VFP_FPEXC_EN) != 0) - return 0; + (armreg_fpexc_read() (VFP_FPEXC_EX|VFP_FPEXC_EN)) == VFP_FPEXC_EN) + return 1; /* * Make sure we own the FP. @@ -474,7 +478,7 @@ neon_handler(u_int address, u_int insn, /* if we already own the FPU and it's enabled, raise SIGILL */ if (curcpu()-ci_pcu_curlwp[PCU_FPU] == curlwp (armreg_fpexc_read() VFP_FPEXC_EN) != 0) - return 0; + return 1; pcu_load(arm_vfp_ops);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Mar 26 10:05:26 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #619 To generate a diff of this commit: cvs rdiff -u -r1.1.2.239 -r1.1.2.240 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.239 src/doc/CHANGES-7.0:1.1.2.240 --- src/doc/CHANGES-7.0:1.1.2.239 Thu Mar 26 08:55:16 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 10:05:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.239 2015/03/26 08:55:16 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.240 2015/03/26 10:05:26 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19014,3 +19014,293 @@ sys/arch/arm/vfp/vfp_init.c 1.47 is an active FPU exception. [skrll, ticket #643] +xsrc/external/mit/freetype/dist/builds/mac/freetype-Info.plist up to 1.1.1.1 +xsrc/external/mit/freetype/dist/builds/cmake/iOS.cmake up to 1.1.1.1 +xsrc/external/mit/freetype/dist/builds/windows/vc2010/freetype.user.props up to 1.1.1.1 +xsrc/external/mit/freetype/dist/CMakeLists.txt up to 1.1.1.2 +xsrc/external/mit/freetype/dist/ChangeLogup to 1.1.1.8 +xsrc/external/mit/freetype/dist/ChangeLog.21 up to 1.1.1.3 +xsrc/external/mit/freetype/dist/Jamfile up to 1.1.1.8 +xsrc/external/mit/freetype/dist/README up to 1.1.1.8 +xsrc/external/mit/freetype/dist/builds/detect.mk up to 1.1.1.3 +xsrc/external/mit/freetype/dist/builds/freetype.mk up to 1.1.1.4 +xsrc/external/mit/freetype/dist/builds/toplevel.mk up to 1.1.1.6 +xsrc/external/mit/freetype/dist/builds/mac/ftmac.c up to 1.1.1.5 +xsrc/external/mit/freetype/dist/builds/unix/config.guess up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/unix/config.sub up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/unix/configure up to 1.1.1.8 +xsrc/external/mit/freetype/dist/builds/unix/configure.ac up to 1.1.1.8 +xsrc/external/mit/freetype/dist/builds/unix/configure.raw up to 1.1.1.8 +xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in up to 1.6 +xsrc/external/mit/freetype/dist/builds/unix/freetype2.in up to 1.1.1.6 +xsrc/external/mit/freetype/dist/builds/unix/freetype2.m4 up to 1.1.1.3 +xsrc/external/mit/freetype/dist/builds/unix/ftconfig.in up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/unix/unix-def.in up to 1.1.1.5 +xsrc/external/mit/freetype/dist/builds/vms/ftconfig.h up to 1.1.1.6 +xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce/freetype.vcproj up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce/index.html up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce/freetype.vcproj up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce/index.html up to 1.1.1.7 +xsrc/external/mit/freetype/dist/builds/windows/vc2005/freetype.vcproj up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2005/index.html up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2008/freetype.vcproj up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2008/index.html up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2010/freetype.sln up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2010/freetype.vcxproj up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/vc2010/index.html up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualc/freetype.dsp up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualc/freetype.vcproj up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualc/index.html up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualce/freetype.dsp up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualce/freetype.vcproj up to 1.1.1.2 +xsrc/external/mit/freetype/dist/builds/windows/visualce/index.html up to 1.1.1.2 +xsrc/external/mit/freetype/dist/devel/ftoption.h up to 1.1.1.7 +xsrc/external/mit/freetype/dist/docs/CHANGES up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/VERSION.DLL up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/freetype-config.1 up to 1.1.1.2 +xsrc/external/mit/freetype/dist/docs/release up to 1.1.1.6 +xsrc/external/mit/freetype/dist/docs/reference/ft2-auto_hinter.html up to 1.1.1.3 +xsrc/external/mit/freetype/dist/docs/reference/ft2-base_interface.html up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/reference/ft2-basic_types.html up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/reference/ft2-bitmap_handling.html up to 1.1.1.8 +xsrc/external/mit/freetype/dist/docs/reference/ft2-bzip2.html up to 1.1.1.4 +xsrc/external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html up to 1.1.1.8
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: hsuenaga
Date: Thu Mar 26 08:45:05 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: arm32_tlb.c
Log Message:
don't use armreg_tlbiasidis_write() and armreg_icialluis_write()
on single processor platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm32/arm32_tlb.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/arm/arm32/arm32_tlb.c
diff -u src/sys/arch/arm/arm32/arm32_tlb.c:1.8 src/sys/arch/arm/arm32/arm32_tlb.c:1.9
--- src/sys/arch/arm/arm32/arm32_tlb.c:1.8 Sat Feb 7 00:08:34 2015
+++ src/sys/arch/arm/arm32/arm32_tlb.c Thu Mar 26 08:45:05 2015
@@ -30,7 +30,7 @@
#include opt_multiprocessor.h
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.8 2015/02/07 00:08:34 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: arm32_tlb.c,v 1.9 2015/03/26 08:45:05 hsuenaga Exp $);
#include sys/param.h
#include sys/types.h
@@ -93,11 +93,19 @@ tlb_invalidate_asids(tlb_asid_t lo, tlb_
arm_dsb();
if (arm_has_tlbiasid_p) {
for (; lo = hi; lo++) {
+#ifdef MULTIPROCESSOR
armreg_tlbiasidis_write(lo);
+#else
+ armreg_tlbiasid_write(lo);
+#endif
}
arm_isb();
if (__predict_false(vivt_icache_p)) {
+#ifdef MULTIPROCESSOR
armreg_icialluis_write(0);
+#else
+ armreg_iciallu_write(0);
+#endif
}
} else {
armreg_tlbiall_write(0);
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Thu Mar 26 10:20:44 UTC 2015 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1095 Log Message: Import dhcpcd-6.8.0 with the following changes: * Use the exit code of EXIT_SUCCESS when terminating gracefully. * Fix dumping a lease file by filename. * If RTF_LOCAL is defined, don't try and set loopback routes. * Fix adding host routes on BSD. * After adding an address load the kernel routing table for the interface. When routes are rebuilt try not to remove any existing routes if they don't need changing. * Replace timeval with timespec for our internal functions. * Support kqueue(2). * Better support for more interface types on BSD, thanks to Guy Yur. * Many Prefix Delegation fixes. * Fix creation of normal IPv6 link-local addresses overflowing the address storage and fooling dhcpcd into thinking it's not tentative when added. * Add own syslog(3) like logging function for a nicer output and so we can log to a file for the case when syslogd(8) starts after dhcpcd so we can log any errors during system start using the new --logfile option. Status: Vendor Tag: roy Release Tags: dhcpcd-6-8-0 C src/external/bsd/dhcpcd/dist/common.c C src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c C src/external/bsd/dhcpcd/dist/duid.c C src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if.c C src/external/bsd/dhcpcd/dist/if-options.c C src/external/bsd/dhcpcd/dist/script.c C src/external/bsd/dhcpcd/dist/dhcp-common.c C src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c C src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c C src/external/bsd/dhcpcd/dist/ipv4.c C src/external/bsd/dhcpcd/dist/ipv4ll.c C src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c C src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/auth.c C src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h C src/external/bsd/dhcpcd/dist/common.h C src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h C src/external/bsd/dhcpcd/dist/dhcp-common.h C src/external/bsd/dhcpcd/dist/dhcp.h C src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h C src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h C src/external/bsd/dhcpcd/dist/eloop.h C src/external/bsd/dhcpcd/dist/if-options.h C src/external/bsd/dhcpcd/dist/if.h C src/external/bsd/dhcpcd/dist/ipv4.h C src/external/bsd/dhcpcd/dist/ipv4ll.h C src/external/bsd/dhcpcd/dist/ipv6.h C src/external/bsd/dhcpcd/dist/ipv6nd.h C src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf C src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 39 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: hsuenaga Date: Thu Mar 26 08:50:42 UTC 2015 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_pj4b.S Log Message: set ttbr0/1 using correct register(r2). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm/cpufunc_asm_pj4b.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/arm/arm/cpufunc_asm_pj4b.S diff -u src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.5 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.6 --- src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.5 Wed Oct 29 16:22:31 2014 +++ src/sys/arch/arm/arm/cpufunc_asm_pj4b.S Thu Mar 26 08:50:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_pj4b.S,v 1.5 2014/10/29 16:22:31 skrll Exp $ */ +/* $NetBSD: cpufunc_asm_pj4b.S,v 1.6 2015/03/26 08:50:42 hsuenaga Exp $ */ /*** Copyright (C) Marvell International Ltd. and its affiliates @@ -58,10 +58,10 @@ ENTRY(pj4b_setttb) #else bic r2, r0, #0x18 #endif - mcr p15, 0, r0, c2, c0, 0 /* load TTBR0 */ + mcr p15, 0, r2, c2, c0, 0 /* load TTBR0 */ #ifdef ARM_MMU_EXTENDED cmp r1, #0 - mcreq p15, 0, r0, c2, c0, 1 /* load TTBR1 */ + mcreq p15, 0, r2, c2, c0, 1 /* load TTBR1 */ #else mov r0, #0 mcr p15, 0, r0, c8, c7, 0 /* invalidate I+D TLBs */
CVS commit: src/lib/libc/compat/sys
Module Name:src
Committed By: justin
Date: Thu Mar 26 11:17:08 UTC 2015
Modified Files:
src/lib/libc/compat/sys: compat_wait4.c
Log Message:
Return type of compat wait functions should be pid_t not int.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/sys/compat_wait4.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/libc/compat/sys/compat_wait4.c
diff -u src/lib/libc/compat/sys/compat_wait4.c:1.2 src/lib/libc/compat/sys/compat_wait4.c:1.3
--- src/lib/libc/compat/sys/compat_wait4.c:1.2 Sun Jan 11 02:46:27 2009
+++ src/lib/libc/compat/sys/compat_wait4.c Thu Mar 26 11:17:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_wait4.c,v 1.2 2009/01/11 02:46:27 christos Exp $ */
+/* $NetBSD: compat_wait4.c,v 1.3 2015/03/26 11:17:08 justin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: compat_wait4.c,v 1.2 2009/01/11 02:46:27 christos Exp $);
+__RCSID($NetBSD: compat_wait4.c,v 1.3 2015/03/26 11:17:08 justin Exp $);
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
@@ -59,11 +59,11 @@ __weak_alias(wait3, _wait3)
/*
* libc12 compatible wait4 routine.
*/
-int
+pid_t
wait3(int *status, int options, struct rusage50 *ru50)
{
struct rusage ru;
- int rv;
+ pid_t rv;
if ((rv = __wait350(status, options, ru50 ? ru : NULL)) == -1)
return rv;
@@ -72,11 +72,11 @@ wait3(int *status, int options, struct r
return rv;
}
-int
+pid_t
wait4(pid_t wpid, int *status, int options, struct rusage50 *ru50)
{
struct rusage ru;
- int rv;
+ pid_t rv;
if ((rv = __wait450(wpid, status, options, ru50 ? ru : NULL)) == -1)
return rv;
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Thu Mar 26 10:54:36 UTC 2015 Modified Files: src/distrib/sets/lists/etc [netbsd-7]: mi src/distrib/sets/lists/man [netbsd-7]: mi src/etc/defaults [netbsd-7]: rc.conf src/etc/mtree [netbsd-7]: special src/etc/rc.d [netbsd-7]: Makefile src/share/man/man5 [netbsd-7]: Makefile Added Files: src/etc/rc.d [netbsd-7]: modules src/share/man/man5 [netbsd-7]: modules.conf.5 Log Message: Pull up following revision(s) (requested by jmcneill in ticket #635): etc/rc.d/Makefile: revision 1.92 distrib/sets/lists/man/mi: revision 1.1497 share/man/man5/Makefile: revision 1.71 etc/defaults/rc.conf: revision 1.132 etc/rc.d/modules: revision 1.1 usr.sbin/postinstall/postinstall: revision 1.190 distrib/sets/lists/etc/mi: revision 1.236 etc/mtree/special: revision 1.152 share/man/man5/modules.conf.5: revision 1.1 Process /etc/modules.conf (if present) at startup, before securelevel is raised, to allow module loading on ports without a module aware bootloader. To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.232.4.1 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.1485.2.5 -r1.1485.2.6 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.123.2.1 -r1.123.2.2 src/etc/defaults/rc.conf cvs rdiff -u -r1.148 -r1.148.2.1 src/etc/mtree/special cvs rdiff -u -r1.89 -r1.89.6.1 src/etc/rc.d/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/etc/rc.d/modules cvs rdiff -u -r1.70 -r1.70.4.1 src/share/man/man5/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/share/man/man5/modules.conf.5 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/etc/mi diff -u src/distrib/sets/lists/etc/mi:1.232 src/distrib/sets/lists/etc/mi:1.232.4.1 --- src/distrib/sets/lists/etc/mi:1.232 Sun Aug 11 22:29:03 2013 +++ src/distrib/sets/lists/etc/mi Thu Mar 26 10:54:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.232 2013/08/11 22:29:03 joerg Exp $ +# $NetBSD: mi,v 1.232.4.1 2015/03/26 10:54:36 martin Exp $ # # Note: end-user configuration files that are moved to another location # should not be marked obsolete; they should just be removed from @@ -230,6 +230,7 @@ ./etc/rc.d/makemandbetc-man-rc ./etc/rc.d/mdnsdetc-mdns-rc ./etc/rc.d/mixerctletc-audio-rc +./etc/rc.d/modulesetc-sys-rc ./etc/rc.d/mopd etc-bootserver-rc ./etc/rc.d/motd etc-sys-rc ./etc/rc.d/mountalletc-sys-rc Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1485.2.5 src/distrib/sets/lists/man/mi:1.1485.2.6 --- src/distrib/sets/lists/man/mi:1.1485.2.5 Mon Jan 12 10:22:22 2015 +++ src/distrib/sets/lists/man/mi Thu Mar 26 10:54:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1485.2.5 2015/01/12 10:22:22 martin Exp $ +# $NetBSD: mi,v 1.1485.2.6 2015/03/26 10:54:35 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2112,6 +2112,7 @@ ./usr/share/man/cat5/master.passwd.0 man-sys-catman .cat ./usr/share/man/cat5/memcache_table.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/mixerctl.conf.0 man-audio-catman .cat +./usr/share/man/cat5/modules.conf.0 man-sys-catman .cat ./usr/share/man/cat5/moduli.0 man-secsh-catman crypto,.cat ./usr/share/man/cat5/monthly.0 man-sys-catman .cat ./usr/share/man/cat5/monthly.conf.0 man-sys-catman .cat @@ -5076,6 +5077,7 @@ ./usr/share/man/html5/master.passwd.html man-sys-htmlman html ./usr/share/man/html5/memcache_table.html man-postfix-htmlman postfix,html ./usr/share/man/html5/mixerctl.conf.html man-audio-htmlman html +./usr/share/man/html5/modules.conf.html man-sys-htmlman html ./usr/share/man/html5/moduli.html man-secsh-htmlman crypto,html ./usr/share/man/html5/monthly.conf.html man-sys-htmlman html ./usr/share/man/html5/monthly.html man-sys-htmlman html @@ -7987,6 +7989,7 @@ ./usr/share/man/man5/master.passwd.5 man-sys-man .man ./usr/share/man/man5/memcache_table.5 man-postfix-man postfix,.man ./usr/share/man/man5/mixerctl.conf.5 man-audio-man .man +./usr/share/man/man5/modules.conf.5 man-sys-man .man ./usr/share/man/man5/moduli.5 man-secsh-man crypto,.man ./usr/share/man/man5/monthly.5 man-sys-man .man ./usr/share/man/man5/monthly.conf.5 man-sys-man .man Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.123.2.1 src/etc/defaults/rc.conf:1.123.2.2 --- src/etc/defaults/rc.conf:1.123.2.1 Fri Jan 23 09:47:24 2015 +++ src/etc/defaults/rc.conf Thu Mar 26 10:54:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.123.2.1 2015/01/23 09:47:24 martin Exp $ +# $NetBSD: rc.conf,v 1.123.2.2 2015/03/26 10:54:36 martin Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -132,6 +132,7 @@ ldconfig=YES # rebuild a.out ldconfi sysdb=YES # build system databases rndctl=NO rndctl_flags= # configure
CVS commit: [netbsd-7] src/bin/dd
Module Name:src
Committed By: martin
Date: Thu Mar 26 11:08:43 UTC 2015
Modified Files:
src/bin/dd [netbsd-7]: Makefile args.c dd.1 dd.c dd.h extern.h
Log Message:
Pull up following revision(s) (requested by manu in ticket #640):
bin/dd/extern.h: revision 1.23
bin/dd/dd.1: revision 1.26
bin/dd/dd.1: revision 1.27
bin/dd/dd.h: revision 1.16
bin/dd/dd.c: revision 1.50
bin/dd/Makefile: revision 1.18
bin/dd/args.c: revision 1.39
Add iflag and oflag operands to dd(1)
Like GNU dd(1) similar operands, iflag and oflag allow specifying the
O_* flags given to open(2) for the input and the output file. The values
are comma-sepratated, lower-case, O_ prefix-stripped constants documented
in open(2).
Since iflag and oflag override default values, specifying oflag means
O_CREATE is not set by default and must be specified explicitely.
Some values do not make sense (e.g.: iflag=directory) but are still used
and will raise a warning. For oflag, values rdonly, rdwr and wronly are
filtered out with a warning (dd(1) attempts open(2) with O_RDWR and
then O_WRONLY on failure).
Specifying oflag=trunc along with (seek, oseek or conv=notrunc) is
contradictory and will raise an error.
iflag and oflag are disabled if building with -DMALLPROG
New sentence, new line. Fix typos. Bump date for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.12.1 src/bin/dd/Makefile
cvs rdiff -u -r1.38 -r1.38.6.1 src/bin/dd/args.c
cvs rdiff -u -r1.25 -r1.25.12.1 src/bin/dd/dd.1
cvs rdiff -u -r1.49 -r1.49.12.1 src/bin/dd/dd.c
cvs rdiff -u -r1.15 -r1.15.24.1 src/bin/dd/dd.h
cvs rdiff -u -r1.22 -r1.22.20.1 src/bin/dd/extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/Makefile
diff -u src/bin/dd/Makefile:1.17 src/bin/dd/Makefile:1.17.12.1
--- src/bin/dd/Makefile:1.17 Wed Aug 8 14:09:14 2012
+++ src/bin/dd/Makefile Thu Mar 26 11:08:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/08/08 14:09:14 christos Exp $
+# $NetBSD: Makefile,v 1.17.12.1 2015/03/26 11:08:43 martin Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include bsd.own.mk
@@ -10,8 +10,9 @@ DPADD+= ${LIBUTIL}
LDADD+= -lutil
.ifdef SMALLPROG
-CPPFLAGS+= -DNO_CONV -DNO_MSGFMT -DSMALL
+CPPFLAGS+= -DNO_CONV -DNO_MSGFMT -DNO_IOFLAG -DSMALL
.else
+CPPFLAGS+= -D_NETBSD_SOURCE -D_INCOMPLETE_XOPEN_C063
SRCS+= conv_tab.c
.ifdef CRUNCHEDPROG
CPPFLAGS+= -DSMALL
Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.38 src/bin/dd/args.c:1.38.6.1
--- src/bin/dd/args.c:1.38 Wed Jul 17 12:55:48 2013
+++ src/bin/dd/args.c Thu Mar 26 11:08:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $ */
+/* $NetBSD: args.c,v 1.38.6.1 2015/03/26 11:08:43 martin Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,13 +38,16 @@
#if 0
static char sccsid[] = @(#)args.c 8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $);
+__RCSID($NetBSD: args.c,v 1.38.6.1 2015/03/26 11:08:43 martin Exp $);
#endif
#endif /* not lint */
#include sys/types.h
#include sys/time.h
+#ifndef NO_IOFLAG
+#include fcntl.h
+#endif /* NO_IOFLAG */
#include err.h
#include errno.h
#include limits.h
@@ -70,6 +73,16 @@ static void f_conv(char *);
static int c_conv(const void *, const void *);
#endif /* NO_CONV */
+#ifdef NO_IOFLAG
+static void f_iflag(char *) __dead;
+static void f_oflag(char *) __dead;
+#else
+static void f_iflag(char *);
+static void f_oflag(char *);
+static u_int f_ioflag(char *, u_int);
+static int c_ioflag(const void *, const void *);
+#endif /* NO_IOFLAG */
+
static void f_bs(char *);
static void f_cbs(char *);
static void f_count(char *);
@@ -96,10 +109,12 @@ static const struct arg {
{ files, f_files, C_FILES, C_FILES },
{ ibs, f_ibs, C_IBS, C_BS|C_IBS },
{ if, f_if, C_IF, C_IF },
+ { iflag, f_iflag, C_IFLAG, C_IFLAG },
{ iseek, f_skip, C_SKIP, C_SKIP },
{ msgfmt, f_msgfmt, 0, 0 },
{ obs, f_obs, C_OBS, C_BS|C_OBS },
{ of, f_of, C_OF, C_OF },
+ { oflag, f_oflag, C_OFLAG, C_OFLAG },
{ oseek, f_seek, C_SEEK, C_SEEK },
{ progress, f_progress, 0, 0 },
{ seek, f_seek, C_SEEK, C_SEEK },
@@ -389,3 +404,102 @@ c_conv(const void *a, const void *b)
}
#endif /* NO_CONV */
+
+static void
+f_iflag(char *arg)
+{
+/* Build a small version (i.e. for a ramdisk root) */
+#ifdef NO_IOFLAG
+ errx(EXIT_FAILURE, iflag option disabled);
+ /* NOTREACHED */
+#else
+ iflag = f_ioflag(arg, C_IFLAG);
+ return;
+#endif
+}
+
+static void
+f_oflag(char *arg)
+{
+/* Build a small version (i.e. for a ramdisk root) */
+#ifdef NO_IOFLAG
+ errx(EXIT_FAILURE, oflag option disabled);
+ /* NOTREACHED */
+#else
+ oflag = f_ioflag(arg, C_OFLAG);
+ return;
+#endif
+}
+
+#ifndef NO_IOFLAG
+static const struct ioflag {
+ const char *name;
+ u_int set;
+ u_int allowed;
+} olist[] = {
+ /* the array
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Mar 26 10:59:58 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #635 To generate a diff of this commit: cvs rdiff -u -r1.1.2.240 -r1.1.2.241 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.240 src/doc/CHANGES-7.0:1.1.2.241 --- src/doc/CHANGES-7.0:1.1.2.240 Thu Mar 26 10:05:26 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 10:59:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.240 2015/03/26 10:05:26 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.241 2015/03/26 10:59:58 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19304,3 +19304,18 @@ external/mit/xorg/lib/freetype/shlib_ver Update freetype to 2.5.5. [snj, ticket #619] +distrib/sets/lists/etc/mi 1.236 +distrib/sets/lists/man/mi 1.1497 +etc/defaults/rc.conf1.132 +etc/mtree/special1.152 +etc/rc.d/Makefile1.92 +etc/rc.d/modules1.1 +share/man/man5/Makefile1.71 +share/man/man5/modules.conf.5 1.1 +usr.sbin/postinstall/postinstall 1.190 + + Process /etc/modules.conf (if present) at startup, before securelevel + is raised, to allow module loading on ports without a module aware + bootloader. + [jmcneill, ticket #635] +
CVS commit: src/doc
Module Name:src Committed By: roy Date: Thu Mar 26 10:37:06 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.8.0 To generate a diff of this commit: cvs rdiff -u -r1.1212 -r1.1213 src/doc/3RDPARTY cvs rdiff -u -r1.2058 -r1.2059 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1212 src/doc/3RDPARTY:1.1213 --- src/doc/3RDPARTY:1.1212 Tue Mar 24 20:02:18 2015 +++ src/doc/3RDPARTY Thu Mar 26 10:37:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1212 2015/03/24 20:02:18 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1213 2015/03/26 10:37:06 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.7.1 -Current Vers: 6.7.1 +Version: 6.8.0 +Current Vers: 6.8.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2058 src/doc/CHANGES:1.2059 --- src/doc/CHANGES:1.2058 Tue Mar 24 20:02:18 2015 +++ src/doc/CHANGES Thu Mar 26 10:37:06 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2058 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2059 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -143,3 +143,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: service(8): Import adapted script from FreeBSD [ast 20150322] openssl: Import openssl 1.0.1m [spz 20150323] libc: Update to tzcode2015b. [christos 20150324] + dhcpcd(8): Import dhcpcd-6.8.0. [roy 20150326]
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src Committed By: justin Date: Thu Mar 26 13:34:51 UTC 2015 Modified Files: src/common/lib/libc/arch/arm/string: memcmp.S memcpy.S memmove.S memset.S Log Message: Don't build the __eabi_ aliases in the arm rump kernel. These are provided by libc in userspace, so leave out of kernel To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/string/memcmp.S cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/memcpy.S cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/string/memmove.S cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/memset.S 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/arch/arm/string/memcmp.S diff -u src/common/lib/libc/arch/arm/string/memcmp.S:1.4 src/common/lib/libc/arch/arm/string/memcmp.S:1.5 --- src/common/lib/libc/arch/arm/string/memcmp.S:1.4 Mon Dec 2 21:21:33 2013 +++ src/common/lib/libc/arch/arm/string/memcmp.S Thu Mar 26 13:34:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: memcmp.S,v 1.4 2013/12/02 21:21:33 joerg Exp $ */ +/* $NetBSD: memcmp.S,v 1.5 2015/03/26 13:34:51 justin Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -64,7 +64,7 @@ #include machine/asm.h -RCSID($NetBSD: memcmp.S,v 1.4 2013/12/02 21:21:33 joerg Exp $) +RCSID($NetBSD: memcmp.S,v 1.5 2015/03/26 13:34:51 justin Exp $) ENTRY(memcmp) mov ip, r0 @@ -180,6 +180,6 @@ ENTRY(memcmp) #endif END(memcmp) -#if defined(__ARM_EABI__) +#if defined(__ARM_EABI__) !defined(_RUMPKERNEL) STRONG_ALIAS(__aeabi_memcmp, memcmp) #endif Index: src/common/lib/libc/arch/arm/string/memcpy.S diff -u src/common/lib/libc/arch/arm/string/memcpy.S:1.6 src/common/lib/libc/arch/arm/string/memcpy.S:1.7 --- src/common/lib/libc/arch/arm/string/memcpy.S:1.6 Mon Dec 2 21:21:33 2013 +++ src/common/lib/libc/arch/arm/string/memcpy.S Thu Mar 26 13:34:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: memcpy.S,v 1.6 2013/12/02 21:21:33 joerg Exp $ */ +/* $NetBSD: memcpy.S,v 1.7 2015/03/26 13:34:51 justin Exp $ */ #include arm/cdefs.h @@ -8,6 +8,6 @@ #include memcpy_xscale.S #endif -#if defined(__ARM_EABI__) +#if defined(__ARM_EABI__) !defined(_RUMPKERNEL) STRONG_ALIAS(__aeabi_memcpy, memcpy) #endif Index: src/common/lib/libc/arch/arm/string/memmove.S diff -u src/common/lib/libc/arch/arm/string/memmove.S:1.8 src/common/lib/libc/arch/arm/string/memmove.S:1.9 --- src/common/lib/libc/arch/arm/string/memmove.S:1.8 Mon Dec 2 21:21:33 2013 +++ src/common/lib/libc/arch/arm/string/memmove.S Thu Mar 26 13:34:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: memmove.S,v 1.8 2013/12/02 21:21:33 joerg Exp $ */ +/* $NetBSD: memmove.S,v 1.9 2015/03/26 13:34:51 justin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -585,7 +585,7 @@ END(memmove) END(bcopy) #endif -#if defined(__ARM_EABI__) !defined(BCOPY) +#if defined(__ARM_EABI__) !defined(BCOPY) !defined(_RUMPKERNEL) STRONG_ALIAS(__aeabi_memmove, memmove) STRONG_ALIAS(__aeabi_memmove4, memmove) STRONG_ALIAS(__aeabi_memmove8, memmove) Index: src/common/lib/libc/arch/arm/string/memset.S diff -u src/common/lib/libc/arch/arm/string/memset.S:1.7 src/common/lib/libc/arch/arm/string/memset.S:1.8 --- src/common/lib/libc/arch/arm/string/memset.S:1.7 Mon Dec 2 21:21:33 2013 +++ src/common/lib/libc/arch/arm/string/memset.S Thu Mar 26 13:34:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: memset.S,v 1.7 2013/12/02 21:21:33 joerg Exp $ */ +/* $NetBSD: memset.S,v 1.8 2015/03/26 13:34:51 justin Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -68,7 +68,7 @@ #include machine/asm.h -#if defined(__ARM_EABI__) !defined(_BZERO) +#if defined(__ARM_EABI__) !defined(_BZERO) !defined(_RUMPKERNEL) ENTRY(__aeabi_memset) mov r3, r1 mov r1, r2
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Mar 26 11:30:50 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #640 To generate a diff of this commit: cvs rdiff -u -r1.1.2.241 -r1.1.2.242 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.241 src/doc/CHANGES-7.0:1.1.2.242 --- src/doc/CHANGES-7.0:1.1.2.241 Thu Mar 26 10:59:58 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 11:30:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.241 2015/03/26 10:59:58 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.242 2015/03/26 11:30:49 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19319,3 +19319,13 @@ usr.sbin/postinstall/postinstall 1.190 bootloader. [jmcneill, ticket #635] +bin/dd/Makefile 1.18 +bin/dd/args.c 1.39 +bin/dd/dd.1 1.26-1.27 +bin/dd/dd.c 1.50 +bin/dd/dd.h 1.16 +bin/dd/extern.h 1.23 + + Add iflag and oflag operands to dd(1). + [manu, ticket #640] +
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: justin
Date: Thu Mar 26 11:31:57 UTC 2015
Modified Files:
src/lib/libc/rpc: rpcb_clnt.c xdr_rec.c
Log Message:
Fix definitions to match headers
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/rpc/rpcb_clnt.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/rpc/xdr_rec.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/libc/rpc/rpcb_clnt.c
diff -u src/lib/libc/rpc/rpcb_clnt.c:1.30 src/lib/libc/rpc/rpcb_clnt.c:1.31
--- src/lib/libc/rpc/rpcb_clnt.c:1.30 Thu Jan 2 20:12:23 2014
+++ src/lib/libc/rpc/rpcb_clnt.c Thu Mar 26 11:31:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_clnt.c,v 1.30 2014/01/02 20:12:23 christos Exp $ */
+/* $NetBSD: rpcb_clnt.c,v 1.31 2015/03/26 11:31:57 justin Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro;
#else
-__RCSID($NetBSD: rpcb_clnt.c,v 1.30 2014/01/02 20:12:23 christos Exp $);
+__RCSID($NetBSD: rpcb_clnt.c,v 1.31 2015/03/26 11:31:57 justin Exp $);
#endif
#endif
@@ -983,8 +983,8 @@ done:
*
* Assuming that the address is all properly allocated
*/
-int
-rpcb_getaddr(rpcprog_t program, rpcvers_t version,
+bool_t
+rpcb_getaddr(const rpcprog_t program, const rpcvers_t version,
const struct netconfig *nconf, struct netbuf *address,
const char *host)
{
Index: src/lib/libc/rpc/xdr_rec.c
diff -u src/lib/libc/rpc/xdr_rec.c:1.35 src/lib/libc/rpc/xdr_rec.c:1.36
--- src/lib/libc/rpc/xdr_rec.c:1.35 Mon Mar 11 20:19:30 2013
+++ src/lib/libc/rpc/xdr_rec.c Thu Mar 26 11:31:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr_rec.c,v 1.35 2013/03/11 20:19:30 tron Exp $ */
+/* $NetBSD: xdr_rec.c,v 1.36 2015/03/26 11:31:57 justin Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
static char *sccsid = @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro;
static char *sccsid = @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC;
#else
-__RCSID($NetBSD: xdr_rec.c,v 1.35 2013/03/11 20:19:30 tron Exp $);
+__RCSID($NetBSD: xdr_rec.c,v 1.36 2015/03/26 11:31:57 justin Exp $);
#endif
#endif
@@ -507,7 +507,7 @@ xdrrec_eof(XDR *xdrs)
* pipelined procedure calls.) TRUE = immmediate flush to tcp connection.
*/
bool_t
-xdrrec_endofrecord(XDR *xdrs, bool_t sendnow)
+xdrrec_endofrecord(XDR *xdrs, int sendnow)
{
RECSTREAM *rstrm = (RECSTREAM *)(xdrs-x_private);
u_long len; /* fragment length */
CVS commit: src/lib/libm/src
Module Name:src Committed By: justin Date: Thu Mar 26 11:59:38 UTC 2015 Modified Files: src/lib/libm/src: math_private.h Log Message: Fix prototypes to match definitions To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libm/src/math_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/src/math_private.h diff -u src/lib/libm/src/math_private.h:1.21 src/lib/libm/src/math_private.h:1.22 --- src/lib/libm/src/math_private.h:1.21 Fri Mar 14 22:21:31 2014 +++ src/lib/libm/src/math_private.h Thu Mar 26 11:59:38 2015 @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $NetBSD: math_private.h,v 1.21 2014/03/14 22:21:31 dsl Exp $ + * $NetBSD: math_private.h,v 1.22 2015/03/26 11:59:38 justin Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -252,7 +252,7 @@ extern double __ieee754_y1 __P((double)) extern double __ieee754_jn __P((int,double)); extern double __ieee754_yn __P((int,double)); extern double __ieee754_remainder __P((double,double)); -extern int__ieee754_rem_pio2 __P((double,double*)); +extern int32_t __ieee754_rem_pio2 __P((double,double*)); extern double __ieee754_scalb __P((double,double)); /* fdlibm kernel function */ @@ -260,7 +260,7 @@ extern double __kernel_standard __P((dou extern double __kernel_sin __P((double,double,int)); extern double __kernel_cos __P((double,double)); extern double __kernel_tan __P((double,double,int)); -extern int__kernel_rem_pio2 __P((double*,double*,int,int,int,const int*)); +extern int__kernel_rem_pio2 __P((double*,double*,int,int,int,const int32_t*)); /* ieee style elementary float functions */ @@ -290,14 +290,14 @@ extern float __ieee754_y1f __P((float)); extern float __ieee754_jnf __P((int,float)); extern float __ieee754_ynf __P((int,float)); extern float __ieee754_remainderf __P((float,float)); -extern int __ieee754_rem_pio2f __P((float,float*)); +extern int32_t __ieee754_rem_pio2f __P((float,float*)); extern float __ieee754_scalbf __P((float,float)); /* float versions of fdlibm kernel functions */ extern float __kernel_sinf __P((float,float,int)); extern float __kernel_cosf __P((float,float)); extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*)); +extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int32_t*)); /* ieee style elementary long double functions */ extern long double __ieee754_fmodl(long double, long double);
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Fri Mar 27 05:47:38 UTC 2015 Modified Files: src/sys/netipsec: xform_ah.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/netipsec/xform_ah.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/netipsec/xform_ah.c diff -u src/sys/netipsec/xform_ah.c:1.42 src/sys/netipsec/xform_ah.c:1.43 --- src/sys/netipsec/xform_ah.c:1.42 Sun Nov 3 18:37:10 2013 +++ src/sys/netipsec/xform_ah.c Fri Mar 27 05:47:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xform_ah.c,v 1.42 2013/11/03 18:37:10 mrg Exp $ */ +/* $NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $ */ /* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ /* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */ /* @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xform_ah.c,v 1.42 2013/11/03 18:37:10 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $); #include opt_inet.h #ifdef __FreeBSD__ @@ -891,7 +891,7 @@ ah_input_cb(struct cryptop *crp) authsize = AUTHSIZE(sav); if (ipsec_debug) - memset(calc, 0, sizeof(calc)); + memset(calc, 0, sizeof(calc)); /* Copy authenticator off the packet. */ m_copydata(m, skip + rplen, authsize, calc);
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: hkenken
Date: Fri Mar 27 05:31:23 UTC 2015
Modified Files:
src/sys/arch/arm/imx: files.imx51 files.imx6 imx51_i2c.c imx51reg.h
imx6_i2c.c imx6_reg.h imxi2c.c imxi2cvar.h
Removed Files:
src/sys/arch/arm/imx: imxi2creg.h
Log Message:
Rewritten to take advantage of motoi2c code.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/imx/files.imx51
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_i2c.c \
src/sys/arch/arm/imx/imx6_i2c.c src/sys/arch/arm/imx/imxi2c.c \
src/sys/arch/arm/imx/imxi2cvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx51reg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx6_reg.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/imx/imxi2creg.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/arm/imx/files.imx51
diff -u src/sys/arch/arm/imx/files.imx51:1.11 src/sys/arch/arm/imx/files.imx51:1.12
--- src/sys/arch/arm/imx/files.imx51:1.11 Fri Jul 25 07:49:56 2014
+++ src/sys/arch/arm/imx/files.imx51 Fri Mar 27 05:31:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx51,v 1.11 2014/07/25 07:49:56 hkenken Exp $
+# $NetBSD: files.imx51,v 1.12 2015/03/27 05:31:23 hkenken Exp $
#
# Configuration info for the Freescale i.MX5x
#
@@ -103,7 +103,7 @@ attach sdhc at axi with sdhc_axi
file arch/arm/imx/imx51_esdhc.c sdhc_axi
# iic Controler
-device imxi2c: i2cbus
+device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at axi
file arch/arm/imx/imxi2c.c imxi2c
file arch/arm/imx/imx51_i2c.c imxi2c
Index: src/sys/arch/arm/imx/files.imx6
diff -u src/sys/arch/arm/imx/files.imx6:1.4 src/sys/arch/arm/imx/files.imx6:1.5
--- src/sys/arch/arm/imx/files.imx6:1.4 Tue Oct 7 09:36:09 2014
+++ src/sys/arch/arm/imx/files.imx6 Fri Mar 27 05:31:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.4 2014/10/07 09:36:09 ryo Exp $
+# $NetBSD: files.imx6,v 1.5 2015/03/27 05:31:23 hkenken Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -62,7 +62,7 @@ attach imxiomux at axi
file arch/arm/imx/imx6_iomux.c imxiomux
# iMX iic Controler
-device imxi2c: i2cbus
+device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at axi
file arch/arm/imx/imxi2c.c imxi2c
file arch/arm/imx/imx6_i2c.c imxi2c
Index: src/sys/arch/arm/imx/imx51_i2c.c
diff -u src/sys/arch/arm/imx/imx51_i2c.c:1.1 src/sys/arch/arm/imx/imx51_i2c.c:1.2
--- src/sys/arch/arm/imx/imx51_i2c.c:1.1 Fri Jul 25 07:07:47 2014
+++ src/sys/arch/arm/imx/imx51_i2c.c Fri Mar 27 05:31:23 2015
@@ -1,7 +1,7 @@
-/* $NetBSD: imx51_i2c.c,v 1.1 2014/07/25 07:07:47 hkenken Exp $ */
+/* $NetBSD: imx51_i2c.c,v 1.2 2015/03/27 05:31:23 hkenken Exp $ */
/*
- * Copyright (c) 2012 Genetec Corporation. All rights reserved.
+ * Copyright (c) 2012, 2015 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,24 +27,32 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: imx51_i2c.c,v 1.1 2014/07/25 07:07:47 hkenken Exp $);
+__KERNEL_RCSID(0, $NetBSD: imx51_i2c.c,v 1.2 2015/03/27 05:31:23 hkenken Exp $);
+
+#include opt_imx.h
#include sys/param.h
#include sys/bus.h
#include sys/device.h
-#include opt_imx.h
-
-#include arm/imx/imxi2cvar.h
#include arm/imx/imx51reg.h
#include arm/imx/imx51var.h
#include arm/imx/imx51_ccmvar.h
+#include arm/imx/imxi2cvar.h
int
imxi2c_match(device_t parent, cfdata_t cf, void *aux)
{
- if (strcmp(cf-cf_name, imxi2c) == 0)
+ struct axi_attach_args *aa = aux;
+
+ switch (aa-aa_addr) {
+ case I2C1_BASE:
+ case I2C2_BASE:
+#ifdef IMX50
+ case I2C3_BASE:
+#endif
return 1;
+ }
return 0;
}
@@ -53,15 +61,11 @@ void
imxi2c_attach(device_t parent, device_t self, void *aux)
{
struct axi_attach_args * aa = aux;
- struct imxi2c_softc *sc = device_private(self);
- struct i2cbus_attach_args iba;
- imxi2c_attach_common(parent, self,
- aa-aa_iot, aa-aa_addr, aa-aa_size, aa-aa_irq, 0);
+ if (aa-aa_size = 0)
+ aa-aa_size = I2C_SIZE;
imxi2c_set_freq(self, imx51_get_clock(IMX51CLK_PERCLK_ROOT), 40);
-
- memset(iba, 0, sizeof(iba));
- iba.iba_tag = sc-sc_i2c;
- config_found_ia(sc-sc_dev, i2cbus, iba, iicbus_print);
+ imxi2c_attach_common(parent, self,
+ aa-aa_iot, aa-aa_addr, aa-aa_size, aa-aa_irq, 0);
}
Index: src/sys/arch/arm/imx/imx6_i2c.c
diff -u src/sys/arch/arm/imx/imx6_i2c.c:1.1 src/sys/arch/arm/imx/imx6_i2c.c:1.2
--- src/sys/arch/arm/imx/imx6_i2c.c:1.1 Tue Oct 7 09:36:09 2014
+++ src/sys/arch/arm/imx/imx6_i2c.c Fri Mar 27 05:31:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_i2c.c,v 1.1 2014/10/07 09:36:09 ryo Exp $ */
+/* $NetBSD: imx6_i2c.c,v 1.2 2015/03/27 05:31:23 hkenken Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu r...@nerv.org
@@ -31,7 +31,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Fri Mar 27 05:31:35 UTC 2015
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Update from Intel SDM:
- Add Atom Z8000, Future gen Xeon (Broadwell), Next gen Xeon Phi and so on.
- Add comments.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.64 src/usr.sbin/cpuctl/arch/i386.c:1.65
--- src/usr.sbin/cpuctl/arch/i386.c:1.64 Thu Dec 11 12:21:44 2014
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Mar 27 05:31:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.65 2015/03/27 05:31:34 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 msaitoh Exp $);
+__RCSID($NetBSD: i386.c,v 1.65 2015/03/27 05:31:34 msaitoh Exp $);
#endif /* not lint */
#include sys/types.h
@@ -349,12 +349,12 @@ const struct cpu_cpuid_nameclass i386_cp
[0x2f] = Xeon E7 family,
[0x35] = Atom Family,
[0x36] = Atom S1000,
-[0x37] = Atom E3000, Z3000,
+[0x37] = Atom E3000, Z3[67]00,
[0x3a] = Xeon E3-1200v2 and 3rd gen core,
Ivy Bridge,
[0x3c] = 4th gen Core, Xeon E3-12xx v3
(Haswell),
-[0x3d] = Core M-5xxx (Broadwell),
+[0x3d] = Core M-5xxx, Future 5th gen Core (Broadwell),
[0x3e] = Xeon E5/E7 v2 (Ivy Bridge-E),
Core i7-49xx Extreme,
[0x3f] = Xeon E5-2600/1600 v3 (Haswell-E),
@@ -363,12 +363,15 @@ const struct cpu_cpuid_nameclass i386_cp
(Haswell),
[0x46] = 4th gen Core, Xeon E3-12xx v3
(Haswell),
-[0x4a] = Future Atom E3000, Z3000,
+[0x4a] = Atom Z3400,
+[0x4c] = Atom Z8000,
[0x4d] = Atom C2000,
-[0x4e] = Future Core,
-[0x56] = Future Xeon,
-[0x5a] = Future Atom E3000, Z3000,
-[0x5d] = Future Atom E3000, Z3000,
+[0x4e] = Future gen Core,
+[0x4f] = Future gen Xeon (Broadwell),
+[0x56] = Next gen Xeon D (Broadwell),
+[0x57] = Next gen Xeon Phi,
+[0x5a] = Atom E3500,
+[0x5d] = Future Atom (Silvermont),
},
Pentium Pro, II or III, /* Default */
NULL,
@@ -996,6 +999,11 @@ intel_cpu_cacheinfo(struct cpu_info *ci)
if (descs[i] 0x8000)
continue;
for (j = 0; j 4; j++) {
+/*
+ * The least significant byte in EAX
+ * ((desc[0] 0) 0xff) is always 0x01 and
+ * it should be ignored.
+ */
if (i == 0 j == 0)
continue;
desc = (descs[i] (j * 8)) 0xff;
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Fri Mar 27 05:32:38 UTC 2015
Modified Files:
src/sys/arch/x86/x86: intel_busclock.c
Log Message:
Update from Intel SDM:
- Add busclock values for Airmont.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/intel_busclock.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/x86/x86/intel_busclock.c
diff -u src/sys/arch/x86/x86/intel_busclock.c:1.20 src/sys/arch/x86/x86/intel_busclock.c:1.21
--- src/sys/arch/x86/x86/intel_busclock.c:1.20 Wed Dec 17 03:39:02 2014
+++ src/sys/arch/x86/x86/intel_busclock.c Fri Mar 27 05:32:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_busclock.c,v 1.20 2014/12/17 03:39:02 msaitoh Exp $ */
+/* $NetBSD: intel_busclock.c,v 1.21 2015/03/27 05:32:38 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intel_busclock.c,v 1.20 2014/12/17 03:39:02 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: intel_busclock.c,v 1.21 2015/03/27 05:32:38 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -272,6 +272,56 @@ p3_get_bus_clock(struct cpu_info *ci)
goto print_msr;
}
break;
+ case 0x4c: /* Airmont */
+ if (rdmsr_safe(MSR_FSB_FREQ, msr) == EFAULT) {
+ aprint_debug_dev(ci-ci_dev,
+ unable to determine bus speed);
+ goto print_msr;
+ }
+ bus = (msr 0) 0xf;
+ switch (bus) {
+ case 0:
+ bus_clock = 8333;
+ break;
+ case 1:
+ bus_clock = 1;
+ break;
+ case 2:
+ bus_clock = 1;
+ break;
+ case 3:
+ bus_clock = 11650;
+ break;
+ case 4:
+ bus_clock = 8333;
+ break;
+ case 5:
+ bus_clock = 1;
+ break;
+ case 6:
+ bus_clock = 1;
+ break;
+ case 7:
+ bus_clock = 11666;
+ break;
+ case 12:
+ bus_clock = 8000;
+ break;
+ case 13:
+ bus_clock = 9333;
+ break;
+ case 14:
+ bus_clock = 9000;
+ break;
+ case 15:
+ bus_clock = ;
+ break;
+ default:
+ aprint_debug(%s: unknown Airmont FSB_FREQ value %d,
+ device_xname(ci-ci_dev), bus);
+ goto print_msr;
+ }
+ break;
default:
aprint_debug(%s: unknown i686 model %02x, can't get bus clock,
device_xname(ci-ci_dev),
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Fri Mar 27 05:33:08 UTC 2015
Modified Files:
src/sys/dev/ic: spdmem.c spdmemreg.h
Log Message:
Add DDR4 support a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/spdmem.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/spdmemreg.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/ic/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.10 src/sys/dev/ic/spdmem.c:1.11
--- src/sys/dev/ic/spdmem.c:1.10 Mon Apr 14 14:30:24 2014
+++ src/sys/dev/ic/spdmem.c Fri Mar 27 05:33:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.10 2014/04/14 14:30:24 pooka Exp $ */
+/* $NetBSD: spdmem.c,v 1.11 2015/03/27 05:33:08 msaitoh Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.10 2014/04/14 14:30:24 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.11 2015/03/27 05:33:08 msaitoh Exp $);
#include sys/param.h
#include sys/device.h
@@ -76,6 +76,7 @@ static const char* spdmem_basic_types[]
DDR2 SDRAM FB,
DDR2 SDRAM FB Probe,
DDR3 SDRAM
+ DDR4 SDRAM
};
static const char* spdmem_superset_types[] = {
Index: src/sys/dev/ic/spdmemreg.h
diff -u src/sys/dev/ic/spdmemreg.h:1.1 src/sys/dev/ic/spdmemreg.h:1.2
--- src/sys/dev/ic/spdmemreg.h:1.1 Wed Mar 24 00:31:41 2010
+++ src/sys/dev/ic/spdmemreg.h Fri Mar 27 05:33:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmemreg.h,v 1.1 2010/03/24 00:31:41 pgoyette Exp $ */
+/* $NetBSD: spdmemreg.h,v 1.2 2015/03/27 05:33:08 msaitoh Exp $ */
/*
* Copyright (c) 2007 Paul Goyette
@@ -40,6 +40,7 @@
#define SPDMEM_MEMTYPE_FBDIMM 0x09
#define SPDMEM_MEMTYPE_FBDIMM_PROBE 0x0A
#define SPDMEM_MEMTYPE_DDR3SDRAM 0x0B
+#define SPDMEM_MEMTYPE_DDR4SDRAM 0x0C
#define SPDMEM_MEMTYPE_RAMBUS 0x11
#define SPDMEM_MEMTYPE_DIRECTRAMBUS 0x01
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Mar 26 16:19:26 UTC 2015
Modified Files:
src/sys/dev/usb: uhub.c
Log Message:
Note the uhub the DPRINTF is about in many cases
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/usb/uhub.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/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.127 src/sys/dev/usb/uhub.c:1.128
--- src/sys/dev/usb/uhub.c:1.127 Thu Mar 26 15:53:58 2015
+++ src/sys/dev/usb/uhub.c Thu Mar 26 16:19:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.127 2015/03/26 15:53:58 skrll Exp $ */
+/* $NetBSD: uhub.c,v 1.128 2015/03/26 16:19:26 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.127 2015/03/26 15:53:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.128 2015/03/26 16:19:26 skrll Exp $);
#include sys/param.h
@@ -224,7 +224,7 @@ uhub_attach(device_t parent, device_t se
USETW2(req.wValue, UDESC_HUB, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, USB_HUB_DESCRIPTOR_SIZE);
- DPRINTF(getting hub descriptor, 0, 0, 0, 0);
+ DPRINTF(uhub %d getting hub descriptor, device_unit(self), 0, 0, 0);
err = usbd_do_request(dev, req, hubdesc);
nports = hubdesc.bNbrPorts;
if (!err nports 7) {
@@ -232,8 +232,8 @@ uhub_attach(device_t parent, device_t se
err = usbd_do_request(dev, req, hubdesc);
}
if (err) {
- DPRINTF(getting hub descriptor failed, sc %p error %d, sc,
- err, 0, 0);
+ DPRINTF(getting hub descriptor failed, uhub %d error %d,
+ device_unit(self), err, 0, 0);
return;
}
@@ -375,7 +375,8 @@ uhub_attach(device_t parent, device_t se
if (err)
aprint_error_dev(self, port %d power on failed, %s\n,
port, usbd_errstr(err));
- DPRINTF(turn on port %d power, port, 0, 0, 0);
+ DPRINTF(uhub %d turn on port %d power, device_unit(self),
+ port, 0, 0);
}
/* Wait for stable power if we are not a root hub */
@@ -415,7 +416,8 @@ uhub_explore(usbd_device_handle dev)
UHUBHIST_FUNC(); UHUBHIST_CALLED();
- DPRINTFN(10, sc=%p dev=%p addr=%d, sc, dev, dev-address, 0);
+ DPRINTFN(10, uhub %d dev=%p addr=%d, device_unit(sc-sc_dev), dev,
+ dev-address, 0);
if (!sc-sc_running)
return (USBD_NOT_STARTED);
@@ -429,8 +431,8 @@ uhub_explore(usbd_device_handle dev)
err = usbd_get_hub_status(dev, hs);
if (err) {
- DPRINTF(get hub status failed, sc %p err%d, sc,
- err, 0, 0);
+ DPRINTF(get hub status failed, uhub %d err %d,
+ device_unit(sc-sc_dev), err, 0, 0);
} else {
/* just acknowledge */
status = UGETW(hs.wHubStatus);
@@ -457,8 +459,8 @@ uhub_explore(usbd_device_handle dev)
if (PORTSTAT_ISSET(sc, port) || reconnect) {
err = usbd_get_port_status(dev, port, up-status);
if (err) {
-DPRINTF(get port stat failed, sc %p err %d,
-sc, err, 0, 0);
+DPRINTF(get port stat failed, uhub %d err %d,
+device_unit(sc-sc_dev), err, 0, 0);
continue;
}
status = UGETW(up-status.wPortStatus);
@@ -637,7 +639,7 @@ uhub_detach(device_t self, int flags)
UHUBHIST_FUNC(); UHUBHIST_CALLED();
- DPRINTF(sc=%p flags=%d, sc, flags, 0, 0);
+ DPRINTF(uhub %d flags=%d, device_unit(self), flags, 0, 0);
if (hub == NULL) /* Must be partially working */
return (0);
@@ -746,7 +748,7 @@ uhub_intr(usbd_xfer_handle xfer, usbd_pr
UHUBHIST_FUNC(); UHUBHIST_CALLED();
- DPRINTFN(5, sc=%p, sc, 0, 0, 0);
+ DPRINTFN(5, uhub %d, device_unit(sc-sc_dev), 0, 0, 0);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc-sc_ipipe);
CVS commit: src/sys/arch/arm/amlogic
Module Name:src
Committed By: joerg
Date: Thu Mar 26 16:26:35 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_genfb.c
Log Message:
amlogic_genfb_hdmi_write_4 is currently unused, mark it as such.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_genfb.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/arm/amlogic/amlogic_genfb.c
diff -u src/sys/arch/arm/amlogic/amlogic_genfb.c:1.3 src/sys/arch/arm/amlogic/amlogic_genfb.c:1.4
--- src/sys/arch/arm/amlogic/amlogic_genfb.c:1.3 Sun Mar 22 16:23:26 2015
+++ src/sys/arch/arm/amlogic/amlogic_genfb.c Thu Mar 26 16:26:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_genfb.c,v 1.3 2015/03/22 16:23:26 jmcneill Exp $ */
+/* $NetBSD: amlogic_genfb.c,v 1.4 2015/03/26 16:26:35 joerg Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_genfb.c,v 1.3 2015/03/22 16:23:26 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_genfb.c,v 1.4 2015/03/26 16:26:35 joerg Exp $);
#include sys/param.h
#include sys/types.h
@@ -135,7 +135,7 @@ amlogic_genfb_hdmi_read_4(struct amlogic
return bus_space_read_4(sc-sc_bst, sc-sc_hdmi_bsh, HDMI_DATA_REG);
}
-static inline void
+static __unused inline void
amlogic_genfb_hdmi_write_4(struct amlogic_genfb_softc *sc, uint32_t addr,
uint32_t data)
{
CVS commit: [netbsd-7] src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Thu Mar 26 16:09:52 UTC 2015
Modified Files:
src/sys/dev/scsipi [netbsd-7]: scsipi_base.c
Log Message:
Pull up the following revisions, requested by christos in #644:
sys/dev/scsipi/scsipi_base.c1.161 - 1.164
Use size for the size argument of memcmp, not the result of a compare.
PR/49054: Add a quirk for the ES-6600 RAID controller which does not do
INQUIRY3 properly. Unfortunately looking at the length does not solve
the problem since other devices send greater lengths too.
src is too big these days to tolerate superfluous apostrophes. It's
its, people!
PR/49054: Uwe Toenjes: Some RAID controllers return more bytes in the
scsi 3 inquiry command than expected by the size of the scsi 3 inquiry
packet. This can be detected by looking at the additional_length field
returned by the scsi 2 inquiry. If that's the case, avoid doing the
scsi 3 inquiry because we can't handle the extra bytes later.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.160.2.1 src/sys/dev/scsipi/scsipi_base.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/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.160 src/sys/dev/scsipi/scsipi_base.c:1.160.2.1
--- src/sys/dev/scsipi/scsipi_base.c:1.160 Sun Jul 13 17:12:23 2014
+++ src/sys/dev/scsipi/scsipi_base.c Thu Mar 26 16:09:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.160 2014/07/13 17:12:23 dholland Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.160.2.1 2015/03/26 16:09:52 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.160 2014/07/13 17:12:23 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.160.2.1 2015/03/26 16:09:52 martin Exp $);
#include opt_scsi.h
@@ -808,7 +808,7 @@ scsipi_interpret_sense(struct scsipi_xfe
#endif
/*
- * If the periph has it's own error handler, call it first.
+ * If the periph has its own error handler, call it first.
* If it returns a legit error value, return that, otherwise
* it wants us to continue with normal error processing.
*/
@@ -1044,6 +1044,28 @@ scsipi_test_unit_ready(struct scsipi_per
retries, 1, NULL, flags));
}
+static const struct scsipi_inquiry3_pattern {
+ const char vendor[8];
+ const char product[16];
+ const char revision[4];
+} scsipi_inquiry3_quirk[] = {
+ { ES-6600 , , },
+};
+
+static int
+scsipi_inquiry3_ok(const struct scsipi_inquiry_data *ib)
+{
+ for (size_t i = 0; i __arraycount(scsipi_inquiry3_quirk); i++) {
+ const struct scsipi_inquiry3_pattern *q =
+ scsipi_inquiry3_quirk[i];
+#define MATCH(field) \
+(q-field[0] ? memcmp(ib-field, q-field, sizeof(ib-field)) == 0 : 1)
+ if (MATCH(vendor) MATCH(product) MATCH(revision))
+ return 0;
+ }
+ return 1;
+}
+
/*
* scsipi_inquire:
*
@@ -1064,7 +1086,7 @@ scsipi_inquire(struct scsipi_periph *per
/*
* If we request more data than the device can provide, it SHOULD just
- * return a short reponse. However, some devices error with an
+ * return a short response. However, some devices error with an
* ILLEGAL REQUEST sense code, and yet others have even more special
* failture modes (such as the GL641USB flash adapter, which goes loony
* and sends corrupted CRCs). To work around this, and to bring our
@@ -1081,6 +1103,7 @@ scsipi_inquire(struct scsipi_periph *per
1, NULL, flags | XS_CTL_DATA_IN);
if (!error
inqbuf-additional_length SCSIPI_INQUIRY_LENGTH_SCSI2 - 4) {
+ if (scsipi_inquiry3_ok(inqbuf)) {
#if 0
printf(inquire: addlen=%d, retrying\n, inqbuf-additional_length);
#endif
@@ -1091,6 +1114,7 @@ printf(inquire: addlen=%d, retrying\n,
#if 0
printf(inquire: error=%d\n, error);
#endif
+ }
}
#ifdef SCSI_OLD_NOINQUIRY
@@ -2445,7 +2469,7 @@ scsipi_sync_factor_to_freq(int factor)
#ifdef SCSIPI_DEBUG
/*
- * Given a scsipi_xfer, dump the request, in all it's glory
+ * Given a scsipi_xfer, dump the request, in all its glory
*/
void
show_scsipi_xs(struct scsipi_xfer *xs)
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: prlw1
Date: Thu Mar 26 17:40:16 UTC 2015
Modified Files:
src/sys/opencrypto: cryptodev.c deflate.c
Log Message:
Trivial printf format changes and typo fix
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.21 -r1.22 src/sys/opencrypto/deflate.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.82 src/sys/opencrypto/cryptodev.c:1.83
--- src/sys/opencrypto/cryptodev.c:1.82 Thu Nov 27 20:30:05 2014
+++ src/sys/opencrypto/cryptodev.c Thu Mar 26 17:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $ */
+/* $NetBSD: cryptodev.c,v 1.83 2015/03/26 17:40:16 prlw1 Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.83 2015/03/26 17:40:16 prlw1 Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1709,7 +1709,7 @@ cryptodev_session(struct fcrypt *fcr, st
error = crypto_newsession(sid, crihead, crypto_devallowsoft);
if (!error) {
- DPRINTF((cyrptodev_session: got session %d\n, (uint32_t)sid));
+ DPRINTF((cryptodev_session: got session %d\n, (uint32_t)sid));
cse = csecreate(fcr, sid, crie.cri_key, crie.cri_klen,
cria.cri_key, cria.cri_klen, (txform ? sop-cipher : 0), sop-mac,
(tcomp ? sop-comp_alg : 0), txform, thash, tcomp);
Index: src/sys/opencrypto/deflate.c
diff -u src/sys/opencrypto/deflate.c:1.21 src/sys/opencrypto/deflate.c:1.22
--- src/sys/opencrypto/deflate.c:1.21 Sun Jul 3 01:01:06 2011
+++ src/sys/opencrypto/deflate.c Thu Mar 26 17:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $ */
+/* $NetBSD: deflate.c,v 1.22 2015/03/26 17:40:16 prlw1 Exp $ */
/* $FreeBSD: src/sys/opencrypto/deflate.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: deflate.c,v 1.22 2015/03/26 17:40:16 prlw1 Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -88,7 +88,7 @@ deflate_global(u_int8_t *data, u_int32_t
int error, i, j;
struct deflate_buf buf[ZBUF];
- DPRINTF((deflate_global: size %d\n, size));
+ DPRINTF((deflate_global: size %u\n, size));
memset(zbuf, 0, sizeof(z_stream));
zbuf.next_in = data; /* data that is going to be processed */
@@ -236,7 +236,7 @@ gzip_global(u_int8_t *data, u_int32_t si
u_int32_t crc;
u_int32_t isize = 0, icrc = 0;
- DPRINTF((gzip_global: decomp %d, size %d\n, decomp, size));
+ DPRINTF((gzip_global: decomp %d, size %u\n, decomp, size));
memset(zbuf, 0, sizeof(z_stream));
zbuf.zalloc = ocf_zalloc;
@@ -245,13 +245,13 @@ gzip_global(u_int8_t *data, u_int32_t si
if (!decomp) {
/* compress */
- DPRINTF((gzip_global: compress malloc %d + %d + %d = %d\n,
+ DPRINTF((gzip_global: compress malloc %u + %zu + %u = %zu\n,
size, sizeof(gzip_header), GZIP_TAIL_SIZE,
size + sizeof(gzip_header) + GZIP_TAIL_SIZE));
buf[0].size = size;
crc = crc32(0, data, size);
- DPRINTF((gzip_compress: size %d, crc 0x%x\n, size, crc));
+ DPRINTF((gzip_compress: size %u, crc 0x%x\n, size, crc));
zbuf.avail_in = size; /* Total length of data to be processed */
zbuf.next_in = data; /* data that is going to be processed */
} else {
@@ -259,7 +259,7 @@ gzip_global(u_int8_t *data, u_int32_t si
/* check the gzip header */
if (size = sizeof(gzip_header) + GZIP_TAIL_SIZE) {
/* Not enough data for the header tail */
- DPRINTF((gzip_global: not enough data (%d)\n,
+ DPRINTF((gzip_global: not enough data (%u)\n,
size));
return 0;
}
@@ -284,7 +284,7 @@ gzip_global(u_int8_t *data, u_int32_t si
memcpy(icrc, data[size-2*sizeof(uint32_t)], sizeof(uint32_t));
LE32TOH(icrc);
- DPRINTF((gzip_global: isize = %d (%02x %02x %02x %02x)\n,
+ DPRINTF((gzip_global: isize = %u (%02x %02x %02x %02x)\n,
isize,
data[size-4],
data[size-3],
@@ -306,7 +306,7 @@ gzip_global(u_int8_t *data, u_int32_t si
return 0;
zbuf.next_out = buf[0].out;
zbuf.avail_out = buf[0].size;
- DPRINTF((zbuf avail_in %d, avail_out %d\n,
+ DPRINTF((zbuf avail_in %u, avail_out %u\n,
zbuf.avail_in, zbuf.avail_out));
i = 1;
@@ -319,11 +319,11 @@ gzip_global(u_int8_t *data, u_int32_t si
goto bad2;
}
for (;;) {
- DPRINTF((pre: %s in:%d out:%d\n, decomp ? deflate() : inflate(),
+ DPRINTF((pre: %s in:%u out:%u\n, decomp ? deflate() : inflate(),
zbuf.avail_in, zbuf.avail_out));
CVS commit: [netbsd-7] src/sys/arch/zaurus/include
Module Name:src
Committed By: martin
Date: Thu Mar 26 16:14:47 UTC 2015
Modified Files:
src/sys/arch/zaurus/include [netbsd-7]: bootconfig.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #645):
sys/arch/zaurus/include/bootconfig.h: revision 1.2
merge common information (fix build)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.116.1 src/sys/arch/zaurus/include/bootconfig.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/zaurus/include/bootconfig.h
diff -u src/sys/arch/zaurus/include/bootconfig.h:1.1 src/sys/arch/zaurus/include/bootconfig.h:1.1.116.1
--- src/sys/arch/zaurus/include/bootconfig.h:1.1 Sat Dec 16 05:43:15 2006
+++ src/sys/arch/zaurus/include/bootconfig.h Thu Mar 26 16:14:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.h,v 1.1 2006/12/16 05:43:15 ober Exp $ */
+/* $NetBSD: bootconfig.h,v 1.1.116.1 2015/03/26 16:14:46 martin Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -41,6 +41,10 @@
*
* Based on kate/boot/bootconfig.h
*/
+#ifndef _ZAURUS_BOOTCONFIG_H_
+#define _ZAURUS_BOOTCONFIG_H_
+
+#include arm/bootconfig.h
typedef struct _PhysMem {
u_int address;
@@ -59,17 +63,8 @@ typedef struct _BootConfig {
extern BootConfig bootconfig;
#define MAX_BOOT_STRING 255
-#define BOOTOPT_TYPE_BOOLEAN 0
-#define BOOTOPT_TYPE_STRING 1
-#define BOOTOPT_TYPE_INT 2
-#define BOOTOPT_TYPE_BININT 3
-#define BOOTOPT_TYPE_HEXINT 4
-#define BOOTOPT_TYPE_MASK 7
-
-int get_bootconf_option(char *, const char *, int, void *);
-
-extern char *boot_args;
extern char *boot_file;
#endif /* _KERNEL */
-/* End of bootconfig.h */
+#endif /* _ZAURUS_BOOTCONFIG_H_ */
+
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Mar 26 16:15:38 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #644 and #645 To generate a diff of this commit: cvs rdiff -u -r1.1.2.243 -r1.1.2.244 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.243 src/doc/CHANGES-7.0:1.1.2.244 --- src/doc/CHANGES-7.0:1.1.2.243 Thu Mar 26 13:44:46 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 16:15:38 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.243 2015/03/26 13:44:46 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.244 2015/03/26 16:15:38 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19373,3 +19373,13 @@ sys/dev/pci/ixgbe/ixv.h1.3 change. [msaitoh, #641] +sys/dev/scsipi/scsipi_base.c 1.161-1.164 + + Various bug fixes and comment changes, including a fix for PR/49054. + [christos, #644] + +sys/arch/zaurus/include/bootconfig.h 1.2 + + Merge common information. + [skrll, ticket #645] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Mar 26 13:44:46 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #641 To generate a diff of this commit: cvs rdiff -u -r1.1.2.242 -r1.1.2.243 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.242 src/doc/CHANGES-7.0:1.1.2.243 --- src/doc/CHANGES-7.0:1.1.2.242 Thu Mar 26 11:30:49 2015 +++ src/doc/CHANGES-7.0 Thu Mar 26 13:44:46 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.242 2015/03/26 11:30:49 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.243 2015/03/26 13:44:46 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19329,3 +19329,47 @@ bin/dd/extern.h 1.23 Add iflag and oflag operands to dd(1). [manu, ticket #640] +sys/dev/pci/files.pci1.374 +sys/dev/pci/ixgbe/ixgbe.h 1.3 +sys/dev/pci/ixgbe/ixgbe.c 1.20-1.23 +sys/dev/pci/ixgbe/ixgbe_type.h 1.3-1.7 +sys/dev/pci/ixgbe/ixgbe_82599.c 1.4-1.5 +sys/dev/pci/ixgbe/ixgbe_api.c 1.3-1.4 +sys/dev/pci/ixgbe/ixgbe_vf.h 1.2 +sys/dev/pci/ixgbe/ixv.c1.3-1.4 +sys/dev/pci/ixgbe/ixv.h1.3 + + - Sync ixg(4) up to FreeBSD r230572. + - Fix in the interrupt handler to make sure the stack TX queue is + processed. (FreeBSD r222588) + - The maximum read size of incoming packets is done in 1024-byte + increments. + The current code was rounding down the maximum frame size + instead of routing up, resulting in a read size of 1024 bytes, + in the non-jumbo frame case, and splitting the packets across + multiple mbufs. (FreeBSD r225045) + - Consequently the above problem exposed another issue, which is + when packets were splitted across multiple mbufs, and all of + the mbufs in the chain have the M_PKTHDR flag set. + (FreeBSD r225045) + - Use the correct constant for conversion between interrupt rate + and EITR values (the previous values were off by a factor of 2) + (FreeBSD r230572) + - Make dev.ix.N.queueM.interrupt_rate a RW sysctl variable. Changing + individual values affects the queue immediately, and propagates + to all interfaces at the next reinit. (FreeBSD r230572) + - Add dev.ix.N.queueM.irqs rdonly sysctl, to export the actual + interrupt counts. (FreeBSD r230572) + - Some netmap related changes. + - Fix a bug that vlan setting may not apply to the parent interface + correctly. + - Add 82599EN_SFP and 82599_SFP_SF_QP. + - Modify to make Intel Intel 10G Ethernet (ixg(4)) virtual function + ixv(4) compilable. Not completed yet. It's required to use MSI-X. + - Change comments, tabs and spaces to make difference among *BSDs + small. + - Enclose macro argument correctly. Same as *BSDs. No binary change. + - Add missing parenthesis in IXGBE_CORE_LOCK_ASSERT() macro. No binary + change. + [msaitoh, #641] +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nakayama Date: Thu Mar 26 20:13:28 UTC 2015 Modified Files: src/sys/dev/pci: pccbb.c Log Message: Add missing new lines. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/dev/pci/pccbb.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/pci/pccbb.c diff -u src/sys/dev/pci/pccbb.c:1.207 src/sys/dev/pci/pccbb.c:1.208 --- src/sys/dev/pci/pccbb.c:1.207 Sun Nov 16 16:20:00 2014 +++ src/sys/dev/pci/pccbb.c Thu Mar 26 20:13:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.207 2014/11/16 16:20:00 ozaki-r Exp $ */ +/* $NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.207 2014/11/16 16:20:00 ozaki-r Exp $); +__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $); /* #define CBB_DEBUG @@ -556,9 +556,9 @@ pccbbdetach(device_t self, int flags) sc-sc_flags = ~(CBB_MEMHMAPPED|CBB_SPECMAPPED); if (!TAILQ_EMPTY(sc-sc_iowindow)) - aprint_error_dev(self, i/o windows not empty); + aprint_error_dev(self, i/o windows not empty\n); if (!TAILQ_EMPTY(sc-sc_memwindow)) - aprint_error_dev(self, memory windows not empty); + aprint_error_dev(self, memory windows not empty\n); callout_halt(sc-sc_insert_ch, NULL); callout_destroy(sc-sc_insert_ch);
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: skrll Date: Thu Mar 26 22:01:42 UTC 2015 Modified Files: src/sys/arch/arm/cortex: gtmr.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/cortex/gtmr.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/arm/cortex/gtmr.c diff -u src/sys/arch/arm/cortex/gtmr.c:1.12 src/sys/arch/arm/cortex/gtmr.c:1.13 --- src/sys/arch/arm/cortex/gtmr.c:1.12 Tue Mar 24 15:53:39 2015 +++ src/sys/arch/arm/cortex/gtmr.c Thu Mar 26 22:01:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: gtmr.c,v 1.12 2015/03/24 15:53:39 matt Exp $ */ +/* $NetBSD: gtmr.c,v 1.13 2015/03/26 22:01:42 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.12 2015/03/24 15:53:39 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.13 2015/03/26 22:01:42 skrll Exp $); #include sys/param.h #include sys/bus.h @@ -103,7 +103,7 @@ gtmr_attach(device_t parent, device_t se /* * This runs at a fixed frequency of 1 to 50MHz. */ - prop_dictionary_get_uint32(dict, frequency, sc-sc_freq); + prop_dictionary_get_uint32(dict, frequency, sc-sc_freq); KASSERT(sc-sc_freq != 0); humanize_number(freqbuf, sizeof(freqbuf), sc-sc_freq, Hz, 1000); @@ -204,7 +204,7 @@ gtmr_init_cpu_clock(struct cpu_info *ci) uint32_t end32 = armreg_pmccntr_read(); uint32_t diff32 = end64 - start64; - printf(%s: %s: %u cycles per tick\n, + printf(%s: %s: %u cycles per tick\n, __func__, ci-ci_data.cpu_name, (end32 - start32) / diff32); printf(%s: %s: status %#x cmp %#PRIx64 now %#PRIx64\n, @@ -212,7 +212,7 @@ gtmr_init_cpu_clock(struct cpu_info *ci) armreg_cntv_cval_read(), armreg_cntv_ct_read()); splx(s); #elif 0 - delay(100 / hz + 1000); + delay(100 / hz + 1000); #endif }
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: skrll
Date: Thu Mar 26 22:00:45 UTC 2015
Modified Files:
src/sys/arch/arm/omap: if_cpsw.c
Log Message:
Fixes from PR/49622
- Use bit definitions from the header instead of magic numbers
- Remove the 'BYPASS' bit (4), otherwise all the careful setup
of the ALE is futile - the BYPASS bit is described in the
AM3358 datasheet as When in bypass mode, all CPGMAC_SL
received packets are forwarded only to the host port (port 0)
so effectively it's a promiscuous enable
- During cpsw_stop the MISC interrupts were being left enabled
- Remove unnecessary cpi assignment before loop.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/omap/if_cpsw.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/arm/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.10 src/sys/arch/arm/omap/if_cpsw.c:1.11
--- src/sys/arch/arm/omap/if_cpsw.c:1.10 Fri Mar 13 08:56:35 2015
+++ src/sys/arch/arm/omap/if_cpsw.c Thu Mar 26 22:00:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.10 2015/03/13 08:56:35 skrll Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.11 2015/03/26 22:00:45 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: if_cpsw.c,v 1.10 2015/03/13 08:56:35 skrll Exp $);
+__KERNEL_RCSID(1, $NetBSD: if_cpsw.c,v 1.11 2015/03/26 22:00:45 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -881,8 +881,9 @@ cpsw_init(struct ifnet *ifp)
cpsw_write_4(sc, CPSW_SS_SOFT_RESET, 1);
while(cpsw_read_4(sc, CPSW_SS_SOFT_RESET) 1);
- /* Clear table (30) and enable ALE(31) and set passthrough (4) */
- cpsw_write_4(sc, CPSW_ALE_CONTROL, (3 30) | 0x10);
+ /* Clear table and enable ALE */
+ cpsw_write_4(sc, CPSW_ALE_CONTROL,
+ ALECTL_ENABLE_ALE | ALECTL_CLEAR_TABLE);
/* Reset and init Sliver port 1 and 2 */
for (i = 0; i CPSW_ETH_PORTS; i++) {
@@ -1023,7 +1024,7 @@ cpsw_stop(struct ifnet *ifp, int disable
cpsw_write_4(sc, CPSW_CPDMA_RX_INTMASK_CLEAR, 1);
cpsw_write_4(sc, CPSW_WR_C_TX_EN(0), 0x0);
cpsw_write_4(sc, CPSW_WR_C_RX_EN(0), 0x0);
- cpsw_write_4(sc, CPSW_WR_C_MISC_EN(0), 0x1F);
+ cpsw_write_4(sc, CPSW_WR_C_MISC_EN(0), 0x0);
cpsw_write_4(sc, CPSW_CPDMA_TX_TEARDOWN, 0);
cpsw_write_4(sc, CPSW_CPDMA_RX_TEARDOWN, 0);
@@ -1213,14 +1214,13 @@ cpsw_txintr(void *arg)
tx0_cp = cpsw_read_4(sc, CPSW_CPDMA_TX_CP(0));
if (tx0_cp == 0xfffc) {
+ /* Teardown, ack it */
cpsw_write_4(sc, CPSW_CPDMA_TX_CP(0), 0xfffc);
cpsw_write_4(sc, CPSW_CPDMA_TX_HDP(0), 0);
sc-sc_txrun = false;
return 0;
}
- cpi = (tx0_cp - sc-sc_txdescs_pa) / sizeof(struct cpsw_cpdma_bd);
-
for (;;) {
tx0_cp = cpsw_read_4(sc, CPSW_CPDMA_TX_CP(0));
cpi = (tx0_cp - sc-sc_txdescs_pa) / sizeof(struct cpsw_cpdma_bd);
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu Mar 26 22:04:38 UTC 2015 Modified Files: src/share/man/man9: wapbl.9 Log Message: Use less macros for same output. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/wapbl.9 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/man9/wapbl.9 diff -u src/share/man/man9/wapbl.9:1.1 src/share/man/man9/wapbl.9:1.2 --- src/share/man/man9/wapbl.9:1.1 Thu Mar 26 21:38:49 2015 +++ src/share/man/man9/wapbl.9 Thu Mar 26 22:04:38 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: wapbl.9,v 1.1 2015/03/26 21:38:49 riastradh Exp $ +.\ $NetBSD: wapbl.9,v 1.2 2015/03/26 22:04:38 wiz Exp $ .\ .\ Copyright (c) 2015 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -105,7 +105,7 @@ When a file system using issues writes (as in .Xr bwrite 9 or -.Xr bdwrite 9 Ns ), +.Xr bdwrite 9 ) , they are grouped in batches called .Em transactions in memory, which are serialized to be consistent with program order @@ -269,7 +269,7 @@ must be is a callback that .Nm will invoke as -.Fa flushfn Ns Li ( Fa mp Ns Li , Fa deallocblks Ns Li , Fa dealloclens Ns Li , Fa dealloccnt Ns Li ) +.Fa flushfn Ns ( Fa mp , Fa deallocblks , Fa dealloclens , Fa dealloccnt ) just before it flushes a transaction to disk, with the transaction locked exclusively, where .Fa mp
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Thu Mar 26 21:38:49 UTC 2015 Added Files: src/share/man/man9: wapbl.9 Log Message: Add wapbl(9) man page. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man9/wapbl.9 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/man9/wapbl.9 diff -u /dev/null src/share/man/man9/wapbl.9:1.1 --- /dev/null Thu Mar 26 21:38:49 2015 +++ src/share/man/man9/wapbl.9 Thu Mar 26 21:38:49 2015 @@ -0,0 +1,442 @@ +.\ $NetBSD: wapbl.9,v 1.1 2015/03/26 21:38:49 riastradh Exp $ +.\ +.\ Copyright (c) 2015 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Taylor R. Campbell. +.\ +.\ 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. +.\ +.Dd March 26, 2015 +.Dt WAPBL 9 +.Os +.Sh NAME +.Nm WAPBL , +.Nm wapbl_start , +.Nm wapbl_stop , +.Nm wapbl_begin , +.Nm wapbl_end , +.Nm wapbl_flush , +.Nm wapbl_discard , +.Nm wapbl_add_buf , +.Nm wapbl_remove_buf , +.Nm wapbl_resize_buf , +.Nm wapbl_register_inode , +.Nm wapbl_unregister_inode , +.Nm wapbl_register_deallocation , +.Nm wapbl_jlock_assert , +.Nm wapbl_junlock_assert +.Nd write-ahead physical block logging for file systems +.Sh SYNOPSIS +.In sys/wapbl.h +.Vt typedef void (*wapbl_flush_fn_t)(struct mount *, daddr_t *, int *, int) ; +.Ft int +.Fn wapbl_start struct wapbl **wlp struct mount *mp struct vnode *devvp \ +daddr_t off size_t count size_t blksize \ +struct wapbl_replay *wr \ +wapbl_flush_fn_t flushfn wapbl_flush_fn_t flushabortfn +.Ft int +.Fn wapbl_stop struct wapbl *wl int force +.Ft int +.Fn wapbl_begin struct wapbl *wl const char *file int line +.Ft void +.Fn wapbl_end struct wapbl *wl +.Ft int +.Fn wapbl_flush struct wapbl *wl int wait +.Ft void +.Fn wapbl_discard struct wapbl *wl +.Ft void +.Fn wapbl_add_buf struct wapbl *wl struct buf *bp +.Ft void +.Fn wapbl_remove_buf struct wapbl *wl struct buf *bp +.Ft void +.Fn wapbl_resize_buf struct wapbl *wl struct buf *bp long oldsz \ + long oldcnt +.Ft void +.Fn wapbl_register_inode struct wapbl *wl ino_t ino mode_t mode +.Ft void +.Fn wapbl_unregister_inode struct wapbl *wl ino_t ino mode_t mode +.Ft void +.Fn wapbl_register_deallocation struct wapbl *wl daddr_t blk int len +.Ft void +.Fn wapbl_jlock_assert struct wapbl *wl +.Ft void +.Fn wapbl_junlock_assert struct wapbl *wl +.Sh DESCRIPTION +.Nm , +or +.Em write-ahead physical block logging , +is an abstraction for file systems to write physical blocks in the +.Xr buffercache 9 +to a bounded-size log first before their real destinations on disk. +The name means: +.Bl -tag -width physical block -offset abcd +.It logging +batches of writes are issued atomically via a log +.It physical block +only physical blocks, not logical file system operations, are stored in +the log +.It write-ahead +blocks are written to the log before being written to the disk +.El +.Pp +When a file system using +.Nm +issues writes (as in +.Xr bwrite 9 +or +.Xr bdwrite 9 Ns ), +they are grouped in batches called +.Em transactions +in memory, which are serialized to be consistent with program order +before +.Nm +submits them to disk atomically. +.Pp +Thus, within a transaction, after one write, another write need not +wait for disk I/O, and if the system is interrupted, e.g. by a crash or +by power failure, either both writes will appear on disk, or neither +will. +.Pp +When a transaction is full, it is written to a circular buffer on +disk called the +.Em log . +When the transaction has been written to disk, every write in the +transaction is
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Mar 26 22:20:42 UTC 2015
Modified Files:
src/usr.bin/make: main.c
Log Message:
Move initialization of savederr to the block where it is used
to avoid spurious warning from gcc 5
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/usr.bin/make/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/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.231 src/usr.bin/make/main.c:1.232
--- src/usr.bin/make/main.c:1.231 Tue Sep 9 06:18:17 2014
+++ src/usr.bin/make/main.c Thu Mar 26 22:20:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.231 2014/09/09 06:18:17 dholland Exp $ */
+/* $NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.231 2014/09/09 06:18:17 dholland Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.231 2014/09/09 06:18:17 dholland Exp $);
+__RCSID($NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -1493,7 +1493,6 @@ Cmd_Exec(const char *cmd, const char **e
*errnum = NULL;
-savederr = 0;
if (!shellName)
Shell_Init();
@@ -1547,6 +1546,7 @@ Cmd_Exec(const char *cmd, const char **e
*/
(void)close(fds[1]);
+ savederr = 0;
Buf_Init(buf, 0);
do {
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Fri Mar 27 01:51:34 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/gcc/common/config/riscv: riscv-common.c
src/external/gpl3/gcc/dist/gcc/config/riscv: constraints.md elf.h
linux.h linux64.h opcode-riscv.h peephole.md riscv-opc.h
riscv-protos.h riscv.c riscv.h riscv.md riscv.opt sync.md t-elf
t-linux64
Added Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: default-32.h
Removed Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: crti.asm crtn.asm div.S
riscv-fp.c
Log Message:
Update gcc to use new ABI for RISCV
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/common/config/riscv/riscv-common.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/riscv/constraints.md \
src/external/gpl3/gcc/dist/gcc/config/riscv/elf.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/linux.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/linux64.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/opcode-riscv.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/peephole.md \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv-opc.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv-protos.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv.c \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv.h \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv.md \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv.opt \
src/external/gpl3/gcc/dist/gcc/config/riscv/t-elf \
src/external/gpl3/gcc/dist/gcc/config/riscv/t-linux64
cvs rdiff -u -r1.1 -r0 src/external/gpl3/gcc/dist/gcc/config/riscv/crti.asm \
src/external/gpl3/gcc/dist/gcc/config/riscv/crtn.asm \
src/external/gpl3/gcc/dist/gcc/config/riscv/div.S \
src/external/gpl3/gcc/dist/gcc/config/riscv/riscv-fp.c
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/dist/gcc/config/riscv/default-32.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/riscv/sync.md
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/gcc/dist/gcc/common/config/riscv/riscv-common.c
diff -u src/external/gpl3/gcc/dist/gcc/common/config/riscv/riscv-common.c:1.1 src/external/gpl3/gcc/dist/gcc/common/config/riscv/riscv-common.c:1.2
--- src/external/gpl3/gcc/dist/gcc/common/config/riscv/riscv-common.c:1.1 Fri Sep 19 17:20:29 2014
+++ src/external/gpl3/gcc/dist/gcc/common/config/riscv/riscv-common.c Fri Mar 27 01:51:34 2015
@@ -25,16 +25,85 @@ along with GCC; see the file COPYING3.
#include common/common-target-def.h
#include opts.h
#include flags.h
+#include errors.h
+
+/* Parse a RISC-V ISA string into an option mask. */
+
+static void
+riscv_parse_arch_string (const char *isa, int *flags)
+{
+ const char *p = isa;
+
+ if (strncmp (p, RV32, 4) == 0)
+*flags |= MASK_32BIT, p += 4;
+ else if (strncmp (p, RV64, 4) == 0)
+*flags = ~MASK_32BIT, p += 4;
+
+ if (*p++ != 'I')
+{
+ error (-march=%s: ISA strings must begin with I, RV32I, or RV64I, isa);
+ return;
+}
+
+ *flags = ~MASK_MULDIV;
+ if (*p == 'M')
+*flags |= MASK_MULDIV, p++;
+
+ *flags = ~MASK_ATOMIC;
+ if (*p == 'A')
+*flags |= MASK_ATOMIC, p++;
+
+ *flags |= MASK_SOFT_FLOAT_ABI;
+ if (*p == 'F')
+*flags = ~MASK_SOFT_FLOAT_ABI, p++;
+
+ if (*p == 'D')
+{
+ p++;
+ if (!TARGET_HARD_FLOAT)
+ {
+ error (-march=%s: the D extension requires the F extension, isa);
+ return;
+ }
+}
+ else if (TARGET_HARD_FLOAT)
+{
+ error (-march=%s: single-precision-only is not yet supported, isa);
+ return;
+}
+
+ if (*p)
+{
+ error (-march=%s: unsupported ISA substring %s, isa, p);
+ return;
+}
+}
+
+static int
+riscv_flags_from_arch_string (const char *isa)
+{
+ int flags = 0;
+ riscv_parse_arch_string (isa, flags);
+ return flags;
+}
/* Implement TARGET_HANDLE_OPTION. */
static bool
-riscv_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED,
+riscv_handle_option (struct gcc_options *opts,
struct gcc_options *opts_set ATTRIBUTE_UNUSED,
- const struct cl_decoded_option *decoded ATTRIBUTE_UNUSED,
+ const struct cl_decoded_option *decoded,
location_t loc ATTRIBUTE_UNUSED)
{
- return true;
+ switch (decoded-opt_index)
+{
+case OPT_march_:
+ riscv_parse_arch_string (decoded-arg, opts-x_target_flags);
+ return true;
+
+default:
+ return true;
+}
}
/* Implement TARGET_OPTION_OPTIMIZATION_TABLE. */
@@ -49,10 +118,10 @@ static const struct default_options risc
#define TARGET_OPTION_OPTIMIZATION_TABLE riscv_option_optimization_table
#undef TARGET_DEFAULT_TARGET_FLAGS
-#define TARGET_DEFAULT_TARGET_FLAGS \
- (TARGET_DEFAULT\
- | TARGET_CPU_DEFAULT\
+#define TARGET_DEFAULT_TARGET_FLAGS\
+
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Mar 26 08:08:27 UTC 2015
Modified Files:
src/sys/dev/usb: usb.h
Log Message:
Various usb 3 related changes from Takahiro HAYASHI
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/usb/usb.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/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.111 src/sys/dev/usb/usb.h:1.112
--- src/sys/dev/usb/usb.h:1.111 Sat Nov 8 16:20:23 2014
+++ src/sys/dev/usb/usb.h Thu Mar 26 08:08:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.111 2014/11/08 16:20:23 skrll Exp $ */
+/* $NetBSD: usb.h,v 1.112 2015/03/26 08:08:27 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -260,6 +260,7 @@ typedef struct {
#define UC_REMOTE_WAKEUP 0x20
uByte bMaxPower; /* max current in 2 mA units */
#define UC_POWER_FACTOR 2
+#define UC_POWER_FACTOR_SS 8
} UPACKED usb_config_descriptor_t;
#define USB_CONFIG_DESCRIPTOR_SIZE 9
@@ -330,6 +331,7 @@ typedef struct {
} UPACKED usb_endpoint_ss_comp_descriptor_t;
#define USB_ENDPOINT_SS_COMP_DESCRIPTOR_SIZE 6
+/* USB 3.0 9.6.2, Table 9-12 */
typedef struct {
uByte bLength;
uByte bDescriptorType;
@@ -338,10 +340,12 @@ typedef struct {
} UPACKED usb_bos_descriptor_t;
#define USB_BOS_DESCRIPTOR_SIZE 5
+/* common members of device capability descriptors */
typedef struct {
uByte bLength;
uByte bDescriptorType;
uByte bDevCapabilityType;
+/* Table 9-14 */
#define USB_DEVCAP_RESERVED 0x00
#define USB_DEVCAP_WUSB0x01
#define USB_DEVCAP_USB2EXT 0x02
@@ -357,17 +361,19 @@ typedef struct {
#define USB_DEVCAP_WUSB_EXT 0x0c
/* data ... */
} UPACKED usb_device_capability_descriptor_t;
-#define USB_DEVICE_CAPABILITY_DESCRIPTOR_SIZE 3 /* variable length */
+#define USB_DEVICE_CAPABILITY_DESCRIPTOR_SIZE 3 /* at least */
+/* 9.6.2.1 */
typedef struct {
uByte bLength;
uByte bDescriptorType;
uByte bDevCapabilityType;
uDWord bmAttributes;
#define USB_DEVCAP_USB2EXT_LPM __BIT(1)
-} UPACKED usb_usb2ext_descriptor_t;
+} UPACKED usb_devcap_usb2ext_descriptor_t;
#define USB_DEVCAP_USB2EXT_DESCRIPTOR_SIZE 7
+/* 9.6.2.2 */
typedef struct {
uByte bLength;
uByte bDescriptorType;
@@ -375,16 +381,17 @@ typedef struct {
uByte bmAttributes;
#define USB_DEVCAP_SS_LTM __BIT(1)
uWord wSpeedsSupported;
-#define USB_DEVCAP_SS_SPEED_SS __BIT(0)
+#define USB_DEVCAP_SS_SPEED_LS __BIT(0)
#define USB_DEVCAP_SS_SPEED_FS __BIT(1)
#define USB_DEVCAP_SS_SPEED_HS __BIT(2)
-#define USB_DEVCAP_SS_SPEED_LS __BIT(3)
+#define USB_DEVCAP_SS_SPEED_SS __BIT(3)
uByte bFunctionalitySupport;
uByte bU1DevExitLat;
uWord wU2DevExitLat;
} UPACKED usb_devcap_ss_descriptor_t;
#define USB_DEVCAP_SS_DESCRIPTOR_SIZE 10
+/* 9.6.2.4 */
typedef struct {
uByte bLength;
uByte bDescriptorType;
@@ -749,7 +756,9 @@ typedef struct {
#endif
#define USB_MIN_POWER 100 /* mA */
+#define USB_MIN_POWER_SS 150 /* mA */
#define USB_MAX_POWER 500 /* mA */
+#define USB_MAX_POWER_SS 900 /* mA */
#define USB_BUS_RESET_DELAY 100 /* ms XXX?*/
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nonaka
Date: Thu Mar 26 14:42:56 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Not all iwm hardware supports the 5GHz band. Make setting 11a rates
and scanning conditional on the 5GHz support bit in the nvm.
From OpenBSD rev. 1.39. Arranged by me.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_iwm.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/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.28 src/sys/dev/pci/if_iwm.c:1.29
--- src/sys/dev/pci/if_iwm.c:1.28 Sat Mar 7 13:54:57 2015
+++ src/sys/dev/pci/if_iwm.c Thu Mar 26 14:42:56 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwm.c,v 1.28 2015/03/07 13:54:57 nonaka Exp $ */
-/* OpenBSD: if_iwm.c,v 1.36 2015/03/06 18:39:24 kettenis Exp */
+/* $NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $ */
+/* OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp */
/*
* Copyright (c) 2014 genua mbh i...@genua.de
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.28 2015/03/07 13:54:57 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -5587,7 +5587,8 @@ iwm_endscan_cb(struct work *work __unuse
DPRINTF((scan ended\n));
- if (sc-sc_scanband == IEEE80211_CHAN_2GHZ) {
+ if (sc-sc_scanband == IEEE80211_CHAN_2GHZ
+ sc-sc_nvm.sku_cap_band_52GHz_enable) {
int error;
done = 0;
if ((error = iwm_mvm_scan_request(sc,
@@ -6567,7 +6568,9 @@ iwm_attach_hook(device_t dev)
IEEE80211_C_SHSLOT | /* short slot time supported */
IEEE80211_C_SHPREAMBLE; /* short preamble supported */
- ic-ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
+ /* not all hardware can do 5GHz band */
+ if (sc-sc_nvm.sku_cap_band_52GHz_enable)
+ ic-ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
ic-ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
ic-ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Mar 26 15:53:58 UTC 2015
Modified Files:
src/sys/dev/usb: uhub.c
Log Message:
Convert to USBHIST. Inspired by patch from Takahiro HAYASHI
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/usb/uhub.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/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.126 src/sys/dev/usb/uhub.c:1.127
--- src/sys/dev/usb/uhub.c:1.126 Wed Aug 13 06:26:32 2014
+++ src/sys/dev/usb/uhub.c Thu Mar 26 15:53:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.126 2014/08/13 06:26:32 skrll Exp $ */
+/* $NetBSD: uhub.c,v 1.127 2015/03/26 15:53:58 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,14 +36,16 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.126 2014/08/13 06:26:32 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.127 2015/03/26 15:53:58 skrll Exp $);
#include sys/param.h
+
#include sys/systm.h
+#include sys/device.h
#include sys/kernel.h
#include sys/malloc.h
-#include sys/device.h
#include sys/proc.h
+#include sys/sysctl.h
#include sys/bus.h
@@ -51,15 +53,48 @@ __KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.1
#include dev/usb/usbdi.h
#include dev/usb/usbdi_util.h
#include dev/usb/usbdivar.h
+#include dev/usb/usbhist.h
-#ifdef UHUB_DEBUG
-#define DPRINTF(x) if (uhubdebug) printf x
-#define DPRINTFN(n,x) if (uhubdebug(n)) printf x
-int uhubdebug = 0;
+#ifdef USB_DEBUG
+#ifndef UHUB_DEBUG
+#define uhubdebug 0
#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
+static int uhubdebug = 0;
+
+SYSCTL_SETUP(sysctl_hw_uhub_setup, sysctl hw.uhub setup)
+{
+ int err;
+ const struct sysctlnode *rnode;
+ const struct sysctlnode *cnode;
+
+ err = sysctl_createv(clog, 0, NULL, rnode,
+ CTLFLAG_PERMANENT, CTLTYPE_NODE, uhub,
+ SYSCTL_DESCR(uhub global controls),
+ NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
+
+ if (err)
+ goto fail;
+
+ /* control debugging printfs */
+ err = sysctl_createv(clog, 0, rnode, cnode,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+ debug, SYSCTL_DESCR(Enable debugging output),
+ NULL, 0, uhubdebug, sizeof(uhubdebug), CTL_CREATE, CTL_EOL);
+ if (err)
+ goto fail;
+
+ return;
+fail:
+ aprint_error(%s: sysctl_createv failed (err = %d)\n, __func__, err);
+}
+
+#endif /* UHUB_DEBUG */
+#endif /* USB_DEBUG */
+
+#define DPRINTF(FMT,A,B,C,D) USBHIST_LOGN(uhubdebug,1,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(uhubdebug,N,FMT,A,B,C,D)
+#define UHUBHIST_FUNC() USBHIST_FUNC()
+#define UHUBHIST_CALLED(name) USBHIST_CALLED(uhubdebug)
struct uhub_softc {
device_t sc_dev; /* base device */
@@ -118,12 +153,14 @@ uhub_match(device_t parent, cfdata_t mat
struct usb_attach_arg *uaa = aux;
int matchvalue;
+ UHUBHIST_FUNC(); UHUBHIST_CALLED();
+
if (uhub_ubermatch)
matchvalue = UMATCH_HIGHEST+1;
else
matchvalue = UMATCH_DEVCLASS_DEVSUBCLASS;
- DPRINTFN(5,(uhub_match, uaa=%p\n, uaa));
+ DPRINTFN(5, uaa=%p, uaa, 0, 0, 0);
/*
* The subclass for hubs seems to be 0 for some and 1 for others,
* so we just ignore the subclass.
@@ -151,7 +188,8 @@ uhub_attach(device_t parent, device_t se
struct usbd_tt *tts = NULL;
#endif
- DPRINTFN(1,(uhub_attach\n));
+ UHUBHIST_FUNC(); UHUBHIST_CALLED();
+
sc-sc_dev = self;
sc-sc_hub = dev;
sc-sc_proto = uaa-proto;
@@ -169,8 +207,7 @@ uhub_attach(device_t parent, device_t se
err = usbd_set_config_index(dev, 0, 1);
if (err) {
- DPRINTF((%s: configuration failed, error=%s\n,
- device_xname(sc-sc_dev), usbd_errstr(err)));
+ DPRINTF(configuration failed, sc %p error %d, sc, err, 0, 0);
return;
}
@@ -187,7 +224,7 @@ uhub_attach(device_t parent, device_t se
USETW2(req.wValue, UDESC_HUB, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, USB_HUB_DESCRIPTOR_SIZE);
- DPRINTFN(1,(%s: getting hub descriptor\n, __func__));
+ DPRINTF(getting hub descriptor, 0, 0, 0, 0);
err = usbd_do_request(dev, req, hubdesc);
nports = hubdesc.bNbrPorts;
if (!err nports 7) {
@@ -195,8 +232,8 @@ uhub_attach(device_t parent, device_t se
err = usbd_do_request(dev, req, hubdesc);
}
if (err) {
- DPRINTF((%s: getting hub descriptor failed, error=%s\n,
- device_xname(sc-sc_dev), usbd_errstr(err)));
+ DPRINTF(getting hub descriptor failed, sc %p error %d, sc,
+ err, 0, 0);
return;
}
@@ -338,7 +375,7 @@ uhub_attach(device_t parent, device_t se
if (err)
aprint_error_dev(self, port %d power on failed, %s\n,
port, usbd_errstr(err));
- DPRINTF((usb_init_port: turn on port %d power\n, port));
+ DPRINTF(turn on port %d power, port, 0, 0, 0);
}
/* Wait for stable power if we are not a root hub */
@@ -376,7 +413,9 @@ uhub_explore(usbd_device_handle dev)
int port;
int change, status, reconnect;
- DPRINTFN(10, (uhub_explore dev=%p addr=%d\n,
