CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Wed Jul 29 19:18:18 UTC 2015 Modified Files: src/distrib/sets/lists/tests: mi Log Message: fix name of the test To generate a diff of this commit: cvs rdiff -u -r1.635 -r1.636 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.635 src/distrib/sets/lists/tests/mi:1.636 --- src/distrib/sets/lists/tests/mi:1.635 Wed Jul 29 14:27:18 2015 +++ src/distrib/sets/lists/tests/mi Wed Jul 29 15:18:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.635 2015/07/29 18:27:18 christos Exp $ +# $NetBSD: mi,v 1.636 2015/07/29 19:18:18 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3781,7 +3781,7 @@ ./usr/tests/usr.bin/xlint/lint1/d_type_conv1.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_type_conv2.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_type_conv3.c tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/d_type_conv_question_colon.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/d_type_question_colon.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_typefun.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_typename_as_var.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c tests-usr.bin-tests compattestfile,atf
CVS commit: src/lib/libc/time
Module Name:src
Committed By: ginsbach
Date: Wed Jul 29 20:32:54 UTC 2015
Modified Files:
src/lib/libc/time: strptime.c
Log Message:
Only apply am/pm adjustment to tm_hour when it has actually been parsed.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libc/time/strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.47 src/lib/libc/time/strptime.c:1.48
--- src/lib/libc/time/strptime.c:1.47 Wed Jul 22 13:33:59 2015
+++ src/lib/libc/time/strptime.c Wed Jul 29 20:32:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: strptime.c,v 1.47 2015/07/22 13:33:59 ginsbach Exp $ */
+/* $NetBSD: strptime.c,v 1.48 2015/07/29 20:32:54 ginsbach Exp $ */
/*-
* Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: strptime.c,v 1.47 2015/07/22 13:33:59 ginsbach Exp $);
+__RCSID($NetBSD: strptime.c,v 1.48 2015/07/29 20:32:54 ginsbach Exp $);
#endif
#include namespace.h
@@ -70,12 +70,14 @@ static const u_char *find_string(const u
#define S_YDAY (1 2)
#define S_MDAY (1 3)
#define S_WDAY (1 4)
+#define S_HOUR (1 5)
#define HAVE_MDAY(s) (s S_MDAY)
#define HAVE_MON(s) (s S_MON)
#define HAVE_WDAY(s) (s S_WDAY)
#define HAVE_YDAY(s) (s S_YDAY)
#define HAVE_YEAR(s) (s S_YEAR)
+#define HAVE_HOUR(s) (s S_HOUR)
static char gmt[] = { GMT };
static char utc[] = { UTC };
@@ -262,6 +264,7 @@ literal:
case 'H':
bp = conv_num(bp, tm-tm_hour, 0, 23);
LEGAL_ALT(ALT_O);
+ state |= S_HOUR;
continue;
case 'l': /* The hour (12-hour clock representation). */
@@ -272,6 +275,7 @@ literal:
if (tm-tm_hour == 12)
tm-tm_hour = 0;
LEGAL_ALT(ALT_O);
+ state |= S_HOUR;
continue;
case 'j': /* The day of year. */
@@ -298,7 +302,7 @@ literal:
case 'p': /* The locale's equivalent of AM/PM. */
bp = find_string(bp, i, _TIME_LOCALE(loc)-am_pm,
NULL, 2);
- if (tm-tm_hour 11)
+ if (HAVE_HOUR(state) tm-tm_hour 11)
return NULL;
tm-tm_hour += i * 12;
LEGAL_ALT(0);
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Wed Jul 29 18:27:19 UTC 2015 Modified Files: src/distrib/sets/lists/tests: mi Log Message: new lint test. To generate a diff of this commit: cvs rdiff -u -r1.634 -r1.635 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.634 src/distrib/sets/lists/tests/mi:1.635 --- src/distrib/sets/lists/tests/mi:1.634 Wed Jul 29 02:10:09 2015 +++ src/distrib/sets/lists/tests/mi Wed Jul 29 14:27:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.634 2015/07/29 06:10:09 ozaki-r Exp $ +# $NetBSD: mi,v 1.635 2015/07/29 18:27:18 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3781,6 +3781,7 @@ ./usr/tests/usr.bin/xlint/lint1/d_type_conv1.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_type_conv2.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_type_conv3.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/d_type_conv_question_colon.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_typefun.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_typename_as_var.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c tests-usr.bin-tests compattestfile,atf
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: christos Date: Wed Jul 29 19:44:01 UTC 2015 Modified Files: src/distrib/sets/lists/xcomp: md.amd64 Log Message: add missing lint libraries To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xcomp/md.amd64 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/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.41 src/distrib/sets/lists/xcomp/md.amd64:1.42 --- src/distrib/sets/lists/xcomp/md.amd64:1.41 Sat Jun 27 12:21:08 2015 +++ src/distrib/sets/lists/xcomp/md.amd64 Wed Jul 29 15:44:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41 2015/06/27 16:21:08 matt Exp $ +# $NetBSD: md.amd64,v 1.42 2015/07/29 19:44:01 christos Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -91,4 +91,18 @@ #./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg +./usr/libdata/lint/llib-ldbe.ln-unknown- lint,xorg +./usr/libdata/lint/llib-ldri.ln-unknown- lint,xorg +./usr/libdata/lint/llib-ldri2.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lexa.ln-unknown- lint,xorg +./usr/libdata/lint/llib-lextmod.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lfb.ln-unknown- lint,xorg +./usr/libdata/lint/llib-lglx.ln-unknown- lint,xorg +./usr/libdata/lint/llib-lint10.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lrecord.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lshadow.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lshadowfb.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lvbe.ln-unknown- lint,xorg +./usr/libdata/lint/llib-lvgahw.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lxaa.ln-unknown- lint,xorg
CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Jul 29 19:27:37 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c
Log Message:
restore some more registers on exit, now we actually get back to a usable
console
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.15 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.16
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.15 Wed Jul 29 18:15:38 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Wed Jul 29 19:27:37 2015
@@ -2797,15 +2797,11 @@ static void R128Restore(ScrnInfoPtr pScr
R128RestoreFPRegisters(pScrn, restore);
R128RestoreLVDSRegisters(pScrn, restore);
-#if 0
-if (!info-IsSecondary) {
-OUTREG(R128_AMCGPIO_MASK, restore-amcgpio_mask);
-OUTREG(R128_AMCGPIO_EN_REG, restore-amcgpio_en_reg);
-OUTREG(R128_CLOCK_CNTL_INDEX, restore-clock_cntl_index);
-OUTREG(R128_GEN_RESET_CNTL, restore-gen_reset_cntl);
-OUTREG(R128_DP_DATATYPE, restore-dp_datatype);
-}
-#endif
+OUTREG(R128_AMCGPIO_MASK, restore-amcgpio_mask);
+OUTREG(R128_AMCGPIO_EN_REG, restore-amcgpio_en_reg);
+OUTREG(R128_CLOCK_CNTL_INDEX, restore-clock_cntl_index);
+OUTREG(R128_GEN_RESET_CNTL, restore-gen_reset_cntl);
+OUTREG(R128_DP_DATATYPE, restore-dp_datatype);
#ifdef WITH_VGAHW
if (info-VGAAccess) {
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Wed Jul 29 19:44:47 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 Log Message: fix debug sets after latest x changes. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/md.amd64 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/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.20 src/distrib/sets/lists/xdebug/md.amd64:1.21 --- src/distrib/sets/lists/xdebug/md.amd64:1.20 Wed Jul 22 12:37:33 2015 +++ src/distrib/sets/lists/xdebug/md.amd64 Wed Jul 29 15:44:47 2015 @@ -1,24 +1,24 @@ -# $NetBSD: md.amd64,v 1.20 2015/07/22 16:37:33 mrg Exp $ +# $NetBSD: md.amd64,v 1.21 2015/07/29 19:44:47 christos Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg,compatx11file -./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete -./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libexa_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libfb_g.a -unknown- xorg,debuglib,obsolete +./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libexa_g.a -unknown- xorg,debuglib ./usr/X11R7/lib/modules/libi2c_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libint10_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libvbe_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libvgahw_g.a -unknown- xorg,debuglib,obsolete -./usr/X11R7/lib/modules/libxaa_g.a -unknown- xorg,debuglib,obsolete +./usr/X11R7/lib/modules/libfb_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libint10_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libvbe_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libvgahw_g.a -unknown- xorg,debuglib +./usr/X11R7/lib/modules/libxaa_g.a -unknown- xorg,debuglib ./usr/libdata/debug/usr/X11R6/bin/XFree86.debug -unknown- debug,x11 ./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 ./usr/libdata/debug/usr/X11R6/bin/gtf.debug -unknown- debug,x11
CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Jul 29 18:15:38 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_output.c
Log Message:
- make sure the wsdisplay we talk to is actually the one handling the chip
we're about to use
- make sure we habe backlight control via wsdisplay before attempting to use it
- use wsdisplay backlight control for blanking if available
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128.h
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.6 xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.7
--- xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.6 Mon Jul 20 00:55:42 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128.h Wed Jul 29 18:15:38 2015
@@ -311,6 +311,10 @@ typedef struct {
Bool FBDev;
#endif
+#ifdef __NetBSD__
+Bool HaveWSDisplay;
+Bool HaveBacklightControl;
+#endif
unsigned long LinearAddr; /* Frame buffer physical address */
unsigned long MMIOAddr; /* MMIO region physical address */
unsigned long BIOSAddr; /* BIOS physical address */
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.14 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.15
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.14 Wed Jul 29 01:51:18 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Wed Jul 29 18:15:38 2015
@@ -596,7 +596,8 @@ void R128GetPanelInfoFromBIOS(xf86Output
return;
fallback:
#ifdef __NetBSD__
-if (!r128_output-PanelXRes || !r128_output-PanelYRes) {
+if ((!r128_output-PanelXRes || !r128_output-PanelYRes)
+(info-HaveWSDisplay)) {
/*
* we may not be on x86 so check wsdisplay for panel dimensions
* XXX this assumes that the r128 is the console, although that should
@@ -1313,6 +1314,9 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int
{
R128InfoPtr info;
xf86Int10InfoPtr pInt10 = NULL;
+#ifdef __NetBSD__
+struct wsdisplayio_bus_id bid;
+#endif
R128TRACE((R128PreInit\n));
@@ -1340,6 +1344,29 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int
PCI_DEV_DEV(info-PciInfo),
PCI_DEV_FUNC(info-PciInfo));
+#ifdef __NetBSD__
+/* now check if this is the console */
+info-HaveWSDisplay = FALSE;
+info-HaveBacklightControl = FALSE;
+if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GET_BUSID, bid) != -1) {
+ if ((bid.bus_type == WSDISPLAYIO_BUS_PCI)
+ (bid.ubus.pci.bus == PCI_DEV_BUS(info-PciInfo))
+ (bid.ubus.pci.device == PCI_DEV_DEV(info-PciInfo))
+ (bid.ubus.pci.function == PCI_DEV_FUNC(info-PciInfo))) {
+ struct wsdisplay_param p;
+ xf86Msg(X_INFO, Alright, this is the console\n);
+ info-HaveWSDisplay = TRUE;
+
+ /* now see if we have hacklight control */
+ p.param = WSDISPLAYIO_PARAM_BACKLIGHT;
+ if (ioctl(xf86Info.screenFd, WSDISPLAYIO_GETPARAM, p) != -1) {
+ xf86Msg(X_INFO, ... and we have backlight control\n);
+ info-HaveBacklightControl = TRUE;
+ }
+ }
+}
+#endif
+
#ifndef XSERVER_LIBPCIACCESS
info-PciTag= pciTag(PCI_DEV_BUS(info-PciInfo),
PCI_DEV_DEV(info-PciInfo),
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.2 xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.3
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.2 Wed Jul 29 01:51:18 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c Wed Jul 29 18:15:38 2015
@@ -189,9 +189,20 @@ void R128DPMSSetOn(xf86OutputPtr output)
switch(MonType) {
case MT_LCD:
-OUTREGP(R128_LVDS_GEN_CNTL, R128_LVDS_BLON, ~R128_LVDS_BLON);
-usleep(r128_output-PanelPwrDly * 1000);
-OUTREGP(R128_LVDS_GEN_CNTL, R128_LVDS_ON, ~R128_LVDS_ON);
+#ifdef __NetBSD__
+ if (info-HaveBacklightControl) {
+ struct wsdisplay_param p;
+
+ p.param = WSDISPLAYIO_PARAM_BACKLIGHT;
+ p.curval = 1;
+ ioctl(xf86Info.screenFd, WSDISPLAYIO_SETPARAM, p);
+ } else
+#endif
+ {
+OUTREGP(R128_LVDS_GEN_CNTL, R128_LVDS_BLON, ~R128_LVDS_BLON);
+usleep(r128_output-PanelPwrDly * 1000);
+OUTREGP(R128_LVDS_GEN_CNTL, R128_LVDS_ON, ~R128_LVDS_ON);
+}
save-lvds_gen_cntl |= (R128_LVDS_ON | R128_LVDS_BLON);
break;
case MT_DFP:
@@
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Wed Jul 29 18:22:06 UTC 2015
Modified Files:
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
Be more specific about the type errors
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.47 src/usr.bin/xlint/lint1/err.c:1.48
--- src/usr.bin/xlint/lint1/err.c:1.47 Tue Feb 18 17:01:36 2014
+++ src/usr.bin/xlint/lint1/err.c Wed Jul 29 14:22:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.47 2014/02/18 22:01:36 christos Exp $ */
+/* $NetBSD: err.c,v 1.48 2015/07/29 18:22:06 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: err.c,v 1.47 2014/02/18 22:01:36 christos Exp $);
+__RCSID($NetBSD: err.c,v 1.48 2015/07/29 18:22:06 christos Exp $);
#endif
#include sys/types.h
@@ -163,7 +163,7 @@ const char *msgs[] = {
undefined struct/union member: %s, /* 101 */
illegal member use: %s, /* 102 */
left operand of '.' must be struct/union object, /* 103 */
- left operand of '-' must be pointer to struct/union, /* 104 */
+ left operand of '-' must be pointer to struct/union and is %s, /* 104 */
non-unique member requires struct/union %s, /* 105 */
left operand of '-' must be pointer, /* 106 */
operands of '%s' have incompatible types (%s != %s), /* 107 */
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.78 src/usr.bin/xlint/lint1/tree.c:1.79
--- src/usr.bin/xlint/lint1/tree.c:1.78 Mon Feb 9 13:17:34 2015
+++ src/usr.bin/xlint/lint1/tree.c Wed Jul 29 14:22:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.78 2015/02/09 18:17:34 christos Exp $ */
+/* $NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: tree.c,v 1.78 2015/02/09 18:17:34 christos Exp $);
+__RCSID($NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $);
#endif
#include stdlib.h
@@ -431,11 +431,14 @@ strmemb(tnode_t *tn, op_t op, sym_t *msy
error(103);
}
} else {
+ char buf[64];
/* left operand of - must be pointer to ... */
if (tflag tn-tn_type-t_tspec == PTR) {
-warning(104);
+tyname(buf, sizeof(buf), tn-tn_type);
+warning(104, buf);
} else {
-error(104);
+tyname(buf, sizeof(buf), tn-tn_type);
+error(104, buf);
}
}
} else {
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Wed Jul 29 18:23:32 UTC 2015
Modified Files:
src/usr.bin/xlint/lint1: tree.c
Log Message:
Make the return type of ? type1 : void * or ? void * : type1 to be type1
instead of void *.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.79 src/usr.bin/xlint/lint1/tree.c:1.80
--- src/usr.bin/xlint/lint1/tree.c:1.79 Wed Jul 29 14:22:06 2015
+++ src/usr.bin/xlint/lint1/tree.c Wed Jul 29 14:23:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $ */
+/* $NetBSD: tree.c,v 1.80 2015/07/29 18:23:32 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $);
+__RCSID($NetBSD: tree.c,v 1.80 2015/07/29 18:23:32 christos Exp $);
#endif
#include stdlib.h
@@ -2534,12 +2534,12 @@ bldcol(tnode_t *ln, tnode_t *rn)
} else if (lt == PTR ln-tn_type-t_subt-t_tspec == VOID) {
if (rt != PTR)
LERROR(bldcol());
- rtp = ln-tn_type;
+ rtp = rn-tn_type;
mrgqual(rtp, ln-tn_type, rn-tn_type);
} else if (rt == PTR rn-tn_type-t_subt-t_tspec == VOID) {
if (lt != PTR)
LERROR(bldcol());
- rtp = rn-tn_type;
+ rtp = ln-tn_type;
mrgqual(rtp, ln-tn_type, rn-tn_type);
} else {
if (lt != PTR || rt != PTR)
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Wed Jul 29 18:26:15 UTC 2015
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Added Files:
src/tests/usr.bin/xlint/lint1: d_type_question_colon.c
Log Message:
new test
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/d_type_question_colon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.9 src/tests/usr.bin/xlint/lint1/Makefile:1.10
--- src/tests/usr.bin/xlint/lint1/Makefile:1.9 Tue Jul 28 14:05:19 2015
+++ src/tests/usr.bin/xlint/lint1/Makefile Wed Jul 29 14:26:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/07/28 18:05:19 christos Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/29 18:26:15 christos Exp $
NOMAN= # defined
@@ -54,6 +54,7 @@ FILES+= d_shift_to_narrower_type.c
FILES+= d_type_conv1.c
FILES+= d_type_conv2.c
FILES+= d_type_conv3.c
+FILES+= d_type_question_colon.c
FILES+= d_typename_as_var.c
FILES+= d_typefun.c
FILES+= d_zero_sized_arrays.c
Added files:
Index: src/tests/usr.bin/xlint/lint1/d_type_question_colon.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/d_type_question_colon.c:1.1
--- /dev/null Wed Jul 29 14:26:15 2015
+++ src/tests/usr.bin/xlint/lint1/d_type_question_colon.c Wed Jul 29 14:26:15 2015
@@ -0,0 +1,14 @@
+/* the type of the ?: expression should be the more specific type */
+
+struct foo {
+ int bar;
+};
+
+void
+test(void) {
+ int i;
+ struct foo *ptr = 0;
+
+ for (i = (ptr ? ptr : (void *)0)-bar; i 10; i++)
+ test();
+}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10
Module Name:src
Committed By: christos
Date: Wed Jul 29 19:03:15 UTC 2015
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
Log Message:
Don't use NO_SYS_HEADERS because sys/types.h is not included when you
do that before the typedefs in /usr/xsrc/external/mit/xorg-server/dist/hw/\
xfree86/x86emu/x86emu/types.h, and then some source files include
sys/types.h leading to uint redefinitions.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 Thu Aug 11 19:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Wed Jul 29 15:03:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -12,7 +12,7 @@ SRCS= x86emu.c generic.c xf86x86emu.c x
helper_exec.c xf86int10module.c
CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \
- -D_X86EMU -DNO_SYS_HEADERS
+ -D_X86EMU
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
CPPFLAGS+= -D_PC
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 30 02:52:53 UTC 2015
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/arp: Makefile
Added Files:
src/tests/net/arp: t_dad.sh
Log Message:
Add tests for IPv4 DAD
To generate a diff of this commit:
cvs rdiff -u -r1.636 -r1.637 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/net/arp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/arp/t_dad.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.636 src/distrib/sets/lists/tests/mi:1.637
--- src/distrib/sets/lists/tests/mi:1.636 Wed Jul 29 19:18:18 2015
+++ src/distrib/sets/lists/tests/mi Thu Jul 30 02:52:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.636 2015/07/29 19:18:18 christos Exp $
+# $NetBSD: mi,v 1.637 2015/07/30 02:52:53 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3102,6 +3102,7 @@
./usr/tests/net/arp/Atffile tests-net-tests atf,rump
./usr/tests/net/arp/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/arp/t_arp tests-net-tests atf,rump
+./usr/tests/net/arp/t_dad tests-net-tests atf,rump
./usr/tests/net/bpftests-net-tests compattestfile,atf
./usr/tests/net/bpf/Atffile tests-net-tests atf,rump
./usr/tests/net/bpf/Kyuafile tests-net-tests atf,rump,kyua
Index: src/tests/net/arp/Makefile
diff -u src/tests/net/arp/Makefile:1.1 src/tests/net/arp/Makefile:1.2
--- src/tests/net/arp/Makefile:1.1 Wed Jul 29 06:10:10 2015
+++ src/tests/net/arp/Makefile Thu Jul 30 02:52:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/07/29 06:10:10 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/30 02:52:53 ozaki-r Exp $
#
.include bsd.own.mk
@@ -6,5 +6,6 @@
TESTSDIR= ${TESTSBASE}/net/arp
TESTS_SH= t_arp
+TESTS_SH= t_dad
.include bsd.test.mk
Added files:
Index: src/tests/net/arp/t_dad.sh
diff -u /dev/null src/tests/net/arp/t_dad.sh:1.1
--- /dev/null Thu Jul 30 02:52:54 2015
+++ src/tests/net/arp/t_dad.sh Thu Jul 30 02:52:53 2015
@@ -0,0 +1,224 @@
+# $NetBSD: t_dad.sh,v 1.1 2015/07/30 02:52:53 ozaki-r Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# 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.
+#
+
+inetserver=rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif
+HIJACKING=env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes
+
+SOCKLOCAL=unix://commsock1
+SOCKPEER=unix://commsock2
+
+DEBUG=false
+
+atf_test_case dad_basic cleanup
+atf_test_case dad_duplicated cleanup
+
+dad_basic_head()
+{
+ atf_set descr Tests for IPv4 DAD basic behavior
+ atf_set require.progs rump_server
+}
+
+dad_duplicated_head()
+{
+ atf_set descr Tests for IPv4 DAD duplicated state
+ atf_set require.progs rump_server
+}
+
+setup_server()
+{
+ local sock=$1
+ local ip=$2
+
+ export RUMP_SERVER=$sock
+
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ atf_check -s exit:0 rump.ifconfig shmif0 inet $ip/24
+ atf_check -s exit:0 rump.ifconfig shmif0 up
+ atf_check -s exit:0 rump.ifconfig -w 10
+
+ $DEBUG rump.ifconfig shmif0
+}
+
+make_pkt_str()
+{
+ local target=$1
+ local sender=$2
+ pkt= ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42:
+ pkt=$pkt Request who-has $target tell $sender, length 28
+ echo $pkt
+}
+
+dad_basic_body()
+{
+ local pkt=
+
+ atf_check -s exit:0 ${inetserver} $SOCKLOCAL
+ export RUMP_SERVER=$SOCKLOCAL
+
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ atf_check -s exit:0 rump.ifconfig
CVS commit: src/share/man/man7
Module Name:src Committed By: jnemeth Date: Thu Jul 30 03:21:33 UTC 2015 Modified Files: src/share/man/man7: tests.atf.7 tests.kyua.7 Log Message: typo from Timo Buhrmester To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man7/tests.atf.7 \ src/share/man/man7/tests.kyua.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/tests.atf.7 diff -u src/share/man/man7/tests.atf.7:1.6 src/share/man/man7/tests.atf.7:1.7 --- src/share/man/man7/tests.atf.7:1.6 Sun Jul 13 09:32:05 2014 +++ src/share/man/man7/tests.atf.7 Thu Jul 30 03:21:33 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.atf.7,v 1.6 2014/07/13 09:32:05 mbalmer Exp $ +.\ $NetBSD: tests.atf.7,v 1.7 2015/07/30 03:21:33 jnemeth Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,7 +25,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 13, 2014 +.Dd July 29, 2015 .Dt TESTS 7 .Os .Sh NAME @@ -147,7 +147,7 @@ debugging failing tests. Tests can be invoked as an unprivileged user, in which case tests that require privileges will be skipped. If run as root, an unprivileged user will be used for tests that -require privileges. +do not require privileges. For maximal coverage, the standard approach is to invoke tests as root. .Pp Ideally, tests are self-contained and do not either depend on or Index: src/share/man/man7/tests.kyua.7 diff -u src/share/man/man7/tests.kyua.7:1.6 src/share/man/man7/tests.kyua.7:1.7 --- src/share/man/man7/tests.kyua.7:1.6 Mon Oct 27 11:55:08 2014 +++ src/share/man/man7/tests.kyua.7 Thu Jul 30 03:21:33 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.kyua.7,v 1.6 2014/10/27 11:55:08 christos Exp $ +.\ $NetBSD: tests.kyua.7,v 1.7 2015/07/30 03:21:33 jnemeth Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,7 +25,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 27, 2014 +.Dd July 29, 2015 .Dt TESTS 7 .Os .Sh NAME @@ -142,7 +142,7 @@ to its manual page Tests can be invoked as an unprivileged user, in which case tests that require privileges will be skipped. If run as root, an unprivileged user will be used for tests that -require privileges. +do not require privileges. For maximal coverage, the standard approach is to invoke tests as root. .Pp Ideally, tests are self-contained and do not either depend on or
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: ryo Date: Thu Jul 30 04:39:42 UTC 2015 Modified Files: src/sys/arch/arm/imx: imxuart.c Log Message: fix to compile unless defined IMXUARTCONSOLE To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/imxuart.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/imx/imxuart.c diff -u src/sys/arch/arm/imx/imxuart.c:1.18 src/sys/arch/arm/imx/imxuart.c:1.19 --- src/sys/arch/arm/imx/imxuart.c:1.18 Wed Jul 29 08:51:03 2015 +++ src/sys/arch/arm/imx/imxuart.c Thu Jul 30 04:39:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuart.c,v 1.18 2015/07/29 08:51:03 ryo Exp $ */ +/* $NetBSD: imxuart.c,v 1.19 2015/07/30 04:39:42 ryo Exp $ */ /* * Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved. @@ -96,7 +96,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: imxuart.c,v 1.18 2015/07/29 08:51:03 ryo Exp $); +__KERNEL_RCSID(0, $NetBSD: imxuart.c,v 1.19 2015/07/30 04:39:42 ryo Exp $); #include opt_imxuart.h #include opt_ddb.h @@ -2278,9 +2278,10 @@ imxuart_common_putc(dev_t dev, struct im splx(s); } +#endif /* defined(IMXUARTCONSOLE) || defined(KGDB) */ /* - * Initialize UART for use as console or KGDB line. + * Initialize UART */ int imxuart_init(struct imxuart_regs *regsp, int rate, tcflag_t cflag, int domap) @@ -2336,9 +2337,6 @@ imxuart_init(struct imxuart_regs *regsp, } -#endif - - #ifdef IMXUARTCONSOLE /* * Following are all routines needed for UART to act as console
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Thu Jul 30 04:36:48 UTC 2015 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysctl.c Log Message: Add $NetBSD$ tag. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_sysctl.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/external/bsd/drm2/drm/drm_sysctl.c diff -u src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.5 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.6 --- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.5 Wed Feb 25 14:00:52 2015 +++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Thu Jul 30 04:36:48 2015 @@ -1,3 +1,5 @@ +/* $NetBSD: drm_sysctl.c,v 1.6 2015/07/30 04:36:48 riastradh Exp $ */ + /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -27,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: drm_sysctl.c,v 1.5 2015/02/25 14:00:52 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: drm_sysctl.c,v 1.6 2015/07/30 04:36:48 riastradh Exp $); #include sys/param.h #include sys/types.h
CVS commit: src/tests/net/arp
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 30 02:51:05 UTC 2015
Modified Files:
src/tests/net/arp: t_arp.sh
Log Message:
Add tests for GARP
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/arp/t_arp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.1 src/tests/net/arp/t_arp.sh:1.2
--- src/tests/net/arp/t_arp.sh:1.1 Wed Jul 29 06:10:10 2015
+++ src/tests/net/arp/t_arp.sh Thu Jul 30 02:51:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.1 2015/07/29 06:10:10 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.2 2015/07/30 02:51:05 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,6 +39,7 @@ TIMEOUT=1
atf_test_case cache_expiration_5s cleanup
atf_test_case cache_expiration_10s cleanup
atf_test_case command cleanup
+atf_test_case garp cleanup
cache_expiration_5s_head()
{
@@ -58,6 +59,12 @@ command_head()
atf_set require.progs rump_server
}
+garp_head()
+{
+ atf_set descr Tests for GARP
+ atf_set require.progs rump_server
+}
+
setup_dst_server()
{
export RUMP_SERVER=$SOCKDST
@@ -191,24 +198,80 @@ command_body()
atf_check -s not-exit:0 -e ignore rump.arp -n 10.0.1.1
}
+make_pkt_str()
+{
+ local target=$1
+ local sender=$2
+ pkt= ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 42:
+ pkt=$pkt Request who-has $target tell $sender, length 28
+ echo $pkt
+}
+
+garp_body()
+{
+ local pkt=
+
+ atf_check -s exit:0 ${inetserver} $SOCKSRC
+ export RUMP_SERVER=$SOCKSRC
+
+ # Setup an interface
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.1/24
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.2/24 alias
+ atf_check -s exit:0 rump.ifconfig shmif0 up
+ $DEBUG rump.ifconfig shmif0
+
+ atf_check -s exit:0 sleep 1
+ shmif_dumpbus -p - bus1 2/dev/null| tcpdump -n -e -r - ./out
+
+ # A GARP packet is sent for the primary address
+ pkt=$(make_pkt_str 10.0.0.1 10.0.0.1)
+ atf_check -s exit:0 -x cat ./out |grep -q '$pkt'
+ # No GARP packet is sent for the alias address
+ pkt=$(make_pkt_str 10.0.0.2 10.0.0.2)
+ atf_check -s not-exit:0 -x cat ./out |grep -q '$pkt'
+
+ atf_check -s exit:0 rump.ifconfig -w 10
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.3/24
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.4/24 alias
+
+ # No GARP packets are sent during IFF_UP
+ shmif_dumpbus -p - bus1 2/dev/null| tcpdump -n -e -r - ./out
+ pkt=$(make_pkt_str 10.0.0.3 10.0.0.3)
+ atf_check -s not-exit:0 -x cat ./out |grep -q '$pkt'
+ pkt=$(make_pkt_str 10.0.0.4 10.0.0.4)
+ atf_check -s not-exit:0 -x cat ./out |grep -q '$pkt'
+}
+
cleanup()
{
env RUMP_SERVER=$SOCKSRC rump.halt
env RUMP_SERVER=$SOCKDST rump.halt
}
-dump()
+dump_src()
{
export RUMP_SERVER=$SOCKSRC
rump.netstat -nr
rump.arp -n -a
+ rump.ifconfig
$HIJACKING dmesg
+}
+dump_dst()
+{
export RUMP_SERVER=$SOCKDST
rump.netstat -nr
rump.arp -n -a
+ rump.ifconfig
$HIJACKING dmesg
+}
+dump()
+{
+ dump_src
+ dump_dst
shmif_dumpbus -p - bus1 2/dev/null| tcpdump -n -e -r -
}
@@ -230,9 +293,17 @@ command_cleanup()
cleanup
}
+garp_cleanup()
+{
+ $DEBUG dump_src
+ $DEBUG shmif_dumpbus -p - bus1 2/dev/null| tcpdump -n -e -r -
+ env RUMP_SERVER=$SOCKSRC rump.halt
+}
+
atf_init_test_cases()
{
atf_add_test_case cache_expiration_5s
atf_add_test_case cache_expiration_10s
atf_add_test_case command
+ atf_add_test_case garp
}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-r128
Module Name:src
Committed By: macallan
Date: Thu Jul 30 02:58:00 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile
Log Message:
build EXA support
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 Mon Jul 20 01:17:46 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Thu Jul 30 02:58:00 2015
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2015/07/20 01:17:46 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/30 02:58:00 macallan Exp $
DRIVER= xf86-video-r128
DRIVER_NAME= r128_drv
-SRCS= r128_accel.c r128_cursor.c r128_driver.c \
+SRCS= r128_accel.c r128_cursor.c r128_driver.c r128_exa.c \
r128_crtc.c r128_output.c \
r128_video.c r128_misc.c r128_probe.c r128_dri.c
-#SRCS+= r128_exa.c r128_exa_render.c
-#CPPFLAGS+= -DUSE_EXA
-
MAN= r128.4
.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc64
@@ -23,7 +20,7 @@ CPPFLAGS+= -DWITH_VGAHW
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DHAVE_XAA_H -DR128DRI
+CPPFLAGS+= -DHAVE_XAA_H -DUSE_EXA -DR128DRI
CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 29 07:42:28 UTC 2015
Modified Files:
src/sbin/ifconfig: ifconfig.c
Log Message:
Don't divide flags output
If there are many enabled flags, ifconfig divides flags output into
multiple formatted strings due to snprintb_m, e.g.,
wm0: flags=8b43UP,BROADCAST,RUNNING,PROMISC,ALLMULTI,SIMPLEXwm0:
flags=8b43MULTICAST mtu 1500
This behavior is probably unexpected. The change always outputs enabled
flags at once like this:
wm0: flags=8b43UP,BROADCAST,RUNNING,PROMISC,ALLMULTI,SIMPLEX,MULTICAST mtu
1500
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sbin/ifconfig/ifconfig.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/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.234 src/sbin/ifconfig/ifconfig.c:1.235
--- src/sbin/ifconfig/ifconfig.c:1.234 Wed Apr 22 17:42:22 2015
+++ src/sbin/ifconfig/ifconfig.c Wed Jul 29 07:42:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.234 2015/04/22 17:42:22 roy Exp $ */
+/* $NetBSD: ifconfig.c,v 1.235 2015/07/29 07:42:27 ozaki-r Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.);
-__RCSID($NetBSD: ifconfig.c,v 1.234 2015/04/22 17:42:22 roy Exp $);
+__RCSID($NetBSD: ifconfig.c,v 1.235 2015/07/29 07:42:27 ozaki-r Exp $);
#endif /* not lint */
#include sys/param.h
@@ -1261,12 +1261,8 @@ status(const struct sockaddr *sdl, prop_
if ((ifname = getifinfo(env, oenv, flags)) == NULL)
err(EXIT_FAILURE, %s: getifinfo, __func__);
- (void)snprintb_m(fbuf, sizeof(fbuf), IFFBITS, flags, MAX_PRINT_LEN);
- bp = fbuf;
- while (*bp != '\0') {
- printf(%s: flags=%s, ifname, bp[2]);
- bp += strlen(bp) + 1;
- }
+ (void)snprintb(fbuf, sizeof(fbuf), IFFBITS, flags);
+ printf(%s: flags=%s, ifname, fbuf);
estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
if (prog_ioctl(s, SIOCGIFMETRIC, ifr) == -1)
CVS commit: src/sys/dev/adb
Module Name:src
Committed By: christos
Date: Wed Jul 29 08:45:29 UTC 2015
Modified Files:
src/sys/dev/adb: adb_kbd.c
Log Message:
We don't have Debugger if we don't have DDB.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/adb/adb_kbd.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/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.25 src/sys/dev/adb/adb_kbd.c:1.26
--- src/sys/dev/adb/adb_kbd.c:1.25 Mon Jul 27 15:27:04 2015
+++ src/sys/dev/adb/adb_kbd.c Wed Jul 29 04:45:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_kbd.c,v 1.25 2015/07/27 19:27:04 macallan Exp $ */
+/* $NetBSD: adb_kbd.c,v 1.26 2015/07/29 08:45:28 christos Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adb_kbd.c,v 1.25 2015/07/27 19:27:04 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: adb_kbd.c,v 1.26 2015/07/29 08:45:28 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -480,7 +480,11 @@ adbkbd_powerbutton(void *cookie)
struct adbkbd_softc *sc = cookie;
if (sc-sc_power_dbg) {
+#ifdef DDB
Debugger();
+#else
+ printf(kernel is not compiled with DDB support\n);
+#endif
} else {
sysmon_pswitch_event(sc-sc_sm_pbutton,
ADBK_PRESS(sc-sc_pe) ? PSWITCH_EVENT_PRESSED :
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: ryo
Date: Wed Jul 29 08:51:03 UTC 2015
Modified Files:
src/sys/arch/arm/imx: imxuart.c
Log Message:
initialize uart register when it is not a console.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/imx/imxuart.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/imx/imxuart.c
diff -u src/sys/arch/arm/imx/imxuart.c:1.17 src/sys/arch/arm/imx/imxuart.c:1.18
--- src/sys/arch/arm/imx/imxuart.c:1.17 Mon Apr 13 21:18:41 2015
+++ src/sys/arch/arm/imx/imxuart.c Wed Jul 29 08:51:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuart.c,v 1.17 2015/04/13 21:18:41 riastradh Exp $ */
+/* $NetBSD: imxuart.c,v 1.18 2015/07/29 08:51:03 ryo Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: imxuart.c,v 1.17 2015/04/13 21:18:41 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: imxuart.c,v 1.18 2015/07/29 08:51:03 ryo Exp $);
#include opt_imxuart.h
#include opt_ddb.h
@@ -293,7 +293,7 @@ int imxuart_common_getc(dev_t, struct im
void imxuart_common_putc(dev_t, struct imxuart_regs *, int);
-int imxuart_init(struct imxuart_regs *, int, tcflag_t);
+int imxuart_init(struct imxuart_regs *, int, tcflag_t, int);
int imxucngetc(dev_t);
void imxucnputc(dev_t, int);
@@ -424,6 +424,9 @@ imxuart_attach_common(device_t parent, d
callout_init(sc-sc_diag_callout, 0);
mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
+ if (regsp-ur_iobase != imxuconsregs.ur_iobase)
+ imxuart_init(sc-sc_regs, TTYDEF_SPEED, TTYDEF_CFLAG, false);
+
bus_space_read_region_4(iot, ioh, IMX_UCR1, sc-sc_ucr, 4);
sc-sc_ucr2_d = sc-sc_ucr2;
@@ -2280,15 +2283,16 @@ imxuart_common_putc(dev_t dev, struct im
* Initialize UART for use as console or KGDB line.
*/
int
-imxuart_init(struct imxuart_regs *regsp, int rate, tcflag_t cflag)
+imxuart_init(struct imxuart_regs *regsp, int rate, tcflag_t cflag, int domap)
{
struct imxuart_baudrate_ratio ratio;
int rfdiv = IMX_UFCR_DIVIDER_TO_RFDIV(imxuart_freqdiv);
uint32_t ufcr;
+ int error;
- if (bus_space_map(regsp-ur_iot, regsp-ur_iobase, IMX_UART_SIZE, 0,
- regsp-ur_ioh))
- return ENOMEM; /* ??? */
+ if (domap (error = bus_space_map(regsp-ur_iot, regsp-ur_iobase,
+ IMX_UART_SIZE, 0, regsp-ur_ioh)) != 0)
+ return error;
if (imxuspeed(rate, ratio) 0)
return EINVAL;
@@ -2355,7 +2359,7 @@ imxuart_cons_attach(bus_space_tag_t iot,
regs.ur_iot = iot;
regs.ur_iobase = iobase;
- res = imxuart_init(regs, rate, cflag);
+ res = imxuart_init(regs, rate, cflag, true);
if (res)
return (res);
@@ -2416,7 +2420,7 @@ imxuart_kgdb_attach(bus_space_tag_t iot,
imxu_kgdb_regs.ur_iot = iot;
imxu_kgdb_regs.ur_iobase = iobase;
- res = imxuart_init(imxu_kgdb_regs, rate, cflag);
+ res = imxuart_init(imxu_kgdb_regs, rate, cflag, true);
if (res)
return (res);
CVS commit: src/sys/arch/sun68k/stand/netboot
Module Name:src
Committed By: christos
Date: Wed Jul 29 08:52:22 UTC 2015
Modified Files:
src/sys/arch/sun68k/stand/netboot: conf.c
Log Message:
XXX: add missing symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sun68k/stand/netboot/conf.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/sun68k/stand/netboot/conf.c
diff -u src/sys/arch/sun68k/stand/netboot/conf.c:1.4 src/sys/arch/sun68k/stand/netboot/conf.c:1.5
--- src/sys/arch/sun68k/stand/netboot/conf.c:1.4 Mon Jan 12 02:01:00 2009
+++ src/sys/arch/sun68k/stand/netboot/conf.c Wed Jul 29 04:52:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.4 2009/01/12 07:01:00 tsutsui Exp $ */
+/* $NetBSD: conf.c,v 1.5 2015/07/29 08:52:22 christos Exp $ */
#include sys/types.h
#include netinet/in.h
@@ -18,6 +18,11 @@ struct devsw devsw[] = {
};
int ndevs = 1;
+struct netif_driver *netif_drivers[] = {
+ // XXX: Fixme
+};
+int n_netif_drivers = (sizeof(netif_drivers) / sizeof(netif_drivers[0]));
+
int
main(void)
{
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 29 06:10:10 UTC 2015
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
Added Files:
src/tests/net/arp: Makefile t_arp.sh
Log Message:
Add tests for ARP
To generate a diff of this commit:
cvs rdiff -u -r1.633 -r1.634 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.116 -r1.117 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r0 -r1.1 src/tests/net/arp/Makefile src/tests/net/arp/t_arp.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.633 src/distrib/sets/lists/tests/mi:1.634
--- src/distrib/sets/lists/tests/mi:1.633 Tue Jul 28 18:08:37 2015
+++ src/distrib/sets/lists/tests/mi Wed Jul 29 06:10:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.633 2015/07/28 18:08:37 christos Exp $
+# $NetBSD: mi,v 1.634 2015/07/29 06:10:09 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3098,6 +3098,10 @@
./usr/tests/net tests-net-tests compattestfile,atf
./usr/tests/net/Atffiletests-net-tests compattestfile,atf
./usr/tests/net/Kyuafile tests-net-tests compattestfile,atf,kyua
+./usr/tests/net/arptests-net-tests compattestfile,atf
+./usr/tests/net/arp/Atffile tests-net-tests atf,rump
+./usr/tests/net/arp/Kyuafile tests-net-tests atf,rump,kyua
+./usr/tests/net/arp/t_arp tests-net-tests atf,rump
./usr/tests/net/bpftests-net-tests compattestfile,atf
./usr/tests/net/bpf/Atffile tests-net-tests atf,rump
./usr/tests/net/bpf/Kyuafile tests-net-tests atf,rump,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.116 src/etc/mtree/NetBSD.dist.tests:1.117
--- src/etc/mtree/NetBSD.dist.tests:1.116 Tue Jan 6 03:26:05 2015
+++ src/etc/mtree/NetBSD.dist.tests Wed Jul 29 06:10:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.116 2015/01/06 03:26:05 christos Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.117 2015/07/29 06:10:10 ozaki-r Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -307,6 +307,7 @@
./usr/tests/libexec/ld.elf_so/h_helper_symver_dso2
./usr/tests/modules
./usr/tests/net
+./usr/tests/net/arp
./usr/tests/net/bpf
./usr/tests/net/bpfilter
./usr/tests/net/bpfjit
Added files:
Index: src/tests/net/arp/Makefile
diff -u /dev/null src/tests/net/arp/Makefile:1.1
--- /dev/null Wed Jul 29 06:10:10 2015
+++ src/tests/net/arp/Makefile Wed Jul 29 06:10:10 2015
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2015/07/29 06:10:10 ozaki-r Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/net/arp
+
+TESTS_SH= t_arp
+
+.include bsd.test.mk
Index: src/tests/net/arp/t_arp.sh
diff -u /dev/null src/tests/net/arp/t_arp.sh:1.1
--- /dev/null Wed Jul 29 06:10:10 2015
+++ src/tests/net/arp/t_arp.sh Wed Jul 29 06:10:10 2015
@@ -0,0 +1,238 @@
+# $NetBSD: t_arp.sh,v 1.1 2015/07/29 06:10:10 ozaki-r Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# 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.
+#
+
+inetserver=rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif
+HIJACKING=env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes
+
+SOCKSRC=unix://commsock1
+SOCKDST=unix://commsock2
+IP4SRC=10.0.1.1
+IP4DST=10.0.1.2
+
+DEBUG=false
+TIMEOUT=1
+
+atf_test_case cache_expiration_5s cleanup
+atf_test_case cache_expiration_10s cleanup
+atf_test_case command cleanup
+
+cache_expiration_5s_head()
+{
+ atf_set descr Tests for ARP cache expiration (5s)
+ atf_set require.progs rump_server
+}
+
+cache_expiration_10s_head()
+{
+ atf_set
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 29 06:07:36 UTC 2015
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
src/usr.sbin/arp: Makefile arp.c
Added Files:
src/usr.sbin/arp: arp_hostops.c arp_rumpops.c prog_ops.h
Log Message:
Introduce rump.arp
arp(8) uses RTM that requires that getpid(2) works correctly. Unfortunately
supporting getpid(2) in librumphijack will be tricky so that we rump-ify
arp(8) as well as ifconfig and route commands.
Suggested by pooka@.
To generate a diff of this commit:
cvs rdiff -u -r1.1104 -r1.1105 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/arp/Makefile
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/arp/arp.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/arp/arp_hostops.c \
src/usr.sbin/arp/arp_rumpops.c src/usr.sbin/arp/prog_ops.h
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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1104 src/distrib/sets/lists/base/mi:1.1105
--- src/distrib/sets/lists/base/mi:1.1104 Mon Jun 22 06:02:01 2015
+++ src/distrib/sets/lists/base/mi Wed Jul 29 06:07:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1104 2015/06/22 06:02:01 matt Exp $
+# $NetBSD: mi,v 1.1105 2015/07/29 06:07:35 ozaki-r Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -1819,6 +1819,7 @@
./usr/sbin/rtadvdbase-router-bin use_inet6
./usr/sbin/rtquerybase-netutil-bin
./usr/sbin/rtsoldbase-obsolete obsolete
+./usr/sbin/rump.arpbase-netutil-bin rump
./usr/sbin/rump.envstatbase-sysutil-bin rump
./usr/sbin/rump.powerdbase-sysutil-bin rump
./usr/sbin/rump.traceroute base-netutil-bin rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.121 src/distrib/sets/lists/debug/mi:1.122
--- src/distrib/sets/lists/debug/mi:1.121 Sat Jun 27 15:46:09 2015
+++ src/distrib/sets/lists/debug/mi Wed Jul 29 06:07:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.121 2015/06/27 15:46:09 matt Exp $
+# $NetBSD: mi,v 1.122 2015/07/29 06:07:35 ozaki-r Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
@@ -1202,6 +1202,7 @@
./usr/libdata/debug/usr/sbin/rtadvd.debug comp-router-debug use_inet6,debug
./usr/libdata/debug/usr/sbin/rtquery.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/rtsold.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/sbin/rump.arp.debug comp-netutil-debug debug,rump
./usr/libdata/debug/usr/sbin/rump.envstat.debug comp-sysutil-debug debug,rump
./usr/libdata/debug/usr/sbin/rump.powerd.debug comp-sysutil-debug debug,rump
./usr/libdata/debug/usr/sbin/rump.traceroute.debug comp-netutil-debug debug,rump
Index: src/usr.sbin/arp/Makefile
diff -u src/usr.sbin/arp/Makefile:1.11 src/usr.sbin/arp/Makefile:1.12
--- src/usr.sbin/arp/Makefile:1.11 Wed Apr 22 15:23:02 2009
+++ src/usr.sbin/arp/Makefile Wed Jul 29 06:07:35 2015
@@ -1,7 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2009/04/22 15:23:02 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/29 06:07:35 ozaki-r Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/18/94
-PROG= arp
-MAN= arp.4 arp.8
+.include bsd.own.mk
+
+RUMPPRG= arp
+MAN= arp.4 arp.8
+
+.PATH: ${.CURDIR}/../../lib/libc/net
+RUMPSRCS= getifaddrs.c getnameinfo.c
+.if (${MKRUMP} != no)
+CPPFLAGS+= -DRUMP_ACTION
+.endif
.include bsd.prog.mk
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.51 src/usr.sbin/arp/arp.c:1.52
--- src/usr.sbin/arp/arp.c:1.51 Fri Jun 7 17:18:33 2013
+++ src/usr.sbin/arp/arp.c Wed Jul 29 06:07:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.51 2013/06/07 17:18:33 christos Exp $ */
+/* $NetBSD: arp.c,v 1.52 2015/07/29 06:07:35 ozaki-r Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = @(#)arp.c 8.3 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: arp.c,v 1.51 2013/06/07 17:18:33 christos Exp $);
+__RCSID($NetBSD: arp.c,v 1.52 2015/07/29 06:07:35 ozaki-r Exp $);
#endif
#endif /* not lint */
@@ -76,6 +76,8 @@ __RCSID($NetBSD: arp.c,v 1.51 2013/06/0
#include unistd.h
#include ifaddrs.h
+#include prog_ops.h
+
static int is_llinfo(const struct sockaddr_dl *, int);
static int delete(const char *, const char *);
static void dump(uint32_t);
@@ -126,8 +128,6 @@ main(int argc, char **argv)
setprogname(argv[0]);
- pid = getpid();
-
while ((ch = getopt(argc, argv, andsfv)) != -1)
switch((char)ch) {
case 'a':
@@ -155,6 +155,11 @@ main(int argc, char **argv)
if (!op aflag)
op = 'a';
+ if (prog_init prog_init() == -1)
+ err(1, init failed);
+
+ pid = prog_getpid();
+
switch((char)op) {
case 'a':
dump(0);
@@ -232,7 +237,7 @@ getsocket(void)
{
if (s = 0)
return;
- s =
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Wed Jul 29 10:47:58 UTC 2015
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_dmac.c bcm2835_dwctwo.c
bcm2835_emmc.c bcm2835_intr.h bcm2835_mbox.c bcm2835_plcom.c
bcm2835_spi.c bcm2835_tmr.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm:
vchiq_kmod_netbsd.c
Log Message:
Expand the bcm2835_intr_establish inline.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/broadcom/bcm2835_dmac.c \
src/sys/arch/arm/broadcom/bcm2835_mbox.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c \
src/sys/arch/arm/broadcom/bcm2835_intr.h \
src/sys/arch/arm/broadcom/bcm2835_spi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_plcom.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_tmr.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.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/broadcom/bcm2835_dmac.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.9 src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.10
--- src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.9 Sun Sep 14 14:29:57 2014
+++ src/sys/arch/arm/broadcom/bcm2835_dmac.c Wed Jul 29 10:47:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.c,v 1.9 2014/09/14 14:29:57 jmcneill Exp $ */
+/* $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_ddb.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_dmac.c,v 1.9 2014/09/14 14:29:57 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -213,8 +213,8 @@ bcm_dmac_alloc(enum bcm_dmac_type type,
return NULL;
KASSERT(ch-ch_ih == NULL);
- ch-ch_ih = bcm2835_intr_establish(BCM2835_INT_DMA0 + ch-ch_index,
- ipl, bcm_dmac_intr, ch);
+ ch-ch_ih = intr_establish(BCM2835_INT_DMA0 + ch-ch_index,
+ IST_LEVEL, ipl, bcm_dmac_intr, ch);
if (ch-ch_ih == NULL) {
aprint_error_dev(sc-sc_dev,
failed to establish interrupt for DMA%d\n, ch-ch_index);
Index: src/sys/arch/arm/broadcom/bcm2835_mbox.c
diff -u src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.9 src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.10
--- src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.9 Wed Oct 15 06:57:27 2014
+++ src/sys/arch/arm/broadcom/bcm2835_mbox.c Wed Jul 29 10:47:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox.c,v 1.9 2014/10/15 06:57:27 skrll Exp $ */
+/* $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_mbox.c,v 1.9 2014/10/15 06:57:27 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -107,7 +107,7 @@ bcmmbox_attach(device_t parent, device_t
return;
}
- sc-sc_intrh = bcm2835_intr_establish(aaa-aaa_intr, IPL_VM,
+ sc-sc_intrh = intr_establish(aaa-aaa_intr, IST_LEVEL, IPL_VM,
bcmmbox_intr, sc);
if (sc-sc_intrh == NULL) {
aprint_error_dev(sc-sc_dev, unable to establish interrupt\n);
Index: src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.2 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.3
--- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.2 Tue Sep 2 14:55:56 2014
+++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Jul 29 10:47:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -130,7 +130,7 @@ bcmdwc2_attach(device_t parent, device_t
aprint_naive(: USB controller\n);
aprint_normal(: USB controller\n);
- sc-sc_ih = bcm2835_intr_establish(aaa-aaa_intr, IPL_SCHED,
+ sc-sc_ih = intr_establish(aaa-aaa_intr, IST_LEVEL, IPL_SCHED,
dwc2_intr, sc-sc_dwc2);
if (sc-sc_ih == NULL) {
Index: src/sys/arch/arm/broadcom/bcm2835_intr.h
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.h:1.2 src/sys/arch/arm/broadcom/bcm2835_intr.h:1.3
--- src/sys/arch/arm/broadcom/bcm2835_intr.h:1.2 Sun Apr 12 17:32:39 2015
+++ src/sys/arch/arm/broadcom/bcm2835_intr.h Wed Jul 29 10:47:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.h,v 1.2 2015/04/12 17:32:39 skrll Exp $ */
+/* $NetBSD:
CVS commit: src/tests/net
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 29 12:05:10 UTC 2015
Modified Files:
src/tests/net: Makefile
Log Message:
Add tests for ARP
Forgot to commit this. Should fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/net/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.23 src/tests/net/Makefile:1.24
--- src/tests/net/Makefile:1.23 Mon Jun 22 00:05:23 2015
+++ src/tests/net/Makefile Wed Jul 29 12:05:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.24 2015/07/29 12:05:10 ozaki-r Exp $
.include bsd.own.mk
@@ -6,7 +6,7 @@ TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass in_cksum net sys
.if (${MKRUMP} != no) !defined(BSD_MK_COMPAT_FILE)
-TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_bridge if_loop mcast
+TESTS_SUBDIRS+= arp bpf bpfilter carp icmp if if_bridge if_loop mcast
TESTS_SUBDIRS+= mpls npf route
.if (${MKSLJIT} != no)
TESTS_SUBDIRS+= bpfjit
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed Jul 29 12:11:32 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_sdhc.c
Log Message:
enable ADMA2 data transfer mode
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_sdhc.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/nvidia/tegra_sdhc.c
diff -u src/sys/arch/arm/nvidia/tegra_sdhc.c:1.8 src/sys/arch/arm/nvidia/tegra_sdhc.c:1.9
--- src/sys/arch/arm/nvidia/tegra_sdhc.c:1.8 Thu Jul 23 23:53:14 2015
+++ src/sys/arch/arm/nvidia/tegra_sdhc.c Wed Jul 29 12:11:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.8 2015/07/23 23:53:14 jmcneill Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.9 2015/07/29 12:11:32 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_sdhc.c,v 1.8 2015/07/23 23:53:14 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_sdhc.c,v 1.9 2015/07/29 12:11:32 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -95,7 +95,8 @@ tegra_sdhc_attach(device_t parent, devic
SDHC_FLAG_NO_CLKBASE |
SDHC_FLAG_NO_TIMEOUT |
SDHC_FLAG_SINGLE_POWER_WRITE |
- SDHC_FLAG_USE_DMA;
+ SDHC_FLAG_USE_DMA |
+ SDHC_FLAG_USE_ADMA2;
if (SDMMC_8BIT_P(loc-loc_port)) {
sc-sc.sc_flags |= SDHC_FLAG_8BIT_MODE;
}
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Wed Jul 29 12:11:14 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcreg.h sdhcvar.h
Log Message:
Add ADMA2 support, which enables scatter gather DMA for data transfers on
controllers that support it.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sdmmc/sdhcreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.62 src/sys/dev/sdmmc/sdhc.c:1.63
--- src/sys/dev/sdmmc/sdhc.c:1.62 Tue Jul 28 07:14:48 2015
+++ src/sys/dev/sdmmc/sdhc.c Wed Jul 29 12:11:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.62 2015/07/28 07:14:48 skrll Exp $ */
+/* $NetBSD: sdhc.c,v 1.63 2015/07/29 12:11:13 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.62 2015/07/28 07:14:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.63 2015/07/29 12:11:13 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -86,6 +86,13 @@ struct sdhc_host {
#define SHF_USE_4BIT_MODE 0x0002
#define SHF_USE_8BIT_MODE 0x0004
#define SHF_MODE_DMAEN 0x0008 /* needs SDHC_DMA_ENABLE in mode */
+#define SHF_USE_ADMA2_32 0x0010
+#define SHF_USE_ADMA2_64 0x0020
+#define SHF_USE_ADMA2_MASK 0x0030
+
+ bus_dmamap_t adma_map;
+ bus_dma_segment_t adma_segs[1];
+ void *adma2;
};
#define HDEVNAME(hp) (device_xname((hp)-sc-sc_dev))
@@ -246,6 +253,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
struct sdhc_host *hp;
uint32_t caps;
uint16_t sdhcver;
+ int error;
/* Allocate one more host structure. */
hp = malloc(sizeof(struct sdhc_host), M_DEVBUF, M_WAITOK|M_ZERO);
@@ -321,11 +329,30 @@ sdhc_host_found(struct sdhc_softc *sc, b
(ISSET(sc-sc_flags, SDHC_FLAG_USE_DMA
ISSET(caps, SDHC_DMA_SUPPORT {
SET(hp-flags, SHF_USE_DMA);
- if (!ISSET(sc-sc_flags, SDHC_FLAG_EXTERNAL_DMA) ||
- ISSET(sc-sc_flags, SDHC_FLAG_EXTDMA_DMAEN))
- SET(hp-flags, SHF_MODE_DMAEN);
- aprint_normal(, DMA);
+ if (ISSET(sc-sc_flags, SDHC_FLAG_USE_ADMA2)
+ ISSET(caps, SDHC_ADMA2_SUPP)) {
+ SET(hp-flags, SHF_MODE_DMAEN);
+ /*
+ * 64-bit mode was present in the 2.00 spec, removed
+ * from 3.00, and re-added in 4.00 with a different
+ * descriptor layout. We only support 2.00 and 3.00
+ * descriptors for now.
+ */
+ if (hp-specver == SDHC_SPEC_VERS_200
+ ISSET(caps, SDHC_64BIT_SYS_BUS)) {
+SET(hp-flags, SHF_USE_ADMA2_64);
+aprint_normal(, 64-bit ADMA2);
+ } else {
+SET(hp-flags, SHF_USE_ADMA2_32);
+aprint_normal(, 32-bit ADMA2);
+ }
+ } else {
+ if (!ISSET(sc-sc_flags, SDHC_FLAG_EXTERNAL_DMA) ||
+ ISSET(sc-sc_flags, SDHC_FLAG_EXTDMA_DMAEN))
+SET(hp-flags, SHF_MODE_DMAEN);
+ aprint_normal(, SDMA);
+ }
} else {
aprint_normal(, PIO);
}
@@ -417,6 +444,47 @@ sdhc_host_found(struct sdhc_softc *sc, b
aprint_normal(, %u byte blocks, hp-maxblklen);
aprint_normal(\n);
+ if (ISSET(hp-flags, SHF_USE_ADMA2_MASK)) {
+ int rseg;
+
+ /* Allocate ADMA2 descriptor memory */
+ error = bus_dmamem_alloc(sc-sc_dmat, PAGE_SIZE, PAGE_SIZE,
+ PAGE_SIZE, hp-adma_segs, 1, rseg, BUS_DMA_WAITOK);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ ADMA2 dmamem_alloc failed (%d)\n, error);
+ goto adma_done;
+ }
+ error = bus_dmamem_map(sc-sc_dmat, hp-adma_segs, rseg,
+ PAGE_SIZE, (void **)hp-adma2, BUS_DMA_WAITOK);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ ADMA2 dmamem_map failed (%d)\n, error);
+ goto adma_done;
+ }
+ error = bus_dmamap_create(sc-sc_dmat, PAGE_SIZE, 1, PAGE_SIZE,
+ 0, BUS_DMA_WAITOK, hp-adma_map);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ ADMA2 dmamap_create failed (%d)\n, error);
+ goto adma_done;
+ }
+ error = bus_dmamap_load(sc-sc_dmat, hp-adma_map,
+ hp-adma2, PAGE_SIZE, NULL,
+ BUS_DMA_WAITOK|BUS_DMA_WRITE);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ ADMA2 dmamap_load failed (%d)\n, error);
+ goto adma_done;
+ }
+
+ memset(hp-adma2, 0, PAGE_SIZE);
+
+adma_done:
+ if (error)
+ CLR(hp-flags, SHF_USE_ADMA2_MASK);
+ }
+
/*
* Attach the generic SD/MMC bus driver. (The bus driver must
* not invoke any chipset functions before it is attached.)
@@ -496,6 +564,12 @@ sdhc_detach(struct sdhc_softc *sc, int f
bus_space_unmap(hp-iot, hp-ioh, hp-ios);
hp-ios = 0;
}
+ if (ISSET(hp-flags, SHF_USE_ADMA2_MASK)) {
+ bus_dmamap_unload(sc-sc_dmat, hp-adma_map);
+ bus_dmamap_destroy(sc-sc_dmat, hp-adma_map);
+ bus_dmamem_unmap(sc-sc_dmat, hp-adma2, PAGE_SIZE);
+ bus_dmamem_free(sc-sc_dmat, hp-adma_segs, 1);
+ }
free(hp, M_DEVBUF);
sc-sc_host[n] = NULL;
}
@@ -1294,9 +1368,57 @@
CVS commit: src/tests/net/arp
Module Name:src
Committed By: ozaki-r
Date: Thu Jul 30 05:43:43 UTC 2015
Modified Files:
src/tests/net/arp: Makefile
Log Message:
Fix TESTS_SH assignment
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/arp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/arp/Makefile
diff -u src/tests/net/arp/Makefile:1.2 src/tests/net/arp/Makefile:1.3
--- src/tests/net/arp/Makefile:1.2 Thu Jul 30 02:52:53 2015
+++ src/tests/net/arp/Makefile Thu Jul 30 05:43:42 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/30 02:52:53 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/30 05:43:42 ozaki-r Exp $
#
.include bsd.own.mk
@@ -6,6 +6,6 @@
TESTSDIR= ${TESTSBASE}/net/arp
TESTS_SH= t_arp
-TESTS_SH= t_dad
+TESTS_SH+= t_dad
.include bsd.test.mk
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Jul 29 15:04:40 UTC 2015
Modified Files:
src/crypto/external/bsd/openssh/dist: auth2-chall.c
Log Message:
From FreeBSD:
A remote attacker may effectively bypass MaxAuthTries settings, which would
enable them to brute force passwords. [CVE-2015-5600]
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/auth2-chall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth2-chall.c
diff -u src/crypto/external/bsd/openssh/dist/auth2-chall.c:1.7 src/crypto/external/bsd/openssh/dist/auth2-chall.c:1.8
--- src/crypto/external/bsd/openssh/dist/auth2-chall.c:1.7 Fri Apr 3 19:58:19 2015
+++ src/crypto/external/bsd/openssh/dist/auth2-chall.c Wed Jul 29 11:04:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: auth2-chall.c,v 1.7 2015/04/03 23:58:19 christos Exp $ */
+/* $NetBSD: auth2-chall.c,v 1.8 2015/07/29 15:04:40 christos Exp $ */
/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include includes.h
-__RCSID($NetBSD: auth2-chall.c,v 1.7 2015/04/03 23:58:19 christos Exp $);
+__RCSID($NetBSD: auth2-chall.c,v 1.8 2015/07/29 15:04:40 christos Exp $);
#include sys/types.h
#include stdio.h
@@ -83,6 +83,7 @@ struct KbdintAuthctxt
void *ctxt;
KbdintDevice *device;
u_int nreq;
+ u_int devices_done;
};
#ifdef USE_PAM
@@ -170,11 +171,15 @@ kbdint_next_device(Authctxt *authctxt, K
if (len == 0)
break;
for (i = 0; devices[i]; i++) {
- if (!auth2_method_allowed(authctxt,
+ if ((kbdintctxt-devices_done (1 i)) != 0 ||
+ !auth2_method_allowed(authctxt,
keyboard-interactive, devices[i]-name))
continue;
- if (strncmp(kbdintctxt-devices, devices[i]-name, len) == 0)
+ if (strncmp(kbdintctxt-devices, devices[i]-name,
+ len) == 0) {
kbdintctxt-device = devices[i];
+kbdintctxt-devices_done |= 1 i;
+ }
}
t = kbdintctxt-devices;
kbdintctxt-devices = t[len] ? xstrdup(t+len+1) : NULL;
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed Jul 29 14:30:18 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_car.c
Log Message:
use utmip settings for 12MHz ref clk, not 13MHz
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/nvidia/tegra_car.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/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.24 src/sys/arch/arm/nvidia/tegra_car.c:1.25
--- src/sys/arch/arm/nvidia/tegra_car.c:1.24 Sat Jul 25 15:50:42 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Wed Jul 29 14:30:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.24 2015/07/25 15:50:42 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.25 2015/07/29 14:30:18 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_car.c,v 1.24 2015/07/25 15:50:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_car.c,v 1.25 2015/07/29 14:30:18 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -483,9 +483,9 @@ void
tegra_car_utmip_init(void)
{
const u_int enable_dly_count = 0x02;
- const u_int stable_count = 0x33;
- const u_int active_dly_count = 0x09;
- const u_int xtal_freq_count = 0x7f;
+ const u_int stable_count = 0x2f;
+ const u_int active_dly_count = 0x04;
+ const u_int xtal_freq_count = 0x76;
bus_space_tag_t bst;
bus_space_handle_t bsh;
CVS commit: src/sys/arch/sun68k/stand/netboot
Module Name:src
Committed By: tsutsui
Date: Wed Jul 29 14:32:54 UTC 2015
Modified Files:
src/sys/arch/sun68k/stand/netboot: conf.c
Log Message:
Revert incorrect and broken kludge. PR/50101
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sun68k/stand/netboot/conf.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/sun68k/stand/netboot/conf.c
diff -u src/sys/arch/sun68k/stand/netboot/conf.c:1.5 src/sys/arch/sun68k/stand/netboot/conf.c:1.6
--- src/sys/arch/sun68k/stand/netboot/conf.c:1.5 Wed Jul 29 08:52:22 2015
+++ src/sys/arch/sun68k/stand/netboot/conf.c Wed Jul 29 14:32:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.5 2015/07/29 08:52:22 christos Exp $ */
+/* $NetBSD: conf.c,v 1.6 2015/07/29 14:32:54 tsutsui Exp $ */
#include sys/types.h
#include netinet/in.h
@@ -18,11 +18,6 @@ struct devsw devsw[] = {
};
int ndevs = 1;
-struct netif_driver *netif_drivers[] = {
- // XXX: Fixme
-};
-int n_netif_drivers = (sizeof(netif_drivers) / sizeof(netif_drivers[0]));
-
int
main(void)
{
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Wed Jul 29 14:35:05 UTC 2015
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Revert rev 1.359 which broke libsa builds. PR/50101
To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.359 src/share/mk/bsd.lib.mk:1.360
--- src/share/mk/bsd.lib.mk:1.359 Mon Jul 20 12:20:26 2015
+++ src/share/mk/bsd.lib.mk Wed Jul 29 14:35:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.359 2015/07/20 12:20:26 joerg Exp $
+# $NetBSD: bsd.lib.mk,v 1.360 2015/07/29 14:35:04 tsutsui Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include bsd.init.mk
@@ -542,7 +542,7 @@ _INSTRANLIB=${empty(PRESERVE):?-a ${RAN
__archivebuild: .USE
${_MKTARGET_BUILD}
rm -f ${.TARGET}
- ${AR} ${_ARFL} ${.TARGET} ${.ALLSRC:M*o:O}
+ ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
.endif
.if !target(__archiveinstall)
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Wed Jul 29 14:22:49 UTC 2015
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_dmac.c bcm2835_dwctwo.c
bcm2835_emmc.c bcm2835_mbox.c bcm2835_plcom.c bcm2835_spi.c
bcm2835_tmr.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm:
vchiq_kmod_netbsd.c
Log Message:
When expanding an inline function make sure you get the argument order
correct!
Now there's no functional change to expanding bcm2835_intr_establish
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm2835_dmac.c \
src/sys/arch/arm/broadcom/bcm2835_mbox.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c \
src/sys/arch/arm/broadcom/bcm2835_spi.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_plcom.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/broadcom/bcm2835_tmr.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.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/broadcom/bcm2835_dmac.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.10 src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.11
--- src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.10 Wed Jul 29 10:47:58 2015
+++ src/sys/arch/arm/broadcom/bcm2835_dmac.c Wed Jul 29 14:22:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
+/* $NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_ddb.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -214,7 +214,7 @@ bcm_dmac_alloc(enum bcm_dmac_type type,
KASSERT(ch-ch_ih == NULL);
ch-ch_ih = intr_establish(BCM2835_INT_DMA0 + ch-ch_index,
- IST_LEVEL, ipl, bcm_dmac_intr, ch);
+ ipl, IST_LEVEL, bcm_dmac_intr, ch);
if (ch-ch_ih == NULL) {
aprint_error_dev(sc-sc_dev,
failed to establish interrupt for DMA%d\n, ch-ch_index);
Index: src/sys/arch/arm/broadcom/bcm2835_mbox.c
diff -u src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.10 src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.11
--- src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.10 Wed Jul 29 10:47:58 2015
+++ src/sys/arch/arm/broadcom/bcm2835_mbox.c Wed Jul 29 14:22:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
+/* $NetBSD: bcm2835_mbox.c,v 1.11 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_mbox.c,v 1.11 2015/07/29 14:22:49 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -107,7 +107,7 @@ bcmmbox_attach(device_t parent, device_t
return;
}
- sc-sc_intrh = intr_establish(aaa-aaa_intr, IST_LEVEL, IPL_VM,
+ sc-sc_intrh = intr_establish(aaa-aaa_intr, IPL_VM, IST_LEVEL,
bcmmbox_intr, sc);
if (sc-sc_intrh == NULL) {
aprint_error_dev(sc-sc_dev, unable to establish interrupt\n);
Index: src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.3 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.4
--- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.3 Wed Jul 29 10:47:58 2015
+++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Jul 29 14:22:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.4 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_dwctwo.c,v 1.4 2015/07/29 14:22:49 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -130,7 +130,7 @@ bcmdwc2_attach(device_t parent, device_t
aprint_naive(: USB controller\n);
aprint_normal(: USB controller\n);
- sc-sc_ih = intr_establish(aaa-aaa_intr, IST_LEVEL, IPL_SCHED,
+ sc-sc_ih = intr_establish(aaa-aaa_intr, IPL_SCHED, IST_LEVEL,
dwc2_intr, sc-sc_dwc2);
if (sc-sc_ih == NULL) {
Index: src/sys/arch/arm/broadcom/bcm2835_spi.c
diff -u src/sys/arch/arm/broadcom/bcm2835_spi.c:1.3 src/sys/arch/arm/broadcom/bcm2835_spi.c:1.4
--- src/sys/arch/arm/broadcom/bcm2835_spi.c:1.3 Wed Jul 29 10:47:58 2015
+++ src/sys/arch/arm/broadcom/bcm2835_spi.c Wed Jul 29 14:22:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_spi.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */
+/* $NetBSD: bcm2835_spi.c,v 1.4 2015/07/29 14:22:49 skrll
