CVS commit: src/distrib/notes
Module Name:src
Committed By: snj
Date: Thu Nov 13 08:16:42 UTC 2014
Modified Files:
src/distrib/notes/arc: prep
src/distrib/notes/cats: prep
src/distrib/notes/macppc: prep.OPENFIRMWARE
Log Message:
catch up with current ISO naming conventions
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/notes/arc/prep
cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/cats/prep
cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/macppc/prep.OPENFIRMWARE
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.3 src/distrib/notes/arc/prep:1.4
--- src/distrib/notes/arc/prep:1.3 Wed Nov 5 07:09:47 2014
+++ src/distrib/notes/arc/prep Thu Nov 13 08:16:42 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: prep,v 1.3 2014/11/05 07:09:47 snj Exp $
+.\ $NetBSD: prep,v 1.4 2014/11/13 08:16:42 snj Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -54,7 +54,7 @@ collection should get it from the offici
.Lk http://cdrecord.berlios.de/old/private/cdrecord.html
.Pp
.(disp
-.No # Ic cdrecord -v speed=16 dev=/dev/cd0d arccd.iso
+.No # Ic cdrecord -v speed=16 dev=/dev/cd0d NetBSD-arc-\*V.iso
.disp)
.Pp
You will need to substitute the correct name of the disk image file,
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.12 src/distrib/notes/cats/prep:1.13
--- src/distrib/notes/cats/prep:1.12 Wed Nov 5 07:09:47 2014
+++ src/distrib/notes/cats/prep Thu Nov 13 08:16:42 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: prep,v 1.12 2014/11/05 07:09:47 snj Exp $
+.\ $NetBSD: prep,v 1.13 2014/11/13 08:16:42 snj Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -50,12 +50,11 @@ collection should get it from the offici
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
.(disp
-.No # Ic cdrecord -v speed=4 dev=/dev/cd1d output.iso
+.No # Ic cdrecord -v speed=4 dev=/dev/cd1d NetBSD-\*V-cats.iso
.disp)
.Pp
-You will need to substitute the correct name of the disk image file,
-speed for your CD writer, and the
-correct device for your system (for i386 it would be
+You will need to substitute the correct speed for your CD writer, as well
+as the correct device for your system (for i386 it would be
.Pa /dev/cd1d ) .
.
.Ss2 Booting from CD-ROM
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.16 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.17
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.16 Wed Nov 5 07:09:47 2014
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Thu Nov 13 08:16:42 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: prep.OPENFIRMWARE,v 1.16 2014/11/05 07:09:47 snj Exp $
+.\ $NetBSD: prep.OPENFIRMWARE,v 1.17 2014/11/13 08:16:42 snj Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1385,12 +1385,12 @@ systems should get it from the official
.Pp
.(disp
.if \*[OF_VERSION_12] \{\
-.No # Ic mkisofs -o output.iso -l -J -r -L -N /cdsources
+.No # Ic mkisofs -o NetBSD-\*V-macppc.iso -l -J -r -L -N /cdsources
.\}
.if \*[OF_VERSION_3] \{\
-.No # Ic mkisofs -o output.iso -hfs -part -l -J -r -L -N /cdsources
+.No # Ic mkisofs -o NetBSD-\*V-macppc.iso -hfs -part -l -J -r -L -N /cdsources
.\}
-.No # Ic cdrecord -v speed=4 dev=/dev/cd1c output.iso
+.No # Ic cdrecord -v speed=4 dev=/dev/cd1c NetBSD-\*V-macppc.iso
.disp)
.Pp
You will need to substitute the correct speed for your CD writer, and the
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Nov 13 08:25:32 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Document extsrc. This was added to src/BUILDING in revision 1.90 dated 2009-11-30, but was not added to src/doc/BUILDING.mdoc, so the changes were lost. The original log message was: - - - - revision 1.90 date: 2009-11-30 16:13:22 +; author: uebayasi; state: Exp; lines: +22 -0; Support extsrc, externally added programs and libraries. Users can write their own reach-overs, cross-build, install, and get set files just like base and X11 / X.org. (These sets are not included as TNF releases.) - - - - To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.106 src/doc/BUILDING.mdoc:1.107 --- src/doc/BUILDING.mdoc:1.106 Thu Nov 6 06:41:23 2014 +++ src/doc/BUILDING.mdoc Thu Nov 13 08:25:31 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.106 2014/11/06 06:41:23 uebayasi Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.107 2014/11/13 08:25:31 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -155,6 +155,11 @@ If any of these directories are missing, .Dq Reachover build structure for X11R6; the source is in .Sy X11SRCDIR . +.It Pa extsrc/ +.Dq Reachover +build structure for externally added programs and libraries; +the source is in +.Sy EXTSRCSRCDIR . .El . .Ss Build tree layout @@ -416,6 +421,15 @@ unless run in .Sq expert mode. . +.It Sy EXTSRCSRCDIR +Directory containing sources of externally added programs +and libraries. +If specified, must be an absolute path. +.DFLT +.Sy NETBSDRCDIR Ns Pa /../extsrc , +if that exists; otherwise +.Pa /usr/extsrc . +. .It Sy MAKECONF The name of the .Xr make 1 @@ -507,6 +521,12 @@ Indicates whether system documentation d will be installed during a build. .DFLTy . +.It Sy MKEXTSRC +.YorN +Indicates whether extsrc is built from +.Sy EXTSRCSRCDIR . +.DFLTn +. .It Sy MKHTML .YorN Indicates whether preformatted HTML manual pages will be built @@ -1943,6 +1963,18 @@ absolute path before being used. Set .Sy MKX11=yes . . +.It Fl Y Ar extsrcdir +Set the value of +.Sy EXTSRCSRCDIR +to +.Ar extsrcdir . +If a relative path is specified, it will be converted to an +absolute path before being used. +. +.It Fl y +Set +.Sy MKEXTSRC=yes . +. .It Fl Z Ar var Unset (zap) the environment variable .Ar var .
CVS commit: src
Module Name:src Committed By: apb Date: Thu Nov 13 08:42:35 UTC 2014 Modified Files: src: BUILDING Log Message: regen from doc/BUILDING.mdoc revision 1.107. This reinstates documentation for extsrc which was lost in 2009. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.114 src/BUILDING:1.115 --- src/BUILDING:1.114 Sat Nov 8 04:23:00 2014 +++ src/BUILDING Thu Nov 13 08:42:35 2014 @@ -80,6 +80,9 @@ FILES x11/ ``Reachover'' build structure for X11R6; the source is in X11SRCDIR. + extsrc/``Reachover'' build structure for externally added +programs and libraries; the source is in EXTSRCSRCDIR. + Build tree layout The NetBSD build tree is described in hier(7), and the release layout is described in release(7). @@ -197,6 +200,13 @@ CONFIGURATION Note: build.sh will provide a default of destdir.MACHINE (in the top-level .OBJDIR) unless run in `expert' mode. + EXTSRCSRCDIR + Directory containing sources of externally added programs and + libraries. If specified, must be an absolute path. + + Default: NETBSDRCDIR/../extsrc, if that exists; otherwise + /usr/extsrc. + MAKECONFThe name of the make(1) configuration file. Only settable in the process environment. @@ -264,6 +274,11 @@ CONFIGURATION Default: ``yes'' + MKEXTSRCCan be set to ``yes'' or ``no''. Indicates whether extsrc is + built from EXTSRCSRCDIR. + + Default: ``no'' + MKHTML Can be set to ``yes'' or ``no''. Indicates whether preformatted HTML manual pages will be built and installed @@ -1022,6 +1037,13 @@ BUILDING -xSet MKX11=yes. + -Y extsrcdir + Set the value of EXTSRCSRCDIR to extsrcdir. If a relative path + is specified, it will be converted to an absolute path before + being used. + + -ySet MKEXTSRC=yes. + -Z varUnset (zap) the environment variable var. This is propagated to the nbmake wrapper.
CVS commit: [netbsd-7] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Thu Nov 13 09:55:45 UTC 2014 Modified Files: src/sys/arch/evbarm/conf [netbsd-7]: std.awin Log Message: Actually do pullup rev 1.2, as requested by skrll in #223 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/evbarm/conf/std.awin 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/evbarm/conf/std.awin diff -u src/sys/arch/evbarm/conf/std.awin:1.1.2.4 src/sys/arch/evbarm/conf/std.awin:1.1.2.5 --- src/sys/arch/evbarm/conf/std.awin:1.1.2.4 Thu Nov 13 07:17:40 2014 +++ src/sys/arch/evbarm/conf/std.awin Thu Nov 13 09:55:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: std.awin,v 1.1.2.4 2014/11/13 07:17:40 martin Exp $ +# $NetBSD: std.awin,v 1.1.2.5 2014/11/13 09:55:45 martin Exp $ # # standard NetBSD/evbarm for Allwinner based options @@ -19,6 +19,7 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS options TPIDRPRW_IS_CURCPU options KERNEL_BASE_EXT=0x8000 options FPU_VFP +options GTTWSI_ALLWINNER options MOTG_ALLWINNER makeoptions KERNEL_BASE_PHYS=0x40007800
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Thu Nov 13 13:44:31 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
`ld -r' needs ${LINKFORMAT}. This fixes the experimental config(1) modular
build for MIPS64 ports.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.179 src/sys/conf/Makefile.kern.inc:1.180
--- src/sys/conf/Makefile.kern.inc:1.179 Fri Nov 7 12:34:14 2014
+++ src/sys/conf/Makefile.kern.inc Thu Nov 13 13:44:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.179 2014/11/07 12:34:14 nakayama Exp $
+# $NetBSD: Makefile.kern.inc,v 1.180 2014/11/13 13:44:31 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -160,8 +160,8 @@ NORMAL_S?= @${_MKSHMSG} compile ${.CUR
# link rules:
LINK_O?= @${_MKSHMSG}link ${.CURDIR:T}/${.TARGET} \
${_MKSHECHO}\
- ${LD} -r -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC} \
- ${LD} -r -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC}
+ ${LD} -r ${LINKFORMAT} -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC} \
+ ${LD} -r ${LINKFORMAT} -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC}
##
## (3) libkern and compat
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Thu Nov 13 15:03:07 UTC 2014
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
src/sys/arch/luna68k/conf: Makefile.luna68k
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Missing dependency on ldscript files.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/shark/conf/Makefile.shark.inc
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/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.27 src/sys/arch/cats/conf/Makefile.cats.inc:1.28
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.27 Sat Aug 17 19:57:09 2013
+++ src/sys/arch/cats/conf/Makefile.cats.inc Thu Nov 13 15:03:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.27 2013/08/17 19:57:09 skrll Exp $
+# $NetBSD: Makefile.cats.inc,v 1.28 2014/11/13 15:03:06 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -20,6 +20,9 @@ SYSTEM_LD_HEAD_EXTRA+=; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) ldscript
+SYSTEM_DEP+= ${ARM}/conf/kern.ldscript.head \
+ $S/conf/mkldscript.sh \
+ ${ARM}/conf/kern.ldscript.tail
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
Index: src/sys/arch/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.24 src/sys/arch/luna68k/conf/Makefile.luna68k:1.25
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.24 Sun Mar 10 07:18:20 2013
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Thu Nov 13 15:03:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.24 2013/03/10 07:18:20 christos Exp $
+# $NetBSD: Makefile.luna68k,v 1.25 2014/11/13 15:03:06 uebayasi Exp $
# Makefile for NetBSD
#
@@ -69,6 +69,9 @@ SYSTEM_LD_HEAD_EXTRA+=; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${LUNA68K}/conf/kern.ldscript.tail ) ldscript
+SYSTEM_DEP+= ${LUNA68K}/conf/kern.ldscript.head \
+ $S/conf/mkldscript.sh \
+ ${LUNA68K}/conf/kern.ldscript.tail
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${ELF2AOUT} $@ $@.aout ; \
Index: src/sys/arch/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.19 src/sys/arch/shark/conf/Makefile.shark.inc:1.20
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.19 Thu Aug 22 20:03:15 2013
+++ src/sys/arch/shark/conf/Makefile.shark.inc Thu Nov 13 15:03:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.shark.inc,v 1.19 2013/08/22 20:03:15 martin Exp $
+# $NetBSD: Makefile.shark.inc,v 1.20 2014/11/13 15:03:07 uebayasi Exp $
CPPFLAGS+= -D${MACHINE}
COPTS+= -fno-unwind-tables
@@ -14,6 +14,9 @@ SYSTEM_LD_HEAD_EXTRA+=; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) ldscript
+SYSTEM_DEP+= ${ARM}/conf/kern.ldscript.head \
+ $S/conf/mkldscript.sh \
+ ${ARM}/conf/kern.ldscript.tail
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Thu Nov 13 15:25:48 UTC 2014
Modified Files:
src/usr.bin/config: TODO
Log Message:
Revise a plan about link-set.
(I was ignorant 2 weeks ago.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/config/TODO
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/config/TODO
diff -u src/usr.bin/config/TODO:1.11 src/usr.bin/config/TODO:1.12
--- src/usr.bin/config/TODO:1.11 Sat Nov 8 05:57:41 2014
+++ src/usr.bin/config/TODO Thu Nov 13 15:25:48 2014
@@ -158,17 +158,21 @@ o Support kernel constructor/destructor
sequence of various subsystem initializations in init_main.c:main() will be
replaced by an array of .kctors invocations, and #ifdef's there will be gone.
-o Replace linkset.
+o Hide link-set in the final kernel.
- Don't allow kernel subsystems create random ELF sections (with potentially
- long names) in the final kernel. To collect some data in statically linked
- modules, creating intermediate sections (e.g. .data.linkset.sysctl) and
- exporting the start/end symbols (e.g. _data_linkset_sysctl_{start,end})
- using linker script should be fine.
-
- Dynamically loaded modules have to register those entries via constructors
- (functions). This means that dynamically loaded modules are flexible but
- come with overhead.
+ Link-set is used to collect references (pointers) at link time. It relys on
+ the ld(1) behavior that it automatically generates `__start_X' and `__stop_X'
+ symbols for the section `X' to reduce coding.
+
+ Don't allow kernel subsystems create random ELF sections.
+
+ Pre-define all the available link-set names and pre-generate a linker script
+ to merge them into .rodata.
+
+ (For modular(9) modules, `link_set_modules' is looked up by kernel loader.
+ Provide only it.)
+
+ Provide a way for 3rd party modules to declare extra link-set.
o Shared kernel objects.
CVS commit: src/usr.sbin/installboot/arch
Module Name:src Committed By: christos Date: Thu Nov 13 16:02:25 UTC 2014 Modified Files: src/usr.sbin/installboot/arch: vax.c Log Message: Use VAX_LABELOFFSET here; It needs to be the machine-specific one. Thanks to gcc-4.8 for discovering the bug and to Atari for having a LABELOFFSET of 516 512 :-) XXX: Perhaps we should put all those constants in sys/bootblock.h instead of spreading them around. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/installboot/arch/vax.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/installboot/arch/vax.c diff -u src/usr.sbin/installboot/arch/vax.c:1.17 src/usr.sbin/installboot/arch/vax.c:1.18 --- src/usr.sbin/installboot/arch/vax.c:1.17 Sun Jun 16 15:05:00 2013 +++ src/usr.sbin/installboot/arch/vax.c Thu Nov 13 11:02:25 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $ */ +/* $NetBSD: vax.c,v 1.18 2014/11/13 16:02:25 christos Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ #include sys/cdefs.h #if !defined(__lint) -__RCSID($NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $); +__RCSID($NetBSD: vax.c,v 1.18 2014/11/13 16:02:25 christos Exp $); #endif /* !__lint */ #include sys/param.h @@ -88,6 +88,8 @@ __RCSID($NetBSD: vax.c,v 1.17 2013/06/1 #include installboot.h +#define VAX_LABELOFFSET 64 + #ifndef __CTASSERT #define __CTASSERT(X) #endif @@ -210,12 +212,12 @@ vax_setboot(ib_params *params) /* * Copy disklabel from old boot block to new. - * Assume everything between LABELOFFSET and the start of + * Assume everything between VAX_LABELOFFSET and the start of * the param block is scratch area and can be copied over. */ - memcpy(bootstrapbuf+LABELOFFSET, - oldbb+LABELOFFSET, - offsetof(struct vax_boot_block,bb_magic1)-LABELOFFSET); + memcpy(bootstrapbuf + VAX_LABELOFFSET, + oldbb + VAX_LABELOFFSET, + offsetof(struct vax_boot_block,bb_magic1) - VAX_LABELOFFSET); /* point to bootblock at begining of bootstrap */ bb = (struct vax_boot_block*)bootstrapbuf;
CVS commit: src/share/man/man7
Module Name:src Committed By: christos Date: Thu Nov 13 16:10:21 UTC 2014 Modified Files: src/share/man/man7: sysctl.7 Log Message: add log_unknown_network To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/share/man/man7/sysctl.7 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/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.85 src/share/man/man7/sysctl.7:1.86 --- src/share/man/man7/sysctl.7:1.85 Sun Aug 3 05:15:21 2014 +++ src/share/man/man7/sysctl.7 Thu Nov 13 11:10:21 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.85 2014/08/03 09:15:21 apb Exp $ +.\ $NetBSD: sysctl.7,v 1.86 2014/11/13 16:10:21 christos Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\ -.Dd August 3, 2014 +.Dd November 13, 2014 .Dt SYSCTL 7 .Os .Sh NAME @@ -1229,6 +1229,7 @@ The currently defined protocols and name .It arp keep integer yes .It arp log_movements integer yes .It arp log_permanent_modify integer yes +.It arp log_unknown_network integer yes .It arp log_wrong_iface integer yes .It arp prune integer yes .It arp refresh integer yes
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Thu Nov 13 16:11:18 UTC 2014
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
Add sysctl to selectively log arp packets from unknown network. (Adrien URBAN).
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/netinet/if_arp.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.159 src/sys/netinet/if_arp.c:1.160
--- src/sys/netinet/if_arp.c:1.159 Fri Sep 5 02:02:11 2014
+++ src/sys/netinet/if_arp.c Thu Nov 13 11:11:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.159 2014/09/05 06:02:11 matt Exp $ */
+/* $NetBSD: if_arp.c,v 1.160 2014/11/13 16:11:18 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_arp.c,v 1.159 2014/09/05 06:02:11 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_arp.c,v 1.160 2014/11/13 16:11:18 christos Exp $);
#include opt_ddb.h
#include opt_inet.h
@@ -194,6 +194,7 @@ static int arp_drainwanted;
static int log_movements = 1;
static int log_permanent_modify = 1;
static int log_wrong_iface = 1;
+static int log_unknown_network = 1;
/*
* this should be elsewhere.
@@ -1305,17 +1306,20 @@ arplookup1(struct mbuf *m, const struct
return (struct llinfo_arp *)rt-rt_llinfo;
if (create) {
- if (rt-rt_flags RTF_GATEWAY)
- why = host is not on local network;
- else if ((rt-rt_flags RTF_LLINFO) == 0) {
+ if (rt-rt_flags RTF_GATEWAY) {
+ if (log_unknown_network)
+why = host is not on local network;
+ } else if ((rt-rt_flags RTF_LLINFO) == 0) {
ARP_STATINC(ARP_STAT_ALLOCFAIL);
why = could not allocate llinfo;
} else
why = gateway route is not ours;
- log(LOG_DEBUG, arplookup: unable to enter address
- for %s@%s on %s (%s)\n,
- in_fmtaddr(*addr), lla_snprintf(ar_sha(ah), ah-ar_hln),
- (ifp) ? ifp-if_xname : null, why);
+ if (why) {
+ log(LOG_DEBUG, arplookup: unable to enter address
+ for %s@%s on %s (%s)\n, in_fmtaddr(*addr),
+ lla_snprintf(ar_sha(ah), ah-ar_hln),
+ (ifp) ? ifp-if_xname : null, why);
+ }
if (rt-rt_refcnt = 0 (rt-rt_flags RTF_CLONED) != 0) {
rtrequest(RTM_DELETE, rt_getkey(rt),
rt-rt_gateway, rt_mask(rt), rt-rt_flags, NULL);
@@ -1704,6 +1708,13 @@ sysctl_net_inet_arp_setup(struct sysctll
interface),
NULL, 0, log_wrong_iface, 0,
CTL_NET,PF_INET, node-sysctl_num, CTL_CREATE, CTL_EOL);
+
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_INT, log_unknown_network,
+ SYSCTL_DESCR(log ARP packets from non-local network),
+ NULL, 0, log_unknown_network, 0,
+ CTL_NET,PF_INET, node-sysctl_num, CTL_CREATE, CTL_EOL);
}
#endif /* INET */
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Thu Nov 13 16:18:38 UTC 2014
Modified Files:
src/distrib/luna68k/instkernel: Makefile
src/etc/etc.luna68k: Makefile.inc
src/sys/arch/luna68k/conf: Makefile.luna68k
Removed Files:
src/sys/arch/luna68k/conf: kern.ldscript.head kern.ldscript.tail
Log Message:
Stop building a.out kernels so that mkldscript.sh is no longer necessary.
Tested build.sh release, and the default ELF GENERIC kernel loaded by
the native bootloader just works on LUNA-II.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/luna68k/instkernel/Makefile
cvs rdiff -u -r1.6 -r1.7 src/etc/etc.luna68k/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.1 -r0 src/sys/arch/luna68k/conf/kern.ldscript.head \
src/sys/arch/luna68k/conf/kern.ldscript.tail
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/luna68k/instkernel/Makefile
diff -u src/distrib/luna68k/instkernel/Makefile:1.1 src/distrib/luna68k/instkernel/Makefile:1.2
--- src/distrib/luna68k/instkernel/Makefile:1.1 Sat Jul 16 15:52:21 2011
+++ src/distrib/luna68k/instkernel/Makefile Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/07/16 15:52:21 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/13 16:18:38 tsutsui Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -9,9 +9,6 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= INSTALL ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
-MDSET_SUFFIXES.-= aout create-aout
-create-aout= ${ELF2AOUT} ${.TARGET:R} ${.TARGET}
-
.include ${DISTRIBDIR}/common/Makefile.mdset
.include bsd.prog.mk
Index: src/etc/etc.luna68k/Makefile.inc
diff -u src/etc/etc.luna68k/Makefile.inc:1.6 src/etc/etc.luna68k/Makefile.inc:1.7
--- src/etc/etc.luna68k/Makefile.inc:1.6 Mon Oct 17 14:42:42 2011
+++ src/etc/etc.luna68k/Makefile.inc Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/10/17 14:42:42 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.7 2014/11/13 16:18:38 tsutsui Exp $
#
# etc.luna68k/Makefile.inc -- luna68k-specific etc Makefile targets
#
@@ -7,7 +7,6 @@
# to update the release documentation in distrib/notes/common/contents
KERNEL_SETS= GENERIC
-KERNEL_SUFFIXES= aout
BUILD_KERNELS= INSTALL
Index: src/sys/arch/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.25 src/sys/arch/luna68k/conf/Makefile.luna68k:1.26
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.25 Thu Nov 13 15:03:06 2014
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Thu Nov 13 16:18:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.25 2014/11/13 15:03:06 uebayasi Exp $
+# $NetBSD: Makefile.luna68k,v 1.26 2014/11/13 16:18:38 tsutsui Exp $
# Makefile for NetBSD
#
@@ -60,23 +60,8 @@ locore.o: ${LUNA68K}/luna68k/locore.s as
##
## (5) link settings
##
-LINKFORMAT= -N -T ldscript
-.if (${OBJECT_FMT} == ELF)
-# Need to convert the kernel from ELF to a.out so that PROM can load it.
-
-SYSTEM_LD_HEAD_EXTRA+=; \
- ( cat ${LUNA68K}/conf/kern.ldscript.head ; \
- OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
- ${SYSTEM_OBJ} ; \
- cat ${LUNA68K}/conf/kern.ldscript.tail ) ldscript
-SYSTEM_DEP+= ${LUNA68K}/conf/kern.ldscript.head \
- $S/conf/mkldscript.sh \
- ${LUNA68K}/conf/kern.ldscript.tail
-
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${ELF2AOUT} $@ $@.aout ; \
- ${ELF2AOUT} $@ $@.aout
-.endif
+LINKFORMAT= -N
+TEXTADDR?= 0xc000
##
## (6) port specific target dependencies
CVS commit: src/sys/modules/i915drmkms
Module Name:src
Committed By: joerg
Date: Thu Nov 13 16:37:39 UTC 2014
Modified Files:
src/sys/modules/i915drmkms: Makefile
Log Message:
Adjust flags to allow building with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/i915drmkms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.6 src/sys/modules/i915drmkms/Makefile:1.7
--- src/sys/modules/i915drmkms/Makefile:1.6 Wed Nov 12 02:15:16 2014
+++ src/sys/modules/i915drmkms/Makefile Thu Nov 13 16:37:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/11/12 02:15:16 christos Exp $
+# $NetBSD: Makefile,v 1.7 2014/11/13 16:37:39 joerg Exp $
.include ../Makefile.inc
.include ../drmkms/Makefile.inc
@@ -70,8 +70,10 @@ SRCS+= i915_pci.c
SRCS+= intel_gtt.c
SRCS+= intelfb.c
-COPTS.i915_drv.c+= -Wno-override-init
-COPTS.intel_display.c+= -Wno-shadow
+COPTS.i915_drv.c+= ${${ACTIVE_CC} == gcc:? -Wno-override-init :}
+COPTS.i915_drv.c+= ${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}
+
+COPTS.intel_display.c+= -Wno-shadow -Wno-conversion
COPTS.intel_panel.c+= -Wno-shadow
COPTS.intel_pm.c+= -Wno-shadow
CVS commit: src/sys/fs/ntfs
Module Name:src
Committed By: hannken
Date: Thu Nov 13 16:49:56 UTC 2014
Modified Files:
src/sys/fs/ntfs: ntfs_inode.h ntfs_subr.c ntfs_subr.h ntfs_vfsops.c
ntfs_vfsops.h ntfs_vnops.c
Log Message:
- Fix ntfs_ntlookupattr() to make the examples from the man page work.
- Fix ntfs_loadntnode() to always read full cluster to prevent buffer
cache inconsistency.
- Change ntfs_vgetex() and ntfs_fget() to take a const attrname and
always pass a possibly empty string.
- Change printf to dprintf.
- Get rid of dead fields i_next, i_prev of struct ntnode.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/fs/ntfs/ntfs_inode.h \
src/sys/fs/ntfs/ntfs_vfsops.h
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/ntfs/ntfs_subr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/fs/ntfs/ntfs_subr.h
cvs rdiff -u -r1.94 -r1.95 src/sys/fs/ntfs/ntfs_vfsops.c
cvs rdiff -u -r1.57 -r1.58 src/sys/fs/ntfs/ntfs_vnops.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/fs/ntfs/ntfs_inode.h
diff -u src/sys/fs/ntfs/ntfs_inode.h:1.7 src/sys/fs/ntfs/ntfs_inode.h:1.8
--- src/sys/fs/ntfs/ntfs_inode.h:1.7 Tue Jan 29 18:21:10 2008
+++ src/sys/fs/ntfs/ntfs_inode.h Thu Nov 13 16:49:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_inode.h,v 1.7 2008/01/29 18:21:10 pooka Exp $ */
+/* $NetBSD: ntfs_inode.h,v 1.8 2014/11/13 16:49:56 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -54,8 +54,6 @@ struct ntnode {
dev_t i_dev; /* Device associated with the inode. */
LIST_ENTRY(ntnode) i_hash;
- struct ntnode *i_next;
- struct ntnode **i_prev;
struct ntfsmount *i_mp;
ino_t i_number;
u_int32_t i_flag;
@@ -76,7 +74,6 @@ struct ntnode {
#define FN_PRELOADED 0x0001
#define FN_VALID 0x0002
-#define FN_AATTRNAME 0x0004 /* space allocated for f_attrname */
struct fnode {
struct genfs_node f_gnode;
Index: src/sys/fs/ntfs/ntfs_vfsops.h
diff -u src/sys/fs/ntfs/ntfs_vfsops.h:1.7 src/sys/fs/ntfs/ntfs_vfsops.h:1.8
--- src/sys/fs/ntfs/ntfs_vfsops.h:1.7 Sat Jun 28 01:34:05 2008
+++ src/sys/fs/ntfs/ntfs_vfsops.h Thu Nov 13 16:49:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vfsops.h,v 1.7 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: ntfs_vfsops.h,v 1.8 2014/11/13 16:49:56 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -38,6 +38,6 @@
/* fnode */
#define VG_EXT 0x0004 /* This is not main record */
-int ntfs_vgetex(struct mount *, ino_t, u_int32_t, char *, u_long, u_long,
+int ntfs_vgetex(struct mount *, ino_t, u_int32_t, const char *, u_long, u_long,
struct vnode **);
int ntfs_calccfree(struct ntfsmount *, cn_t *);
Index: src/sys/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.51 src/sys/fs/ntfs/ntfs_subr.c:1.52
--- src/sys/fs/ntfs/ntfs_subr.c:1.51 Fri Jun 28 17:13:34 2013
+++ src/sys/fs/ntfs/ntfs_subr.c Thu Nov 13 16:49:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.51 2013/06/28 17:13:34 matt Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.52 2014/11/13 16:49:56 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.51 2013/06/28 17:13:34 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.52 2014/11/13 16:49:56 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -235,7 +235,7 @@ ntfs_ntvattrget(
/* this is not a main record, so we can't use just plain
vget() */
error = ntfs_vgetex(ntmp-ntm_mountp, aalp-al_inumber,
-NTFS_A_DATA, NULL, LK_EXCLUSIVE,
+NTFS_A_DATA, , LK_EXCLUSIVE,
VG_EXT, newvp);
if (error) {
printf(%s: CAN'T VGET INO: %d\n, __func__,
@@ -274,7 +274,6 @@ ntfs_loadntnode(
struct ntnode * ip)
{
struct filerec *mfrp;
- daddr_t bn;
int error,off;
struct attr*ap;
struct ntvattr *nvap;
@@ -286,20 +285,28 @@ ntfs_loadntnode(
if (ip-i_number NTFS_SYSNODESNUM) {
struct buf *bp;
+ daddr_t bn;
+ off_t boff;
dprintf((%s: read system node\n, __func__));
- bn = ntfs_cntobn(ntmp-ntm_mftcn) +
- ntmp-ntm_bpmftrec * ip-i_number;
+ /*
+ * Make sure we always read full cluster to
+ * prevent buffer cache inconsistency.
+ */
+ boff = ntfs_cntob(ntmp-ntm_mftcn) +
+ ntfs_bntob(ntmp-ntm_bpmftrec) * ip-i_number;
+ bn = ntfs_cntobn(ntfs_btocn(boff));
+ off = ntfs_btocnoff(boff);
- error = bread(ntmp-ntm_devvp,
- bn, ntfs_bntob(ntmp-ntm_bpmftrec),
+ error = bread(ntmp-ntm_devvp, bn, ntfs_cntob(1),
NOCRED, 0, bp);
if (error) {
printf(%s: BREAD FAILED\n, __func__);
goto out;
}
- memcpy(mfrp, bp-b_data, ntfs_bntob(ntmp-ntm_bpmftrec));
+ memcpy(mfrp, (char *)bp-b_data + off,
+ ntfs_bntob(ntmp-ntm_bpmftrec));
bqrelse(bp);
} else {
struct vnode *vp;
@@ -731,23 +738,21 @@ ntfs_fget(
struct ntfsmount *ntmp,
CVS commit: src/sys/fs/ntfs
Module Name:src
Committed By: hannken
Date: Thu Nov 13 16:51:10 UTC 2014
Modified Files:
src/sys/fs/ntfs: ntfs_subr.c ntfs_subr.h ntfs_vfsops.c ntfs_vfsops.h
Log Message:
- Change ntfs_vgetex() to always load the ntnode and fnode.
- Take the vnode attributes from the NAME attribute.
- Remove now unused ntfs_times() and ntfs_filesize().
- Treat nodes without an unnamed DATA attribute as zero-sized regular files.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/fs/ntfs/ntfs_subr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/fs/ntfs/ntfs_subr.h
cvs rdiff -u -r1.95 -r1.96 src/sys/fs/ntfs/ntfs_vfsops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/fs/ntfs/ntfs_vfsops.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/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.52 src/sys/fs/ntfs/ntfs_subr.c:1.53
--- src/sys/fs/ntfs/ntfs_subr.c:1.52 Thu Nov 13 16:49:56 2014
+++ src/sys/fs/ntfs/ntfs_subr.c Thu Nov 13 16:51:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.52 2014/11/13 16:49:56 hannken Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.53 2014/11/13 16:51:10 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.52 2014/11/13 16:49:56 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.53 2014/11/13 16:51:10 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -232,11 +232,8 @@ ntfs_ntvattrget(
dprintf((%s: attribute in ino: %d\n, __func__,
aalp-al_inumber));
- /* this is not a main record, so we can't use just plain
- vget() */
error = ntfs_vgetex(ntmp-ntm_mountp, aalp-al_inumber,
-NTFS_A_DATA, , LK_EXCLUSIVE,
-VG_EXT, newvp);
+NTFS_A_DATA, , LK_EXCLUSIVE, newvp);
if (error) {
printf(%s: CAN'T VGET INO: %d\n, __func__,
aalp-al_inumber);
@@ -880,9 +877,7 @@ ntfs_ntlookupfile(
u_int32_t aoff;
int attrtype = NTFS_A_DATA;
char *attrname = NULL;
- struct fnode *nfp;
struct vnode *nvp;
- enum vtype f_type;
int fullscan = 0;
struct ntfs_lookup_ctx *lookup_ctx = NULL, *tctx;
@@ -989,11 +984,10 @@ ntfs_ntlookupfile(
goto fail;
}
- /* vget node, but don't load it */
+ /* vget node */
error = ntfs_vgetex(ntmp-ntm_mountp, iep-ie_number,
attrtype, attrname ? attrname : ,
- LK_EXCLUSIVE, VG_DONTLOADIN | VG_DONTVALIDFN,
- nvp);
+ LK_EXCLUSIVE, nvp);
/* free the buffer returned by ntfs_ntlookupattr() */
if (attrname) {
@@ -1004,45 +998,8 @@ ntfs_ntlookupfile(
if (error)
goto fail;
- nfp = VTOF(nvp);
+ KASSERT(VTOF(nvp)-f_flag FN_VALID);
- if (nfp-f_flag FN_VALID) {
-*vpp = nvp;
-goto fail;
- }
-
- nfp-f_fflag = iep-ie_fflag;
- nfp-f_pnumber = iep-ie_fpnumber;
- nfp-f_times = iep-ie_ftimes;
-
- if((nfp-f_fflag NTFS_FFLAG_DIR)
- (nfp-f_attrtype == NTFS_A_DATA)
- strcmp(nfp-f_attrname, ) == 0)
-f_type = VDIR;
- else
-f_type = VREG;
-
- nvp-v_type = f_type;
-
- if ((nfp-f_attrtype == NTFS_A_DATA)
- strcmp(nfp-f_attrname, ) == 0)
- {
-/* Opening default attribute */
-nfp-f_size = iep-ie_fsize;
-nfp-f_allocated = iep-ie_fallocated;
-nfp-f_flag |= FN_PRELOADED;
-uvm_vnp_setsize(nvp, iep-ie_fsize);
- } else {
-error = ntfs_filesize(ntmp, nfp,
- nfp-f_size, nfp-f_allocated);
-if (error) {
- vput(nvp);
- goto fail;
-}
-uvm_vnp_setsize(nvp, nfp-f_size);
- }
-
- nfp-f_flag = ~FN_VALID;
*vpp = nvp;
goto fail;
}
@@ -1337,78 +1294,6 @@ ntfs_nttimetounix(
}
/*
- * Get file times from NTFS_A_NAME attribute.
- */
-int
-ntfs_times(
- struct ntfsmount * ntmp,
- struct ntnode * ip,
- ntfs_times_t * tm)
-{
- struct ntvattr *vap;
- int error;
-
- dprintf((%s: ino: %llu...\n, __func__,
- (unsigned long long)ip-i_number));
-
- error = ntfs_ntget(ip);
- if (error)
- return (error);
-
- error = ntfs_ntvattrget(ntmp, ip, NTFS_A_NAME, NULL, 0, vap);
- if (error) {
- ntfs_ntput(ip);
- return (error);
- }
- *tm = vap-va_a_name-n_times;
- ntfs_ntvattrrele(vap);
- ntfs_ntput(ip);
-
- return (0);
-}
-
-/*
- * Get file sizes from corresponding attribute.
- *
- * ntnode under fnode should be locked.
- */
-int
-ntfs_filesize(
- struct ntfsmount * ntmp,
- struct fnode * fp,
- u_int64_t * size,
- u_int64_t * bytes)
-{
- struct ntvattr *vap;
- struct ntnode *ip = FTONT(fp);
- u_int64_t sz, bn;
- int error;
-
- dprintf((%s: ino: %llu\n, __func__,
- (unsigned long long)ip-i_number));
-
- error = ntfs_ntvattrget(ntmp, ip,
- fp-f_attrtype, fp-f_attrname, 0, vap);
- if (error)
- return (error);
-
- bn = vap-va_allocated;
- sz = vap-va_datalen;
-
- dprintf((%s: %d bytes (%d bytes allocated)\n, __func__,
- (u_int32_t) sz, (u_int32_t) bn));
-
- if (size)
-
CVS commit: src/sys/fs/ntfs
Module Name:src
Committed By: hannken
Date: Thu Nov 13 16:51:53 UTC 2014
Modified Files:
src/sys/fs/ntfs: ntfs.h ntfs_inode.h ntfs_subr.c ntfs_subr.h
ntfs_vfsops.c ntfs_vnops.c
Log Message:
Change ntfs to vcache.
- Use (inumber, attrtype, attrname) as key.
- Inline ntfs_fget() and ntfs_frele() as they only get called once.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/fs/ntfs/ntfs.h
cvs rdiff -u -r1.8 -r1.9 src/sys/fs/ntfs/ntfs_inode.h \
src/sys/fs/ntfs/ntfs_subr.h
cvs rdiff -u -r1.53 -r1.54 src/sys/fs/ntfs/ntfs_subr.c
cvs rdiff -u -r1.96 -r1.97 src/sys/fs/ntfs/ntfs_vfsops.c
cvs rdiff -u -r1.58 -r1.59 src/sys/fs/ntfs/ntfs_vnops.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/fs/ntfs/ntfs.h
diff -u src/sys/fs/ntfs/ntfs.h:1.19 src/sys/fs/ntfs/ntfs.h:1.20
--- src/sys/fs/ntfs/ntfs.h:1.19 Mon May 5 17:11:16 2008
+++ src/sys/fs/ntfs/ntfs.h Thu Nov 13 16:51:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs.h,v 1.19 2008/05/05 17:11:16 ad Exp $ */
+/* $NetBSD: ntfs.h,v 1.20 2014/11/13 16:51:53 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -294,7 +294,6 @@ struct ntfsmount {
#ifdef _KERNEL
MALLOC_DECLARE(M_NTFSMNT);
MALLOC_DECLARE(M_NTFSNTNODE);
-MALLOC_DECLARE(M_NTFSFNODE);
MALLOC_DECLARE(M_NTFSDIR);
MALLOC_DECLARE(M_NTFSNTVATTR);
MALLOC_DECLARE(M_NTFSRDATA);
Index: src/sys/fs/ntfs/ntfs_inode.h
diff -u src/sys/fs/ntfs/ntfs_inode.h:1.8 src/sys/fs/ntfs/ntfs_inode.h:1.9
--- src/sys/fs/ntfs/ntfs_inode.h:1.8 Thu Nov 13 16:49:56 2014
+++ src/sys/fs/ntfs/ntfs_inode.h Thu Nov 13 16:51:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_inode.h,v 1.8 2014/11/13 16:49:56 hannken Exp $ */
+/* $NetBSD: ntfs_inode.h,v 1.9 2014/11/13 16:51:53 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -64,7 +64,6 @@ struct ntnode {
int i_usecount;
int i_busy;
- LIST_HEAD(,fnode) i_fnlist;
LIST_HEAD(,ntvattr) i_valist;
long i_nlink; /* MFR */
@@ -72,15 +71,19 @@ struct ntnode {
u_int32_t i_frflag; /* MFR */
};
-#define FN_PRELOADED 0x0001
-#define FN_VALID 0x0002
+#define NTKEY_SIZE(attrlen) (sizeof(struct ntkey) + (attrlen))
+struct ntkey {
+ ino_t k_ino; /* Inode number of ntnode. */
+ u_int32_t k_attrtype; /* Attribute type. */
+ char k_attrname[1]; /* Attribute name (variable length). */
+} __packed;
+
struct fnode {
struct genfs_node f_gnode;
LIST_ENTRY(fnode) f_fnlist;
struct vnode *f_vp; /* Associatied vnode */
struct ntnode *f_ip; /* Associated ntnode */
- u_long f_flag;
ntfs_times_t f_times; /* $NAME/dirinfo */
ino_t f_pnumber; /* $NAME/dirinfo */
@@ -88,8 +91,11 @@ struct fnode {
u_int64_t f_size; /* defattr/dirinfo: */
u_int64_t f_allocated; /* defattr/dirinfo */
- u_int32_t f_attrtype;
- char *f_attrname;
+ struct ntkey *f_key;
+ struct ntkey f_smallkey;
+#define f_ino f_key-k_ino
+#define f_attrtype f_key-k_attrtype
+#define f_attrname f_key-k_attrname
/* for ntreaddir */
u_int32_t f_lastdattr;
Index: src/sys/fs/ntfs/ntfs_subr.h
diff -u src/sys/fs/ntfs/ntfs_subr.h:1.8 src/sys/fs/ntfs/ntfs_subr.h:1.9
--- src/sys/fs/ntfs/ntfs_subr.h:1.8 Thu Nov 13 16:51:10 2014
+++ src/sys/fs/ntfs/ntfs_subr.h Thu Nov 13 16:51:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.h,v 1.8 2014/11/13 16:51:10 hannken Exp $ */
+/* $NetBSD: ntfs_subr.h,v 1.9 2014/11/13 16:51:53 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -111,9 +111,6 @@ int ntfs_writeattr_plain(struct ntfsmoun
void ntfs_toupper_init(void);
int ntfs_toupper_use(struct mount *, struct ntfsmount *);
void ntfs_toupper_unuse(void);
-int ntfs_fget(struct ntfsmount *, struct ntnode *, int, const char *,
- struct fnode **);
-void ntfs_frele(struct fnode *);
/* ntfs_conv.c stuff */
ntfs_wget_func_t ntfs_utf8_wget;
Index: src/sys/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.53 src/sys/fs/ntfs/ntfs_subr.c:1.54
--- src/sys/fs/ntfs/ntfs_subr.c:1.53 Thu Nov 13 16:51:10 2014
+++ src/sys/fs/ntfs/ntfs_subr.c Thu Nov 13 16:51:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.53 2014/11/13 16:51:10 hannken Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.54 2014/11/13 16:51:53 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.53 2014/11/13 16:51:10 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.54 2014/11/13 16:51:53 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -428,8 +428,6 @@ ntfs_ntlookup(
ip-i_number = ino;
ip-i_mp = ntmp;
- LIST_INIT(ip-i_fnlist);
-
/* init lock and lock the newborn ntnode */
cv_init(ip-i_lock, ntfslk);
mutex_init(ip-i_interlock, MUTEX_DEFAULT, IPL_NONE);
@@ -479,9 +477,6 @@ ntfs_ntput(struct ntnode *ip)
dprintf((%s: deallocating ntnode: %llu\n, __func__,
(unsigned long
CVS commit: src/sys/arch/atari/stand/installboot
Module Name:src
Committed By: christos
Date: Thu Nov 13 17:19:29 UTC 2014
Modified Files:
src/sys/arch/atari/stand/installboot: installboot.c
Log Message:
fix strict aliasing violations
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/atari/stand/installboot/installboot.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/atari/stand/installboot/installboot.c
diff -u src/sys/arch/atari/stand/installboot/installboot.c:1.28 src/sys/arch/atari/stand/installboot/installboot.c:1.29
--- src/sys/arch/atari/stand/installboot/installboot.c:1.28 Mon Mar 31 02:32:31 2014
+++ src/sys/arch/atari/stand/installboot/installboot.c Thu Nov 13 12:19:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.28 2014/03/31 06:32:31 ozaki-r Exp $ */
+/* $NetBSD: installboot.c,v 1.29 2014/11/13 17:19:29 christos Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -467,6 +467,7 @@ mkbootblock(struct bootblock *bb, char *
struct disklabel *label, u_int magic)
{
int fd;
+ uint16_t sum;
memset(bb, 0, sizeof(*bb));
@@ -498,8 +499,10 @@ mkbootblock(struct bootblock *bb, char *
setIDEpar(bb-bb_xxboot, sizeof(bb-bb_xxboot));
/* set AHDI checksum */
- *((u_int16_t *)bb-bb_xxboot + 255) = 0;
- *((u_int16_t *)bb-bb_xxboot + 255) = 0x1234 - abcksum(bb-bb_xxboot);
+ sum = 0;
+ memcpy(bb-bb_xxboot + 255, sum, sizeof(sum));
+ sum = 0x1234 - abcksum(bb-bb_xxboot);
+ memcpy(bb-bb_xxboot + 255, sum, sizeof(sum));
if (verbose) {
printf(Primary boot loader: %s\n, xxb);
CVS commit: src/sys/arch/atari/stand/installboot
Module Name:src
Committed By: christos
Date: Thu Nov 13 17:46:49 UTC 2014
Modified Files:
src/sys/arch/atari/stand/installboot: installboot.c
Log Message:
move to the right offset
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/atari/stand/installboot/installboot.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/atari/stand/installboot/installboot.c
diff -u src/sys/arch/atari/stand/installboot/installboot.c:1.29 src/sys/arch/atari/stand/installboot/installboot.c:1.30
--- src/sys/arch/atari/stand/installboot/installboot.c:1.29 Thu Nov 13 12:19:29 2014
+++ src/sys/arch/atari/stand/installboot/installboot.c Thu Nov 13 12:46:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.29 2014/11/13 17:19:29 christos Exp $ */
+/* $NetBSD: installboot.c,v 1.30 2014/11/13 17:46:49 christos Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -500,9 +500,9 @@ mkbootblock(struct bootblock *bb, char *
/* set AHDI checksum */
sum = 0;
- memcpy(bb-bb_xxboot + 255, sum, sizeof(sum));
+ memcpy(bb-bb_xxboot + 255 * sizeof(sum), sum, sizeof(sum));
sum = 0x1234 - abcksum(bb-bb_xxboot);
- memcpy(bb-bb_xxboot + 255, sum, sizeof(sum));
+ memcpy(bb-bb_xxboot + 255 * sizeof(sum), sum, sizeof(sum));
if (verbose) {
printf(Primary boot loader: %s\n, xxb);
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Thu Nov 13 21:43:27 UTC 2014
Modified Files:
src/lib/libm/src: ldbl_dummy.c
Log Message:
add a couple more dummies (erf, erfc)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/ldbl_dummy.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/libm/src/ldbl_dummy.c
diff -u src/lib/libm/src/ldbl_dummy.c:1.1 src/lib/libm/src/ldbl_dummy.c:1.2
--- src/lib/libm/src/ldbl_dummy.c:1.1 Tue Nov 12 12:36:14 2013
+++ src/lib/libm/src/ldbl_dummy.c Thu Nov 13 16:43:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ldbl_dummy.c,v 1.1 2013/11/12 17:36:14 joerg Exp $ */
+/* $NetBSD: ldbl_dummy.c,v 1.2 2014/11/13 21:43:27 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: ldbl_dummy.c,v 1.1 2013/11/12 17:36:14 joerg Exp $);
+__RCSID($NetBSD: ldbl_dummy.c,v 1.2 2014/11/13 21:43:27 christos Exp $);
#include namespace.h
#include math.h
@@ -58,6 +58,8 @@ __weak_alias(atanl, _atanl)
__weak_alias(acoshl, _acoshl)
__weak_alias(asinhl, _asinhl)
__weak_alias(atanhl, _atanhl)
+__weak_alias(erfl, _erfl)
+__weak_alias(erfcl, _erfcl)
long double
atan2l(long double y, long double x)
@@ -173,3 +175,15 @@ atanhl(long double x)
{
return atanh(x);
}
+
+long double
+erfl(long double x)
+{
+ return erf(x);
+}
+
+long double
+erfcl(long double x)
+{
+ return erfc(x);
+}
CVS commit: src/sys/arch/rs6000/include
Module Name:src Committed By: snj Date: Thu Nov 13 22:29:30 UTC 2014 Modified Files: src/sys/arch/rs6000/include: param.h Log Message: fix tyop To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/param.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/rs6000/include/param.h diff -u src/sys/arch/rs6000/include/param.h:1.2 src/sys/arch/rs6000/include/param.h:1.3 --- src/sys/arch/rs6000/include/param.h:1.2 Mon Jun 20 06:29:54 2011 +++ src/sys/arch/rs6000/include/param.h Thu Nov 13 22:29:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.2 2011/06/20 06:29:54 matt Exp $ */ +/* $NetBSD: param.h,v 1.3 2014/11/13 22:29:30 snj Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -40,6 +40,6 @@ #define KERNBASE 0x10 #define __NO_FIXED_MSGBUF -#endif /* _KENREL !_MODULE */ +#endif /* _KERNEL !_MODULE */ #include powerpc/param.h
CVS commit: src/share/man/man8/man8.macppc
Module Name:src
Committed By: snj
Date: Thu Nov 13 22:32:53 UTC 2014
Modified Files:
src/share/man/man8/man8.macppc: ofwboot.8
Log Message:
adapt to modern ISO image naming conventions
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man8/man8.macppc/ofwboot.8
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/man8/man8.macppc/ofwboot.8
diff -u src/share/man/man8/man8.macppc/ofwboot.8:1.12 src/share/man/man8/man8.macppc/ofwboot.8:1.13
--- src/share/man/man8/man8.macppc/ofwboot.8:1.12 Sat Mar 17 12:25:11 2012
+++ src/share/man/man8/man8.macppc/ofwboot.8 Thu Nov 13 22:32:53 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: ofwboot.8,v 1.12 2012/03/17 12:25:11 wiz Exp $
+.\ $NetBSD: ofwboot.8,v 1.13 2014/11/13 22:32:53 snj Exp $
.\
.\ Copyright (c) 2001 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -256,10 +256,10 @@ GENERIC kernel (the same as
with RAM disk and
.Ic sysinst
included.
-.It macppccd.iso
+.It NetBSD-{RELEASE}-macppc.iso
bootable CDROM image for all supported systems.
Usually located at
-.Pa ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
+.Pa ftp://ftp.NetBSD.org/pub/NetBSD/images/{RELEASE}/NetBSD-{RELEASE}-macppc.iso
.El
.Sh EXAMPLES
.Bl -item
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Fri Nov 14 00:31:54 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_debe.c awin_fb.c awin_hdmi.c
awin_reg.h awin_tcon.c
Log Message:
Add support for interlaced video modes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_debe.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_fb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/allwinner/awin_hdmi.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_tcon.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/allwinner/awin_debe.c
diff -u src/sys/arch/arm/allwinner/awin_debe.c:1.5 src/sys/arch/arm/allwinner/awin_debe.c:1.6
--- src/sys/arch/arm/allwinner/awin_debe.c:1.5 Wed Nov 12 23:12:27 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Fri Nov 14 00:31:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.5 2014/11/12 23:12:27 jmcneill Exp $ */
+/* $NetBSD: awin_debe.c,v 1.6 2014/11/14 00:31:54 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_debe.c,v 1.5 2014/11/12 23:12:27 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_debe.c,v 1.6 2014/11/14 00:31:54 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -221,10 +221,11 @@ static void
awin_debe_setup_fbdev(struct awin_debe_softc *sc, const struct videomode *mode)
{
if (mode sc-sc_fbdev == NULL) {
+ const u_int interlace_p = !!(mode-flags VID_INTERLACE);
struct awinfb_attach_args afb = {
.afb_fb = sc-sc_dmap,
.afb_width = mode-hdisplay,
- .afb_height = mode-vdisplay,
+ .afb_height = (mode-vdisplay interlace_p),
.afb_dmat = sc-sc_dmat,
.afb_dmasegs = sc-sc_dmasegs,
.afb_ndmasegs = 1
@@ -283,13 +284,15 @@ awin_debe_set_videomode(const struct vid
sc = device_private(dev);
if (mode) {
- uint32_t vmem = mode-vdisplay * mode-hdisplay * 4;
+ const u_int interlace_p = !!(mode-flags VID_INTERLACE);
+ const u_int width = mode-hdisplay;
+ const u_int height = (mode-vdisplay interlace_p);
+ uint32_t vmem = width * height * 4;
if (vmem sc-sc_dmasize) {
device_printf(sc-sc_dev,
not enough memory for %ux%u fb (req %u have %u)\n,
- mode-hdisplay, mode-vdisplay,
- vmem, (unsigned int)sc-sc_dmasize);
+ width, height, vmem, (unsigned int)sc-sc_dmasize);
return;
}
@@ -305,10 +308,10 @@ awin_debe_set_videomode(const struct vid
awin_debe_setup_fbdev(sc, mode);
DEBE_WRITE(sc, AWIN_DEBE_DISSIZE_REG,
- ((mode-vdisplay - 1) 16) | (mode-hdisplay - 1));
+ ((height - 1) 16) | (width - 1));
DEBE_WRITE(sc, AWIN_DEBE_LAYSIZE_REG,
- ((mode-vdisplay - 1) 16) | (mode-hdisplay - 1));
- DEBE_WRITE(sc, AWIN_DEBE_LAYLINEWIDTH_REG, mode-hdisplay 5);
+ ((height - 1) 16) | (width - 1));
+ DEBE_WRITE(sc, AWIN_DEBE_LAYLINEWIDTH_REG, (width 5));
DEBE_WRITE(sc, AWIN_DEBE_LAYFB_L32ADD_REG, pa 3);
DEBE_WRITE(sc, AWIN_DEBE_LAYFB_H4ADD_REG, pa 29);
@@ -322,6 +325,11 @@ awin_debe_set_videomode(const struct vid
val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
val |= AWIN_DEBE_MODCTL_LAY0_EN;
+ if (interlace_p) {
+ val |= AWIN_DEBE_MODCTL_ITLMOD_EN;
+ } else {
+ val = ~AWIN_DEBE_MODCTL_ITLMOD_EN;
+ }
DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
} else {
/* disable */
Index: src/sys/arch/arm/allwinner/awin_fb.c
diff -u src/sys/arch/arm/allwinner/awin_fb.c:1.3 src/sys/arch/arm/allwinner/awin_fb.c:1.4
--- src/sys/arch/arm/allwinner/awin_fb.c:1.3 Mon Nov 10 17:55:25 2014
+++ src/sys/arch/arm/allwinner/awin_fb.c Fri Nov 14 00:31:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_fb.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $ */
+/* $NetBSD: awin_fb.c,v 1.4 2014/11/14 00:31:54 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_fb.c,v 1.3 2014/11/10 17:55:25 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_fb.c,v 1.4 2014/11/14 00:31:54 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -189,8 +189,11 @@ awin_fb_set_videomode(device_t dev, cons
if (mode == NULL)
return;
- if (sc-sc_gen.sc_width != mode-hdisplay ||
- sc-sc_gen.sc_height != mode-vdisplay) {
+ const u_int interlace_p = !!(mode-flags VID_INTERLACE);
+ const u_int width = mode-hdisplay;
+ const u_int height = (mode-vdisplay interlace_p);
+
+ if (sc-sc_gen.sc_width != width || sc-sc_gen.sc_height != height) {
device_printf(sc-sc_gen.sc_dev,
mode switching not yet supported\n);
}
Index: src/sys/arch/arm/allwinner/awin_hdmi.c
diff -u src/sys/arch/arm/allwinner/awin_hdmi.c:1.10 src/sys/arch/arm/allwinner/awin_hdmi.c:1.11
--- src/sys/arch/arm/allwinner/awin_hdmi.c:1.10
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Fri Nov 14 01:05:57 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_hdmi.c
Log Message:
disable hdmi and tcon before setting up the display
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/allwinner/awin_hdmi.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/allwinner/awin_hdmi.c
diff -u src/sys/arch/arm/allwinner/awin_hdmi.c:1.11 src/sys/arch/arm/allwinner/awin_hdmi.c:1.12
--- src/sys/arch/arm/allwinner/awin_hdmi.c:1.11 Fri Nov 14 00:31:54 2014
+++ src/sys/arch/arm/allwinner/awin_hdmi.c Fri Nov 14 01:05:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_hdmi.c,v 1.11 2014/11/14 00:31:54 jmcneill Exp $ */
+/* $NetBSD: awin_hdmi.c,v 1.12 2014/11/14 01:05:57 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -32,7 +32,7 @@
#define AWIN_HDMI_PLL 3 /* PLL7 or PLL3 */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_hdmi.c,v 1.11 2014/11/14 00:31:54 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_hdmi.c,v 1.12 2014/11/14 01:05:57 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -494,6 +494,10 @@ awin_hdmi_read_edid(struct awin_hdmi_sof
mode = pick_mode_by_ref(640, 480, 60);
if (mode != NULL) {
+ awin_hdmi_video_enable(sc, false);
+ awin_tcon_enable(false);
+ delay(2);
+
awin_debe_set_videomode(mode);
awin_tcon_set_videomode(mode);
awin_hdmi_set_videomode(sc, mode);
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Fri Nov 14 03:31:41 UTC 2014 Modified Files: src/lib/libm/src: namespace.h Log Message: add erfl erfcl To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libm/src/namespace.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/namespace.h diff -u src/lib/libm/src/namespace.h:1.11 src/lib/libm/src/namespace.h:1.12 --- src/lib/libm/src/namespace.h:1.11 Mon Jun 16 08:54:43 2014 +++ src/lib/libm/src/namespace.h Thu Nov 13 22:31:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.11 2014/06/16 12:54:43 joerg Exp $ */ +/* $NetBSD: namespace.h,v 1.12 2014/11/14 03:31:41 christos Exp $ */ #define atan2 _atan2 #define atan2f _atan2f @@ -69,3 +69,6 @@ #define tanhl _tanhl #define atanhl _atanhl #define log10l _log10l + +#define erfl _erfl +#define erfcl _erfcl
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Fri Nov 14 07:06:40 UTC 2014 Modified Files: src/distrib/notes/common: upgrade Log Message: mention etcupdate and reorder a bit To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/notes/common/upgrade Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/upgrade diff -u src/distrib/notes/common/upgrade:1.28 src/distrib/notes/common/upgrade:1.29 --- src/distrib/notes/common/upgrade:1.28 Sat Apr 25 01:33:12 2009 +++ src/distrib/notes/common/upgrade Fri Nov 14 07:06:40 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: upgrade,v 1.28 2009/04/25 01:33:12 snj Exp $ +.\ $NetBSD: upgrade,v 1.29 2014/11/14 07:06:40 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -97,15 +97,10 @@ Make sure you know whether or not to ins .Pp The upgrade procedure is similar to an installation, but without the hard disk partitioning. -.Ic sysinst -will attempt to merge the settings stored in your -.Pa /etc -directory with the new version of -.Nx . -Also, file systems are checked before unpacking the sets. -Fetching the binary -sets is done in the same manner as the installation procedure; -refer to the installation part of the document for help. +.Pp +Fetching the binary sets is done in the same manner as the installation +procedure; refer to the installation part of the document for help. +File systems are checked before unpacking the sets. .Pp After a new kernel has been copied to your hard disk, your machine is a complete @@ -113,8 +108,7 @@ machine is a complete \*V system. However, that doesn't mean that you're finished with the upgrade process. -You will probably want to update the set of device -nodes you have in +You will probably want to update the set of device nodes you have in .Pa /dev . If you've changed the contents of .Pa /dev @@ -125,9 +119,17 @@ and run the command: .Pp .Dl # Ic sh MAKEDEV all .Pp -Finally, you will want to delete old binaries that were part -of the version of -.Nx -that you upgraded from and have since been removed from the +.Ic sysinst +will attempt to merge the settings stored in your +.Pa /etc +directory with the new version of .Nx -distribution. +using the +.Xr postinstall 8 +utility. +However, +.Xr postinstall 8 +is only able to deal with changes that are easily automated. +It is recommended that you use the +.Xr etcupdate 8 +tool to merge any remaining configuration changes.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Nov 14 07:30:06 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Update ticket #222 To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 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.95 src/doc/CHANGES-7.0:1.1.2.96 --- src/doc/CHANGES-7.0:1.1.2.95 Thu Nov 13 07:27:52 2014 +++ src/doc/CHANGES-7.0 Fri Nov 14 07:30:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.95 2014/11/13 07:27:52 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.96 2014/11/14 07:30:06 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -2405,6 +2405,8 @@ common/lib/libc/atomic/atomic_op_namespa [martin, ticket #218] etc/etc.evbarm/Makefile.inc 1.64 +src/sys/arch/arm/arm32/locore.S 1.37 +src/sys/arch/arm/arm32/bus_dma.c 1.87 sys/arch/evbarm/conf/BPI 1.2,1.4,1.6-1.7,1.9 sys/arch/evbarm/conf/BPI_INSTALL 1.1 sys/arch/evbarm/conf/CUBIEBOARD 1.18-1.30
CVS commit: [netbsd-7] src/sys/arch/arm/arm32
Module Name:src
Committed By: martin
Date: Fri Nov 14 07:29:13 UTC 2014
Modified Files:
src/sys/arch/arm/arm32 [netbsd-7]: bus_dma.c locore.S
Log Message:
Pull up the following revisions, requested by skrll in ticket #222:
src/sys/arch/arm/arm32/locore.S 1.37
src/sys/arch/arm/arm32/bus_dma.c 1.87
Make the initial svcstack is doubleword aligned if EABI.
With PMAP_NEED_ALLOC_POOLPAGE, before using pmap_map_poolpage make sure
the page comes from the same freelist that pmap_map_poolpage uses.
To generate a diff of this commit:
cvs rdiff -u -r1.86.2.1 -r1.86.2.2 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/arm/arm32/locore.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/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.86.2.1 src/sys/arch/arm/arm32/bus_dma.c:1.86.2.2
--- src/sys/arch/arm/arm32/bus_dma.c:1.86.2.1 Mon Nov 10 19:57:26 2014
+++ src/sys/arch/arm/arm32/bus_dma.c Fri Nov 14 07:29:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.86.2.1 2014/11/10 19:57:26 martin Exp $ */
+/* $NetBSD: bus_dma.c,v 1.86.2.2 2014/11/14 07:29:13 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include opt_arm_bus_space.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.86.2.1 2014/11/10 19:57:26 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.86.2.2 2014/11/14 07:29:13 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1307,6 +1307,19 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma
}
}
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+ /*
+ * The page can only be direct mapped if was allocated out
+ * of the arm poolpage vm freelist.
+ */
+ int lcv = vm_physseg_find(atop(pa), NULL);
+ KASSERT(lcv != -1);
+ if (direct_mapable) {
+ direct_mapable =
+ (arm_poolpage_vmfreelist == VM_PHYSMEM_PTR(lcv)-free_list);
+ }
+#endif
+
if (direct_mapable) {
*kvap = (void *)PMAP_MAP_POOLPAGE(pa);
#ifdef DEBUG_DMA
Index: src/sys/arch/arm/arm32/locore.S
diff -u src/sys/arch/arm/arm32/locore.S:1.36 src/sys/arch/arm/arm32/locore.S:1.36.2.1
--- src/sys/arch/arm/arm32/locore.S:1.36 Fri Apr 11 16:34:29 2014
+++ src/sys/arch/arm/arm32/locore.S Fri Nov 14 07:29:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $ */
+/* $NetBSD: locore.S,v 1.36.2.1 2014/11/14 07:29:13 martin Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -40,7 +40,7 @@
/* What size should this really be ? It is only used by init_arm() */
#define INIT_ARM_STACK_SIZE 2048
- RCSID($NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $)
+ RCSID($NetBSD: locore.S,v 1.36.2.1 2014/11/14 07:29:13 martin Exp $)
/*
* This is for kvm_mkdb, and should be the address of the beginning
@@ -115,6 +115,9 @@ ASENTRY_NP(start)
ASEND(start)
.bss
+#ifdef __ARM_EABI__
+ .align 3
+#endif
svcstk:
.space INIT_ARM_STACK_SIZE
