CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Fri Aug 9 06:00:09 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: kobj_machdep.c
Log Message:
Fix addend manipulation
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm32/kobj_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/kobj_machdep.c
diff -u src/sys/arch/arm/arm32/kobj_machdep.c:1.5 src/sys/arch/arm/arm32/kobj_machdep.c:1.6
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.5 Thu Aug 8 06:49:09 2013
+++ src/sys/arch/arm/arm32/kobj_machdep.c Fri Aug 9 06:00:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.5 2013/08/08 06:49:09 matt Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.5 2013/08/08 06:49:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt Exp $);
#define ELFSIZE ARCH_ELFSIZE
@@ -148,7 +148,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
if (addr == 0)
break;
- addend += ((uint32_t *)addr - (uint32_t *)where);
+ addend += (uintptr_t)addr - (uintptr_t)where;
if (addend 3) {
printf (Relocation %x unaligned @ %p\n, addend, where);
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Fri Aug 9 07:11:39 UTC 2013
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
Decode movw/movt
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm/disassem.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/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.20 src/sys/arch/arm/arm/disassem.c:1.21
--- src/sys/arch/arm/arm/disassem.c:1.20 Tue Dec 18 06:31:58 2012
+++ src/sys/arch/arm/arm/disassem.c Fri Aug 9 07:11:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.20 2012/12/18 06:31:58 matt Exp $ */
+/* $NetBSD: disassem.c,v 1.21 2013/08/09 07:11:39 matt Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.20 2012/12/18 06:31:58 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.21 2013/08/09 07:11:39 matt Exp $);
#include sys/systm.h
#include arch/arm/arm/disassem.h
@@ -106,6 +106,7 @@ __KERNEL_RCSID(0, $NetBSD: disassem.c,v
* W - writeback flag
* X - block transfer type
* Y - block transfer type (r13 base)
+ * Z - 16-bit value (movw,movt)
* # - co-processor number
*/
@@ -153,27 +154,29 @@ static const struct arm32_insn arm32_i[]
{ 0x0ff00ff0, 0x01400090, swpb, dmo },
{ 0x0fbf0fff, 0x010f, mrs, dp }, /* Before data processing */
{ 0x0fb0fff0, 0x0120f000, msr, pFm },/* Before data processing */
-{ 0x0fb0f000, 0x0320f000, msr, pF2 },/* Before data processing */
+{ 0x0fe0f000, 0x0320f000, msr, pF2 },/* Before data processing */
{ 0x0ff0, 0x012fff10, bx, m },
{ 0x0fff0ff0, 0x016f0f10, clz, dm },
{ 0x0ff0, 0x012fff30, blx, m },
{ 0xfff000f0, 0xe1200070, bkpt, k },
-{ 0x0de0, 0x, and, Sdn2 },
-{ 0x0de0, 0x0020, eor, Sdn2 },
-{ 0x0de0, 0x0040, sub, Sdn2 },
-{ 0x0de0, 0x0060, rsb, Sdn2 },
-{ 0x0de0, 0x0080, add, Sdn2 },
-{ 0x0de0, 0x00a0, adc, Sdn2 },
-{ 0x0de0, 0x00c0, sbc, Sdn2 },
-{ 0x0de0, 0x00e0, rsc, Sdn2 },
-{ 0x0df0, 0x0110, tst, Dn2 },
-{ 0x0df0, 0x0130, teq, Dn2 },
-{ 0x0de0, 0x0140, cmp, Dn2 },
-{ 0x0de0, 0x0160, cmn, Dn2 },
-{ 0x0de0, 0x0180, orr, Sdn2 },
+{ 0x0fe0, 0x0200, and, Sdn2 },
+{ 0x0fe0, 0x0220, eor, Sdn2 },
+{ 0x0fe0, 0x0240, sub, Sdn2 },
+{ 0x0fe0, 0x0260, rsb, Sdn2 },
+{ 0x0fe0, 0x0280, add, Sdn2 },
+{ 0x0fe0, 0x02a0, adc, Sdn2 },
+{ 0x0fe0, 0x02c0, sbc, Sdn2 },
+{ 0x0fe0, 0x02e0, rsc, Sdn2 },
+{ 0x0ff0, 0x0300, movw, dZ },
+{ 0x0ff0, 0x0310, tst, Dn2 },
+{ 0x0ff0, 0x0330, teq, Dn2 },
+{ 0x0ff0, 0x0340, movt, dZ },
+{ 0x0ff0, 0x0350, cmp, Dn2 },
+{ 0x0ff0, 0x0370, cmn, Dn2 },
+{ 0x0fe0, 0x0380, orr, Sdn2 },
{ 0x0de0, 0x01a0, mov, Sd2 },
-{ 0x0de0, 0x01c0, bic, Sdn2 },
-{ 0x0de0, 0x01e0, mvn, Sd2 },
+{ 0x0fe0, 0x03c0, bic, Sdn2 },
+{ 0x0fe0, 0x03e0, mvn, Sd2 },
{ 0x0ff08f10, 0x0e000100, adf, PRfgh },
{ 0x0ff08f10, 0x0e100100, muf, PRfgh },
{ 0x0ff08f10, 0x0e200100, suf, PRfgh },
@@ -468,6 +471,11 @@ disasm(const disasm_interface_t *di, vad
case 'Y':
di-di_printf(%s, insn_stkblktrans(insn));
break;
+ /* Z - print movw/movt argument */
+ case 'Z':
+ di-di_printf(, #0x%04x,
+ ((insn 0xf) 4) | (insn 0xfff));
+ break;
/* c - comment field bits(0-23) */
case 'c':
di-di_printf(0x%08x, (insn 0x00ff));
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Fri Aug 9 07:12:42 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: kobj_machdep.c
Log Message:
Use cpu_idcache_wbinv_range so we don't nuke the entire idcache.
Add a test to make sure we are only modifying movw/movt
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/kobj_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/kobj_machdep.c
diff -u src/sys/arch/arm/arm32/kobj_machdep.c:1.6 src/sys/arch/arm/arm32/kobj_machdep.c:1.7
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.6 Fri Aug 9 06:00:09 2013
+++ src/sys/arch/arm/arm32/kobj_machdep.c Fri Aug 9 07:12:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.7 2013/08/09 07:12:42 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.6 2013/08/09 06:00:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kobj_machdep.c,v 1.7 2013/08/09 07:12:42 matt Exp $);
#define ELFSIZE ARCH_ELFSIZE
@@ -120,6 +120,8 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
case R_ARM_MOVW_ABS_NC:
case R_ARM_MOVT_ABS:
+ if ((*where 0x0fb0) != 0x0300)
+ break;
addr = kobj_sym_lookup(ko, symidx);
if (addr == 0)
break;
@@ -178,7 +180,7 @@ kobj_machdep(kobj_t ko, void *base, size
if (load) {
#ifndef _RUMPKERNEL
- cpu_idcache_wbinv_all();
+ cpu_idcache_wbinv_range((vaddr_t)base, size);
cpu_tlb_flushID();
#endif
}
CVS commit: src/sys/conf
Module Name:src
Committed By: skrll
Date: Fri Aug 9 09:08:47 UTC 2013
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Fix debug kernel builds when the automatic symbol table resizing kicks in.
Previously, the TAIL/HEAD link steps were being executed twice and the
(relinked/stripped) kernel would overwrite the debug version.
XXX this is all ugly.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 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.160 src/sys/conf/Makefile.kern.inc:1.161
--- src/sys/conf/Makefile.kern.inc:1.160 Wed Jul 17 14:05:43 2013
+++ src/sys/conf/Makefile.kern.inc Fri Aug 9 09:08:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.160 2013/07/17 14:05:43 matt Exp $
+# $NetBSD: Makefile.kern.inc,v 1.161 2013/08/09 09:08:47 skrll Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -262,15 +262,6 @@ SYSTEM_LD_TAIL_DBSYM?= \
fi
.endif
-.if defined(_SYMTAB_SPACE_ADJUSTED)
-SYSTEM_LD_TAIL?=true
-.else
-SYSTEM_LD_TAIL?=@${SYSTEM_LD_TAIL_DBSYM} ; \
- ${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \
- ${SIZE} $@; chmod 755 $@; \
- ${SYSTEM_CTFMERGE}
-.endif
-
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext /}
LINKDATA?= ${DATAADDR:C/.+/-Tdata /}
@@ -280,10 +271,24 @@ LINKFLAGS?= ${LINKFORMAT} ${LINKTEXT} ${
${EXTRA_LINKFLAGS}
LINKFLAGS_DEBUG?= -X
+
+#
+# If we're relinking due to _SYMTAB_SPACE_ADJUSTED then don't perform
+# SYSTEM_LD_TAIL{,_DEBUG}. They'll be done in the parent invocation.
+#
+.if defined(_SYMTAB_SPACE_ADJUSTED)
+SYSTEM_LD_TAIL?=true
+SYSTEM_LD_TAIL_DEBUG?=true
+.else
+SYSTEM_LD_TAIL?=@${SYSTEM_LD_TAIL_DBSYM} ; \
+ ${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \
+ ${SIZE} $@; chmod 755 $@; \
+ ${SYSTEM_CTFMERGE}
SYSTEM_LD_TAIL_DEBUG?=; \
echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
+.endif
LINKFLAGS_NORMAL?= -S
STRIPFLAGS?= -g
@@ -304,16 +309,20 @@ SYSTEM_LD_TAIL+=; \
LINKFLAGS+= ${LINKFLAGS_NORMAL}
.endif
+#
+# More steps to skip if we're relinking due to _SYMTAB_SPACE_ADJUSTED (see
+# above)
+#
.if !defined(_SYMTAB_SPACE_ADJUSTED)
SYSTEM_LD_TAIL+=; \
if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h /dev/null; then \
echo ${DBSYM} $@; \
${DBSYM} $@ || (rm -f $@ ; exit 1) || exit 1; \
fi
-.endif
SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_EXTRA}
+.endif
##
## (6) port independent targets and dependencies: assym.h, vers.o
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: reinoud
Date: Fri Aug 9 11:29:44 UTC 2013
Modified Files:
src/usr.sbin/makefs: udf.c
Log Message:
Oops, used size_t when off_t was meant. This results in the 4G file size
modulation seen on 32 bit machines due to size_t being 32 bit there.
While here, also fix compilation errors he@ discovered while compiling on
NetBSD/vax.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makefs/udf.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/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.10 src/usr.sbin/makefs/udf.c:1.11
--- src/usr.sbin/makefs/udf.c:1.10 Tue Aug 6 13:15:30 2013
+++ src/usr.sbin/makefs/udf.c Fri Aug 9 11:29:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.11 2013/08/09 11:29:44 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $);
+__RCSID($NetBSD: udf.c,v 1.11 2013/08/09 11:29:44 reinoud Exp $);
#include stdio.h
#include stdlib.h
@@ -549,7 +549,7 @@ udf_prepare_fids(struct long_ad *dir_icb
}
static int
-udf_file_inject_blob(union dscrptr *dscr, uint8_t *blob, size_t size)
+udf_file_inject_blob(union dscrptr *dscr, uint8_t *blob, off_t size)
{
struct icb_tag *icb;
struct file_entry *fe;
@@ -646,9 +646,11 @@ udf_append_file_mapping(union dscrptr *d
const int use_shorts = (context.data_part == context.metadata_part);
uint64_t max_len = UDF_ROUNDDOWN(UDF_EXT_MAXLEN, sector_size);
+ fe = NULL;
+ efe = NULL;
if (udf_rw16(dscr-tag.id) == TAGID_FENTRY) {
fe = dscr-fe;
- data=fe-data;
+ data= fe-data;
l_ea= fe-l_ea;
l_ad= udf_rw32(fe-l_ad);
icb = fe-icbtag;
@@ -678,6 +680,9 @@ udf_append_file_mapping(union dscrptr *d
last_len = 0;
last_lb_num = 0;
last_part_num = 0;
+ last_flags= 0;
+ last_short= NULL;
+ last_long = NULL;
if (l_ad != 0) {
if (use_shorts) {
assert(cur_alloc == UDF_ICB_SHORT_ALLOC);
@@ -764,7 +769,7 @@ udf_append_file_mapping(union dscrptr *d
static int
udf_append_file_contents(union dscrptr *dscr, struct long_ad *data_icb,
- uint8_t *fdata, size_t flen)
+ uint8_t *fdata, off_t flen)
{
struct long_ad icb;
uint32_t location;
@@ -954,7 +959,7 @@ udf_copy_file(struct stat *st, char *pat
union dscrptr *dscr;
struct long_ad data_icb;
fsinode *fnode;
- size_t sz, chunk, rd;
+ off_t sz, chunk, rd;
uint8_t *data;
int nblk;
int i, f;
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Fri Aug 9 11:40:08 UTC 2013 Added Files: src/share/man/man4/man4.amiga: xsh.4 Log Message: Add man page for xsh(4). To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.amiga/xsh.4 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/man4/man4.amiga/xsh.4 diff -u /dev/null src/share/man/man4/man4.amiga/xsh.4:1.1 --- /dev/null Fri Aug 9 11:40:08 2013 +++ src/share/man/man4/man4.amiga/xsh.4 Fri Aug 9 11:40:08 2013 @@ -0,0 +1,66 @@ +.\ $NetBSD: xsh.4,v 1.1 2013/08/09 11:40:08 rkujawa Exp $ +.\ +.\ Copyright (c) 2013 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Radoslaw Kujawa. +.\ +.\ 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 August 9, 2013 +.Dt XSH 4 amiga +.Os +.Sh NAME +.Nm xsh +.Nd Individual Computers X-Surf 100 driver +.Sh SYNOPSIS +.Cd xsh* at zbus0 +.Cd ne* at xsurfbus? +.Sh DESCRIPTION +The +.Nm +driver provides support for ethernet interface present on the Individual +Computers X-Surf 100 card. +.Sh HARDWARE +The +.Nm +driver supports the following hardware: +.Bl -tag -offset indent +.It Individual Computers X-Surf 100 +.El +.Sh SEE ALSO +.Xr ne 4 +.Sh HISTORY +The +.Nm +device first appeared in +.Nx 7.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Radoslaw Kujawa +.Aq radoslaw.kuj...@gmail.com . +.Sh CAVEATS +The planned USB module is not supported (yet).
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: rkujawa Date: Fri Aug 9 11:41:24 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add xsh(4) man page to dist list. To generate a diff of this commit: cvs rdiff -u -r1.1433 -r1.1434 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1433 src/distrib/sets/lists/man/mi:1.1434 --- src/distrib/sets/lists/man/mi:1.1433 Tue Aug 6 22:33:59 2013 +++ src/distrib/sets/lists/man/mi Fri Aug 9 11:41:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1433 2013/08/06 22:33:59 soren Exp $ +# $NetBSD: mi,v 1.1434 2013/08/09 11:41:24 rkujawa Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -792,6 +792,7 @@ ./usr/share/man/cat4/amiga/qn.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/ser.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/wesc.0 man-sys-catman .cat +./usr/share/man/cat4/amiga/xsh.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/xsurf.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/z3rambd.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/zssc.0 man-sys-catman .cat @@ -3806,6 +3807,7 @@ ./usr/share/man/html4/amiga/qn.html man-sys-htmlman html ./usr/share/man/html4/amiga/ser.html man-sys-htmlman html ./usr/share/man/html4/amiga/wesc.html man-sys-htmlman html +./usr/share/man/html4/amiga/xsh.html man-sys-htmlman html ./usr/share/man/html4/amiga/xsurf.html man-sys-htmlman html ./usr/share/man/html4/amiga/z3rambd.html man-sys-htmlman html ./usr/share/man/html4/amiga/zssc.html man-sys-htmlman html @@ -6514,6 +6516,7 @@ ./usr/share/man/man4/amiga/qn.4 man-sys-man .man ./usr/share/man/man4/amiga/ser.4 man-sys-man .man ./usr/share/man/man4/amiga/wesc.4 man-sys-man .man +./usr/share/man/man4/amiga/xsh.4 man-sys-man .man ./usr/share/man/man4/amiga/xsurf.4 man-sys-man .man ./usr/share/man/man4/amiga/z3rambd.4 man-sys-man .man ./usr/share/man/man4/amiga/zssc.4 man-sys-man .man
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: rkujawa
Date: Fri Aug 9 12:56:31 UTC 2013
Modified Files:
src/sys/arch/amiga/dev: xsh.c
Log Message:
Fix style.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/xsh.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/amiga/dev/xsh.c
diff -u src/sys/arch/amiga/dev/xsh.c:1.1 src/sys/arch/amiga/dev/xsh.c:1.2
--- src/sys/arch/amiga/dev/xsh.c:1.1 Thu Aug 8 21:23:52 2013
+++ src/sys/arch/amiga/dev/xsh.c Fri Aug 9 12:56:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xsh.c,v 1.1 2013/08/08 21:23:52 rkujawa Exp $ */
+/* $NetBSD: xsh.c,v 1.2 2013/08/09 12:56:31 rkujawa Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xsh.c,v 1.1 2013/08/08 21:23:52 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: xsh.c,v 1.2 2013/08/09 12:56:31 rkujawa Exp $);
/*
* X-Surf 100 driver.
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, $NetBSD: xsh.c,v 1.1
int xsh_match(device_t, cfdata_t , void *);
void xsh_attach(device_t, device_t, void *);
-static int xsh_print(void *aux, const char *w);
+static int xsh_print(void *, const char *);
struct xsh_softc {
device_t sc_dev;
@@ -67,10 +67,9 @@ xsh_match(device_t parent, cfdata_t cf,
{
struct zbus_args *zap = aux;
- /* X-surf ethernet card */
- if (zap-manid == 4626 zap-prodid == 100) {
- return (1);
- }
+ /* X-surf 100 ethernet card */
+ if (zap-manid == 4626 zap-prodid == 100)
+ return (1);
return (0);
}
CVS commit: src
Module Name:src
Committed By: reinoud
Date: Fri Aug 9 15:11:08 UTC 2013
Modified Files:
src/sbin/newfs_udf: newfs_udf.c newfs_udf.h udf_create.h
src/usr.sbin/makefs: udf.c
Log Message:
Fix possible 32 bit issues. In practice hard to reach but better be safe than
sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sbin/newfs_udf/newfs_udf.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/newfs_udf/newfs_udf.h
cvs rdiff -u -r1.6 -r1.7 src/sbin/newfs_udf/udf_create.h
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makefs/udf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_udf/newfs_udf.c
diff -u src/sbin/newfs_udf/newfs_udf.c:1.17 src/sbin/newfs_udf/newfs_udf.c:1.18
--- src/sbin/newfs_udf/newfs_udf.c:1.17 Tue Aug 6 13:15:30 2013
+++ src/sbin/newfs_udf/newfs_udf.c Fri Aug 9 15:11:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_udf.c,v 1.17 2013/08/06 13:15:30 reinoud Exp $ */
+/* $NetBSD: newfs_udf.c,v 1.18 2013/08/09 15:11:08 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -75,7 +75,7 @@ static void usage(void) __attribute__((_
/* queue for temporary storage of sectors to be written out */
struct wrsect {
- uint32_t sectornr;
+ uint64_t sectornr;
uint8_t *sector_data;
TAILQ_ENTRY(wrsect) next;
};
@@ -108,7 +108,7 @@ float meta_fract = (float) UDF_META_PER
*/
int
-udf_write_sector(void *sector, uint32_t location)
+udf_write_sector(void *sector, uint64_t location)
{
struct wrsect *pos, *seekpos;
@@ -155,8 +155,8 @@ writeout_write_queue(void)
{
struct wrsect *pos;
uint64_t offset;
- uint32_t line_len, line_offset;
- uint32_t line_start, new_line_start, relpos;
+ uint64_t line_start, new_line_start;
+ uint32_t line_len, line_offset, relpos;
uint32_t blockingnr;
uint8_t *linebuf, *adr;
Index: src/sbin/newfs_udf/newfs_udf.h
diff -u src/sbin/newfs_udf/newfs_udf.h:1.4 src/sbin/newfs_udf/newfs_udf.h:1.5
--- src/sbin/newfs_udf/newfs_udf.h:1.4 Tue Aug 6 13:15:30 2013
+++ src/sbin/newfs_udf/newfs_udf.h Fri Aug 9 15:11:08 2013
@@ -57,7 +57,7 @@ struct udf_create_context context;
struct udf_disclayout layout;
/* prototypes */
-int udf_write_sector(void *sector, uint32_t location);
+int udf_write_sector(void *sector, uint64_t location);
int udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti);
/* tmp */
Index: src/sbin/newfs_udf/udf_create.h
diff -u src/sbin/newfs_udf/udf_create.h:1.6 src/sbin/newfs_udf/udf_create.h:1.7
--- src/sbin/newfs_udf/udf_create.h:1.6 Tue Aug 6 12:49:13 2013
+++ src/sbin/newfs_udf/udf_create.h Fri Aug 9 15:11:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.h,v 1.6 2013/08/06 12:49:13 reinoud Exp $ */
+/* $NetBSD: udf_create.h,v 1.7 2013/08/09 15:11:08 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -83,10 +83,10 @@
/* handys */
#define UDF_ROUNDUP(val, gran) \
- ((gran) * (((uint64_t)(val) + (gran)-1) / (gran)))
+ ((uint64_t) (gran) * (((uint64_t)(val) + (gran)-1) / (gran)))
#define UDF_ROUNDDOWN(val, gran) \
- ((gran) * (((uint64_t)(val)) / (gran)))
+ ((uint64_t) (gran) * (((uint64_t)(val)) / (gran)))
/* disc offsets for various structures and their sizes */
@@ -182,7 +182,7 @@ struct udf_create_context {
/* logical to physical translations */
int vtop[UDF_PMAPS+1]; /* vpartnr trans */
int vtop_tp[UDF_PMAPS+1]; /* type of trans */
- int vtop_offset[UDF_PMAPS+1]; /* offset in lb */
+ uint64_t vtop_offset[UDF_PMAPS+1]; /* offset in lb */
/* sparable */
struct udf_sparing_table*sparing_table; /* replacements */
Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.11 src/usr.sbin/makefs/udf.c:1.12
--- src/usr.sbin/makefs/udf.c:1.11 Fri Aug 9 11:29:44 2013
+++ src/usr.sbin/makefs/udf.c Fri Aug 9 15:11:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.11 2013/08/09 11:29:44 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.12 2013/08/09 15:11:08 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: udf.c,v 1.11 2013/08/09 11:29:44 reinoud Exp $);
+__RCSID($NetBSD: udf.c,v 1.12 2013/08/09 15:11:08 reinoud Exp $);
#include stdio.h
#include stdlib.h
@@ -90,7 +90,7 @@ int req_enable, req_disable;
/* - */
int
-udf_write_sector(void *sector, uint32_t location)
+udf_write_sector(void *sector, uint64_t location)
{
uint64_t wpos;
ssize_t ret;
@@ -635,8 +635,8 @@ udf_append_file_mapping(union dscrptr *d
uint64_t inf_len, obj_size, logblks_rec;
uint32_t l_ea, l_ad, size;
uint32_t last_lb_num, piece_lb_num;
- uint32_t last_len, piece_len, last_flags;
- uint32_t rest_len, merge_len, last_end;
+ uint64_t last_len, piece_len, last_flags;
+ uint64_t rest_len, merge_len, last_end;
uint16_t last_part_num, piece_part_num;
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: pgoyette Date: Fri Aug 9 15:35:54 UTC 2013 Modified Files: src/share/man/man4/man4.amiga: Makefile Log Message: Make the xsh man pages to unbreak the build (sets lists were updated to expect these man pages, but they were not being built) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/man4.amiga/Makefile 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/man4/man4.amiga/Makefile diff -u src/share/man/man4/man4.amiga/Makefile:1.28 src/share/man/man4/man4.amiga/Makefile:1.29 --- src/share/man/man4/man4.amiga/Makefile:1.28 Tue Jan 29 21:31:18 2013 +++ src/share/man/man4/man4.amiga/Makefile Fri Aug 9 15:35:54 2013 @@ -1,11 +1,11 @@ # from: @(#)Makefile 8.2 (Berkeley) 2/16/94 -# $NetBSD: Makefile,v 1.28 2013/01/29 21:31:18 rkujawa Exp $ +# $NetBSD: Makefile,v 1.29 2013/08/09 15:35:54 pgoyette Exp $ MAN= a1k2cp.4 afsc.4 ahsc.4 amidisplaycc.4 atzsc.4 autoconf.4 console.4 \ bah.4 bppcsc.4 clockport.4 cv3dpb.4 ed.4 efa.4 em4k.4 empb.4 es.4 fdc.4 grf.4 \ grfcl.4 grfcv.4 grfcv3d.4 grfet.4 grfrh.4 grfrt.4 grful.4 \ gtsc.4 intro.4 ite.4 mem.4 mfcs.4 mgnsc.4 mppb.4 p5membar.4 p5pb.4 \ - qn.4 ser.4 wesc.4 xsurf.4 z3rambd.4 zssc.4 + qn.4 ser.4 wesc.4 xsh.4 xsurf.4 z3rambd.4 zssc.4 MLINKS= mem.4 kmem.4 MANSUBDIR=/amiga
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: kardel
Date: Fri Aug 9 19:51:29 UTC 2013
Modified Files:
src/sys/dev/pci: mpii.c
Log Message:
fix issues when reading variable block sized tapes.
symptoms:
generic HBA error on console when reading
with a larger blocksize. blocks read
are padded to requested block size with
a 5a... a5... pattern.
problems fixed:
- controller scsi_status values did not match
the ones used by the spsipi layer.
a mapping function was introduced.
- when experiencing an underrun (read 64k and
get a 63k block) the controller posted
not a SUCCESS status but CHECK status. handle
that like SUCCESS adjusting xs-resid and set
XS_SENSE.
now the correct data amount is returned and
nothing is 'added' and no 'generic HBA error'
occurs.
- make decisions using variables and constants
from the controller domain.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/mpii.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/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.2 src/sys/dev/pci/mpii.c:1.3
--- src/sys/dev/pci/mpii.c:1.2 Thu Aug 8 07:06:13 2013
+++ src/sys/dev/pci/mpii.c Fri Aug 9 19:51:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.2 2013/08/08 07:06:13 kardel Exp $ */
+/* $NetBSD: mpii.c,v 1.3 2013/08/09 19:51:29 kardel Exp $ */
/* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */
/*
* Copyright (c) 2010 Mike Belopuhov m...@crypt.org.ru
@@ -20,7 +20,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpii.c,v 1.2 2013/08/08 07:06:13 kardel Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpii.c,v 1.3 2013/08/09 19:51:29 kardel Exp $);
#include bio.h
@@ -790,18 +790,18 @@ struct mpii_msg_scsi_io_error {
u_int16_t reserved3;
u_int8_t scsi_status;
- /* XXX JPG validate this */
-#if notyet
-#define MPII_SCSIIO_ERR_STATUS_SUCCESS
-#define MPII_SCSIIO_ERR_STATUS_CHECK_COND
-#define MPII_SCSIIO_ERR_STATUS_BUSY
-#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE
-#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET
-#define MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT
-#define MPII_SCSIIO_ERR_STATUS_CMD_TERM
-#define MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL
-#define MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE
-#endif
+
+#define MPII_SCSIIO_ERR_STATUS_SUCCESS (0x00)
+#define MPII_SCSIIO_ERR_STATUS_CHECK_COND (0x02)
+#define MPII_SCSIIO_ERR_STATUS_BUSY (0x04)
+#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE (0x08)
+#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET (0x10)
+#define MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT (0x14)
+#define MPII_SCSIIO_ERR_STATUS_CMD_TERM (0x22)
+#define MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL (0x28)
+#define MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE (0x30)
+#define MPII_SCSIIO_ERR_STATUS_TASK_ABORTED (0x40)
+
u_int8_t scsi_state;
#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_VALID (10)
#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_FAILED (11)
@@ -4682,6 +4682,58 @@ mpii_scsi_cmd_tmo_done(struct mpii_ccb *
mpii_put_ccb(tccb-ccb_sc, tccb);
}
+static u_int8_t
+map_scsi_status(u_int8_t mpii_scsi_status)
+{
+ u_int8_t scsi_status;
+
+ switch (mpii_scsi_status)
+ {
+ case MPII_SCSIIO_ERR_STATUS_SUCCESS:
+ scsi_status = SCSI_OK;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_CHECK_COND:
+ scsi_status = SCSI_CHECK;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_BUSY:
+ scsi_status = SCSI_BUSY;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_INTERMEDIATE:
+ scsi_status = SCSI_INTERM;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET:
+ scsi_status = SCSI_INTERM;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT:
+ scsi_status = SCSI_RESV_CONFLICT;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_CMD_TERM:
+ case MPII_SCSIIO_ERR_STATUS_TASK_ABORTED:
+ scsi_status = SCSI_TERMINATED;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL:
+ scsi_status = SCSI_QUEUE_FULL;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE:
+ scsi_status = SCSI_ACA_ACTIVE;
+ break;
+
+ default:
+ /* XXX: for the lack of anything better and other than OK */
+ scsi_status = 0xFF;
+ break;
+ }
+
+ return scsi_status;
+}
static void
mpii_scsi_cmd_done(struct mpii_ccb *ccb)
@@ -4745,31 +4797,43 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
DNPRINTF(MPII_D_CMD, %s: bidirectional_transfer_count: 0x%08x\n,
DEVNAME(sc), le32toh(sie-bidirectional_transfer_count));
- xs-status = sie-scsi_status;
+ xs-status = map_scsi_status(sie-scsi_status);
+
switch (le16toh(sie-ioc_status) MPII_IOCSTATUS_MASK) {
case MPII_IOCSTATUS_SCSI_DATA_UNDERRUN:
- switch (xs-status) {
- case SCSI_OK:
+ switch (sie-scsi_status) {
+ case MPII_SCSIIO_ERR_STATUS_CHECK_COND:
+ xs-error = XS_SENSE;
+ /*FALLTHROUGH*/
+ case MPII_SCSIIO_ERR_STATUS_SUCCESS:
xs-resid = xs-datalen -
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: kardel
Date: Fri Aug 9 19:58:44 UTC 2013
Modified Files:
src/sys/dev/scsipi: ch.c
Log Message:
bump command timeout to 5 minutes. several
types of changers (Overland PowerLoader, Dell
PowerVault) have been exceeding the 100 sec
limit aborting a perfectly (slowly) progressing
operation.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/scsipi/ch.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/ch.c
diff -u src/sys/dev/scsipi/ch.c:1.87 src/sys/dev/scsipi/ch.c:1.88
--- src/sys/dev/scsipi/ch.c:1.87 Sat Oct 27 17:18:38 2012
+++ src/sys/dev/scsipi/ch.c Fri Aug 9 19:58:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.87 2012/10/27 17:18:38 chs Exp $ */
+/* $NetBSD: ch.c,v 1.88 2013/08/09 19:58:44 kardel Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ch.c,v 1.87 2012/10/27 17:18:38 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: ch.c,v 1.88 2013/08/09 19:58:44 kardel Exp $);
#include sys/param.h
#include sys/systm.h
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, $NetBSD: ch.c,v 1.87
#include dev/scsipi/scsiconf.h
#define CHRETRIES 2
+#define CHTIMEOUT (5 * 60 * 1000)
+
#define CHUNIT(x) (minor((x)))
struct ch_softc {
@@ -612,7 +614,7 @@ ch_move(struct ch_softc *sc, struct chan
* Send command to changer.
*/
return (scsipi_command(sc-sc_periph, (void *)cmd, sizeof(cmd), 0, 0,
- CHRETRIES, 10, NULL, 0));
+ CHRETRIES, CHTIMEOUT, NULL, 0));
}
static int
@@ -666,7 +668,7 @@ ch_exchange(struct ch_softc *sc, struct
* Send command to changer.
*/
return (scsipi_command(sc-sc_periph, (void *)cmd, sizeof(cmd), 0, 0,
- CHRETRIES, 10, NULL, 0));
+ CHRETRIES, CHTIMEOUT, NULL, 0));
}
static int
@@ -702,7 +704,7 @@ ch_position(struct ch_softc *sc, struct
* Send command to changer.
*/
return (scsipi_command(sc-sc_periph, (void *)cmd, sizeof(cmd), 0, 0,
- CHRETRIES, 10, NULL, 0));
+ CHRETRIES, CHTIMEOUT, NULL, 0));
}
/*
@@ -1041,7 +1043,7 @@ ch_getelemstatus(struct ch_softc *sc, in
*/
return (scsipi_command(sc-sc_periph, (void *)cmd, sizeof(cmd),
(void *)data, datalen,
- CHRETRIES, 10, NULL, scsiflags | XS_CTL_DATA_IN));
+ CHRETRIES, CHTIMEOUT, NULL, scsiflags | XS_CTL_DATA_IN));
}
static int
@@ -1105,7 +1107,7 @@ ch_setvoltag(struct ch_softc *sc, struct
* Send command to changer.
*/
return (scsipi_command(sc-sc_periph, (void *)cmd, sizeof(cmd),
- (void *)data, datalen, CHRETRIES, 10, NULL,
+ (void *)data, datalen, CHRETRIES, CHTIMEOUT, NULL,
datalen ? XS_CTL_DATA_OUT : 0));
}
CVS commit: src/tools/compat
Module Name:src Committed By: jmcneill Date: Fri Aug 9 20:12:38 UTC 2013 Modified Files: src/tools/compat: configure.ac Log Message: makefs_udf uses clock_gettime, and on some versions of linux that lives in librt To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/tools/compat/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.78 src/tools/compat/configure.ac:1.79 --- src/tools/compat/configure.ac:1.78 Tue Aug 6 21:50:19 2013 +++ src/tools/compat/configure.ac Fri Aug 9 20:12:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.78 2013/08/06 21:50:19 apb Exp $ +# $NetBSD: configure.ac,v 1.79 2013/08/09 20:12:38 jmcneill Exp $ # # Autoconf definition file for libnbcompat. # @@ -201,6 +201,8 @@ dnl # Thus AC_CHECK_LIB(regex...) comes AC_CHECK_LIB(regex, regfree) AC_SEARCH_LIBS(regfree, rx posix) +AC_CHECK_LIB(rt, clock_gettime) + AC_CHECK_FUNCS(fparseln, [ AC_MSG_CHECKING(if fparseln seems to work) AC_RUN_IFELSE(
CVS commit: src/tools/compat
Module Name:src
Committed By: jmcneill
Date: Fri Aug 9 20:13:21 UTC 2013
Modified Files:
src/tools/compat: configure nbtool_config.h.in
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/tools/compat/configure
cvs rdiff -u -r1.31 -r1.32 src/tools/compat/nbtool_config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.77 src/tools/compat/configure:1.78
--- src/tools/compat/configure:1.77 Tue Aug 6 21:56:36 2013
+++ src/tools/compat/configure Fri Aug 9 20:13:21 2013
@@ -7507,16 +7507,74 @@ if test $ac_cv_search_regfree != no; t
fi
+echo $as_me:7510: checking for clock_gettime in -lrt 5
+echo $ECHO_N checking for clock_gettime in -lrt... $ECHO_C 6
+if test ${ac_cv_lib_rt_clock_gettime+set} = set; then
+ echo $ECHO_N (cached) $ECHO_C 6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS=-lrt $LIBS
+cat conftest.$ac_ext _ACEOF
+#line 7518 configure
+#include confdefs.h
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern C
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char clock_gettime ();
+int
+main ()
+{
+clock_gettime ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo $as_me:7537: \$ac_link\) 5
+ (eval $ac_link) 25
+ ac_status=$?
+ echo $as_me:7540: \$? = $ac_status 5
+ (exit $ac_status); }
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo $as_me:7543: \$ac_try\) 5
+ (eval $ac_try) 25
+ ac_status=$?
+ echo $as_me:7546: \$? = $ac_status 5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+else
+ echo $as_me: failed program was: 5
+cat conftest.$ac_ext 5
+ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo $as_me:7557: result: $ac_cv_lib_rt_clock_gettime 5
+echo ${ECHO_T}$ac_cv_lib_rt_clock_gettime 6
+if test $ac_cv_lib_rt_clock_gettime = yes; then
+ cat confdefs.h EOF
+#define HAVE_LIBRT 1
+EOF
+
+ LIBS=-lrt $LIBS
+
+fi
+
for ac_func in fparseln
do
as_ac_var=`echo ac_cv_func_$ac_func | $as_tr_sh`
-echo $as_me:7513: checking for $ac_func 5
+echo $as_me:7571: checking for $ac_func 5
echo $ECHO_N checking for $ac_func... $ECHO_C 6
if eval test \\${$as_ac_var+set}\ = set; then
echo $ECHO_N (cached) $ECHO_C 6
else
cat conftest.$ac_ext _ACEOF
-#line 7519 configure
+#line 7577 configure
#include confdefs.h
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -7547,16 +7605,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo $as_me:7550: \$ac_link\) 5
+if { (eval echo $as_me:7608: \$ac_link\) 5
(eval $ac_link) 25
ac_status=$?
- echo $as_me:7553: \$? = $ac_status 5
+ echo $as_me:7611: \$? = $ac_status 5
(exit $ac_status); }
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo $as_me:7556: \$ac_try\) 5
+ { (eval echo $as_me:7614: \$ac_try\) 5
(eval $ac_try) 25
ac_status=$?
- echo $as_me:7559: \$? = $ac_status 5
+ echo $as_me:7617: \$? = $ac_status 5
(exit $ac_status); }; }; then
eval $as_ac_var=yes
else
@@ -7566,22 +7624,22 @@ eval $as_ac_var=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo $as_me:7569: result: `eval echo '${'$as_ac_var'}'` 5
+echo $as_me:7627: result: `eval echo '${'$as_ac_var'}'` 5
echo ${ECHO_T}`eval echo '${'$as_ac_var'}'` 6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat confdefs.h EOF
#define `echo HAVE_$ac_func | $as_tr_cpp` 1
EOF
-echo $as_me:7576: checking if fparseln seems to work 5
+echo $as_me:7634: checking if fparseln seems to work 5
echo $ECHO_N checking if fparseln seems to work... $ECHO_C 6
if test $cross_compiling = yes; then
- { echo $as_me:7579: WARNING: cross compiling: not checking farseln 5
+ { echo $as_me:7637: WARNING: cross compiling: not checking farseln 5
echo $as_me: WARNING: cross compiling: not checking farseln 2;}
else
cat conftest.$ac_ext _ACEOF
-#line 7584 configure
+#line 7642 configure
#include confdefs.h
#define _NETBSD_SOURCE
@@ -7610,23 +7668,23 @@ main(void)
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo $as_me:7613: \$ac_link\) 5
+if { (eval echo $as_me:7671: \$ac_link\) 5
(eval $ac_link) 25
ac_status=$?
- echo $as_me:7616: \$? = $ac_status 5
+ echo $as_me:7674: \$? = $ac_status 5
(exit $ac_status); } { ac_try='./conftest$ac_exeext'
- { (eval echo $as_me:7618: \$ac_try\) 5
+ { (eval echo $as_me:7676: \$ac_try\) 5
(eval $ac_try) 25
ac_status=$?
- echo $as_me:7621: \$? = $ac_status 5
+ echo $as_me:7679: \$? = $ac_status 5
(exit $ac_status); }; }; then
- echo $as_me:7623:
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Fri Aug 9 20:13:18 UTC 2013
Modified Files:
src/sys/fs/udf: udf_allocation.c
Log Message:
Fix 32 bit issue in main file read-in function. On both 32 bit and 64 bit
hosts a missing cast would result in `garbage' after the 4Gbyte limit.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/fs/udf/udf_allocation.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/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.33 src/sys/fs/udf/udf_allocation.c:1.34
--- src/sys/fs/udf/udf_allocation.c:1.33 Wed Jul 3 11:50:59 2013
+++ src/sys/fs/udf/udf_allocation.c Fri Aug 9 20:13:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.33 2013/07/03 11:50:59 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.34 2013/08/09 20:13:18 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.33 2013/07/03 11:50:59 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.34 2013/08/09 20:13:18 reinoud Exp $);
#endif /* not lint */
@@ -586,7 +586,7 @@ translate_again:
end_foffset = foffset + len;
- if (end_foffset lb_num * lb_size)
+ if (end_foffset (uint64_t) lb_num * lb_size)
break; /* found */
foffset = end_foffset;
slot++;
@@ -724,13 +724,13 @@ udf_translate_file_extent(struct udf_nod
end_foffset = foffset + len;
- if (end_foffset from * lb_size)
+ if (end_foffset (uint64_t) from * lb_size)
break; /* found */
foffset = end_foffset;
slot++;
}
/* found overlapping slot */
- ext_offset = from * lb_size - foffset;
+ ext_offset = (uint64_t) from * lb_size - foffset;
for (;;) {
udf_get_adslot(udf_node, slot, s_ad, eof);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: aymeric Date: Fri Aug 9 21:19:43 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Comment out pseudo-device md so that ARMADAXP_INSTALL passes config(1). Fixes evbarm releases. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/ARMADAXP 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/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.5 src/sys/arch/evbarm/conf/ARMADAXP:1.6 --- src/sys/arch/evbarm/conf/ARMADAXP:1.5 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/ARMADAXP Fri Aug 9 21:19:43 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.5 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: ARMADAXP,v 1.6 2013/08/09 21:19:43 aymeric Exp $ # # ARMADA XP DEV BOARD # @@ -290,7 +290,7 @@ urlphy* at mii? phy ? # Realtek RTL815 # Pseudo-Devices # disk/mass storage pseudo-devices -pseudo-device md # memory disk device (ramdisk) +#pseudo-device md # memory disk device (ramdisk) pseudo-device vnd # pseudo disks (see vnconfig) #pseudo-device fss # file system snapshot device
CVS commit: src/doc
Module Name:src Committed By: lukem Date: Fri Aug 9 23:38:54 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: I don't have the resources to maintain OpenLDAP in NetBSD anymore. To generate a diff of this commit: cvs rdiff -u -r1.1048 -r1.1049 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1048 src/doc/3RDPARTY:1.1049 --- src/doc/3RDPARTY:1.1048 Sat Aug 3 10:31:52 2013 +++ src/doc/3RDPARTY Fri Aug 9 23:38:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1048 2013/08/03 10:31:52 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1049 2013/08/09 23:38:54 lukem Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -864,7 +864,7 @@ Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Home Page: http://www.openldap.org/ Mailing List: -Responsible: lukem +Responsible: License: BSD (3-clause) Location: external/bsd/openldap/dist Notes:
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: mrg
Date: Sat Aug 10 00:48:04 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: pyro.c
Log Message:
thanks to mhitch, we got all the interrupt issues sorted out for now,
so turn off PDB_INTR in the debug kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/dev/pyro.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.14 src/sys/arch/sparc64/dev/pyro.c:1.15
--- src/sys/arch/sparc64/dev/pyro.c:1.14 Mon Jun 24 11:32:21 2013
+++ src/sys/arch/sparc64/dev/pyro.c Sat Aug 10 00:48:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.14 2013/06/24 11:32:21 nakayama Exp $ */
+/* $NetBSD: pyro.c,v 1.15 2013/08/10 00:48:04 mrg Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pyro.c,v 1.14 2013/06/24 11:32:21 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: pyro.c,v 1.15 2013/08/10 00:48:04 mrg Exp $);
#include sys/param.h
#include sys/device.h
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, $NetBSD: pyro.c,v 1.1
#define PDB_BUSMAP 0x02
#define PDB_INTR0x04
#define PDB_CONF0x08
-int pyro_debug = 0x0 | PDB_INTR;
+int pyro_debug = 0x0;
#define DPRINTF(l, s) do { if (pyro_debug l) printf s; } while (0)
#else
#define DPRINTF(l, s)
