CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Fri Apr 7 03:31:50 UTC 2017
Modified Files:
src/sys/netinet: ip_encap.c
Log Message:
Commit a forgotten change for "Prepare netipsec for rump-ification"
- Allow encapinit to be called twice (by ifinit and ipe4_attach)
- ifinit didn't call encapinit if IPSEC is enabled (ipe4_attach called
it instead), however, on a rump kernel ipe4_attach may not be called
even if IPSEC is enabled. So we need to allow ifinit to call it anyway
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/netinet/ip_encap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.62 src/sys/netinet/ip_encap.c:1.63
--- src/sys/netinet/ip_encap.c:1.62 Thu Dec 22 04:54:54 2016
+++ src/sys/netinet/ip_encap.c Fri Apr 7 03:31:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.c,v 1.62 2016/12/22 04:54:54 knakahara Exp $ */
+/* $NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $ */
/* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */
/*
@@ -68,7 +68,7 @@
#define USE_RADIX
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.62 2016/12/22 04:54:54 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -161,6 +161,7 @@ struct radix_node_head *encap_head[2]; /
static bool encap_head_updating = false;
#endif
+static bool encap_initialized = false;
/*
* must be done before other encap interfaces initialization.
*/
@@ -168,6 +169,9 @@ void
encapinit(void)
{
+ if (encap_initialized)
+ return;
+
encaptab.psz = pserialize_create();
encaptab.elem_class = psref_class_create("encapelem", IPL_SOFTNET);
if (encaptab.elem_class == NULL)
@@ -176,6 +180,8 @@ encapinit(void)
mutex_init(_whole.lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(_whole.cv, "ip_encap cv");
encap_whole.busy = NULL;
+
+ encap_initialized = true;
}
void
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Apr 6 20:55:03 UTC 2017
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
we can get calibration data from the kernel now
with this ( and a bunch of previous commits ) the touchscreen on my
Acer Aspire V5 works properly
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-input-ws/dist/src/ws.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-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.9 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.10
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.9 Tue Aug 16 06:29:28 2016
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Thu Apr 6 20:55:03 2017
@@ -283,32 +283,29 @@ wsPreInit12(InputDriverPtr drv, InputInf
pInfo->name);
}
-#ifndef __NetBSD__
if (priv->type == WSMOUSE_TYPE_TPANEL && priv->raw) {
+
if (ioctl(pInfo->fd, WSMOUSEIO_GCALIBCOORDS,
>coords) != 0) {
- xf86Msg(X_ERROR, "GCALIBCOORS failed %s\n",
+ xf86Msg(X_ERROR, "GCALIBCOORDS failed %s\n",
strerror(errno));
wsClose(pInfo);
rc = BadValue;
goto fail;
}
-
/* get default coordinate space from kernel */
priv->min_x = priv->coords.minx;
priv->max_x = priv->coords.maxx;
priv->min_y = priv->coords.miny;
priv->max_y = priv->coords.maxy;
} else {
-#endif
/* in calibrated mode, coordinate space, is screen coords */
priv->min_x = 0;
priv->max_x = screenInfo.screens[priv->screen_no]->width - 1;
priv->min_y = 0;
priv->max_y = screenInfo.screens[priv->screen_no]->height - 1;
-#ifndef __NetBSD__
}
-#endif
+
/* Allow options to override this */
priv->min_x = xf86SetIntOption(pInfo->options, "MinX", priv->min_x);
xf86Msg(X_INFO, "%s minimum x position: %d\n",
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: macallan
Date: Thu Apr 6 20:44:39 UTC 2017
Modified Files:
src/sys/dev/wscons: tpcalib.c
Log Message:
don't forget to store bounds rectangle in raw mode
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/wscons/tpcalib.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/wscons/tpcalib.c
diff -u src/sys/dev/wscons/tpcalib.c:1.11 src/sys/dev/wscons/tpcalib.c:1.12
--- src/sys/dev/wscons/tpcalib.c:1.11 Sun Mar 4 06:02:51 2007
+++ src/sys/dev/wscons/tpcalib.c Thu Apr 6 20:44:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tpcalib.c,v 1.11 2007/03/04 06:02:51 christos Exp $ */
+/* $NetBSD: tpcalib.c,v 1.12 2017/04/06 20:44:39 macallan Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.11 2007/03/04 06:02:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.12 2017/04/06 20:44:39 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_tpcalib.h"
@@ -101,7 +101,8 @@ tpcalib_ioctl(struct tpcalib_softc *sc,
d = (const struct wsmouse_calibcoords *)data;
if (d->samplelen == WSMOUSE_CALIBCOORDS_RESET) {
tpcalib_reset(sc);
- } else
+ }
+ if (d->samplelen > 0) {
if (mra_Y_AX1_BX2_C(>samples[0].x, s,
>samples[0].rawx, s,
>samples[0].rawy, s,
@@ -116,20 +117,21 @@ tpcalib_ioctl(struct tpcalib_softc *sc,
tpcalib_reset(sc);
return (EINVAL);
- } else {
-sc->sc_minx = d->minx;
-sc->sc_maxx = d->maxx;
-sc->sc_miny = d->miny;
-sc->sc_maxy = d->maxy;
-sc->sc_saved = *d;
-DPRINTF(("tpcalib: x=%d~%d y=%d~%d\n",
-sc->sc_minx, sc->sc_maxx,
-sc->sc_miny, sc->sc_maxy));
-DPRINTF(("tpcalib: Ax=%d Bx=%d Cx=%d\n",
-sc->sc_ax, sc->sc_bx, sc->sc_cx));
-DPRINTF(("tpcalib: Ay=%d By=%d Cy=%d\n",
-sc->sc_ay, sc->sc_by, sc->sc_cy));
}
+ }
+ sc->sc_minx = d->minx;
+ sc->sc_maxx = d->maxx;
+ sc->sc_miny = d->miny;
+ sc->sc_maxy = d->maxy;
+ sc->sc_saved = *d;
+ DPRINTF(("tpcalib: x=%d~%d y=%d~%d\n",
+ sc->sc_minx, sc->sc_maxx,
+ sc->sc_miny, sc->sc_maxy));
+ DPRINTF(("tpcalib: Ax=%d Bx=%d Cx=%d\n",
+ sc->sc_ax, sc->sc_bx, sc->sc_cx));
+ DPRINTF(("tpcalib: Ay=%d By=%d Cy=%d\n",
+ sc->sc_ay, sc->sc_by, sc->sc_cy));
+
break;
case WSMOUSEIO_GCALIBCOORDS:
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: macallan
Date: Thu Apr 6 20:06:44 UTC 2017
Modified Files:
src/sys/dev/usb: uts.c
Log Message:
add bug workaround for ELAN touchscreens
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/uts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.5 src/sys/dev/usb/uts.c:1.6
--- src/sys/dev/usb/uts.c:1.5 Wed Apr 27 19:35:17 2016
+++ src/sys/dev/usb/uts.c Thu Apr 6 20:06:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $ */
+/* $NetBSD: uts.c,v 1.6 2017/04/06 20:06:44 macallan Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.6 2017/04/06 20:06:44 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -205,9 +205,19 @@ uts_attach(device_t parent, device_t sel
/* requires HID usage Digitizer:In_Range */
if (!hid_locate(desc, size, HID_USAGE2(HUP_DIGITIZERS, HUD_IN_RANGE),
uha->reportid, hid_input, >sc_loc_z, )) {
- aprint_error_dev(sc->sc_hdev.sc_dev,
- "touchscreen has no range report\n");
- return;
+ if (uha->uiaa->uiaa_vendor == USB_VENDOR_ELAN) {
+ /*
+ * XXX
+ * ELAN touchscreens error out here but still return
+ * valid data
+ */
+ aprint_debug_dev(sc->sc_hdev.sc_dev,
+ "ELAN touchscreen found, workinmg around bug.\n");
+ } else {
+ aprint_error_dev(sc->sc_hdev.sc_dev,
+ "touchscreen has no range report\n");
+ return;
+ }
}
/* multi-touch support would need HUD_CONTACTID and HUD_CONTACTMAX */
@@ -233,22 +243,23 @@ uts_attach(device_t parent, device_t sel
sc->sc_calibcoords.maxy = 4095;
sc->sc_calibcoords.samplelen = WSMOUSE_CALIBCOORDS_RESET;
d = hid_start_parse(desc, size, hid_input);
- while (hid_get_item(d, )) {
- if (item.kind != hid_input
- || HID_GET_USAGE_PAGE(item.usage) != HUP_GENERIC_DESKTOP
- || item.report_ID != sc->sc_hdev.sc_report_id)
- continue;
- if (HID_GET_USAGE(item.usage) == HUG_X) {
- sc->sc_calibcoords.minx = item.logical_minimum;
- sc->sc_calibcoords.maxx = item.logical_maximum;
- }
- if (HID_GET_USAGE(item.usage) == HUG_Y) {
- sc->sc_calibcoords.miny = item.logical_minimum;
- sc->sc_calibcoords.maxy = item.logical_maximum;
+ if (d != NULL) {
+ while (hid_get_item(d, )) {
+ if (item.kind != hid_input
+ || HID_GET_USAGE_PAGE(item.usage) != HUP_GENERIC_DESKTOP
+ || item.report_ID != sc->sc_hdev.sc_report_id)
+continue;
+ if (HID_GET_USAGE(item.usage) == HUG_X) {
+sc->sc_calibcoords.minx = item.logical_minimum;
+sc->sc_calibcoords.maxx = item.logical_maximum;
+ }
+ if (HID_GET_USAGE(item.usage) == HUG_Y) {
+sc->sc_calibcoords.miny = item.logical_minimum;
+sc->sc_calibcoords.maxy = item.logical_maximum;
+ }
}
+ hid_end_parse(d);
}
- hid_end_parse(d);
-
tpcalib_init(>sc_tpcalib);
tpcalib_ioctl(>sc_tpcalib, WSMOUSEIO_SCALIBCOORDS,
(void *)>sc_calibcoords, 0, 0);
CVS commit: src/share/misc
Module Name:src Committed By: mbalmer Date: Thu Apr 6 19:53:36 UTC 2017 Modified Files: src/share/misc: airport Log Message: add Turukhansk airport To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.63 src/share/misc/airport:1.64 --- src/share/misc/airport:1.63 Wed Jun 8 04:25:31 2016 +++ src/share/misc/airport Thu Apr 6 19:53:36 2017 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.63 2016/06/08 04:25:31 kre Exp $ +# $NetBSD: airport,v 1.64 2017/04/06 19:53:36 mbalmer Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -7598,6 +7598,7 @@ THR:Theran (Qualeh Morgeh Airport), Iran THT:Tamchakett, Mauritania THU:Thule (Air Base), Greenland THV:York Airport, PA, USA +THX:Turukhansk, Krasnoyarsk Krai, Russia THY:Thohoyandou, Venda, South Africa THZ:Tahoua, Niger TIA:Tirana, Albania
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Thu Apr 6 16:30:10 UTC 2017 Modified Files: src/sys/dev/usb: usbdevs Log Message: add ELAN Microelectronics To generate a diff of this commit: cvs rdiff -u -r1.729 -r1.730 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.729 src/sys/dev/usb/usbdevs:1.730 --- src/sys/dev/usb/usbdevs:1.729 Sun Mar 5 19:21:17 2017 +++ src/sys/dev/usb/usbdevs Thu Apr 6 16:30:09 2017 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.729 2017/03/05 19:21:17 snj Exp $ +$NetBSD: usbdevs,v 1.730 2017/04/06 16:30:09 macallan Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -152,6 +152,7 @@ vendor SAMSUNG 0x04e8 Samsung Electroni vendor ANNABOOKS 0x04ed Annabooks vendor JVC 0x04f1 JVC vendor CHICONY 0x04f2 Chicony Electronics +vendor ELAN 0x04f3 ELAN Microelectronics vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor vendor AIPTEK2 0x04fc AIPTEK International
CVS commit: src/share/man/man9
Module Name:src Committed By: dholland Date: Thu Apr 6 15:57:23 UTC 2017 Modified Files: src/share/man/man9: kcopy.9 Log Message: Add missing .Sh RETURN VALUES To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/kcopy.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/kcopy.9 diff -u src/share/man/man9/kcopy.9:1.6 src/share/man/man9/kcopy.9:1.7 --- src/share/man/man9/kcopy.9:1.6 Wed Apr 30 13:10:58 2008 +++ src/share/man/man9/kcopy.9 Thu Apr 6 15:57:23 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: kcopy.9,v 1.6 2008/04/30 13:10:58 martin Exp $ +.\" $NetBSD: kcopy.9,v 1.7 2017/04/06 15:57:23 dholland Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 4, 2006 +.Dd April 6, 2017 .Dt KCOPY 9 .Os .Sh NAME @@ -51,6 +51,7 @@ aborting if a fatal page fault is encoun must save and restore the old fault handler since it is called by .Xr uiomove 9 , which may be in the path of servicing a non-fatal page fault. +.Sh RETURN VALUES .Fn kcopy returns 0 on success and an error number on failure. .Sh SEE ALSO
CVS commit: src
Module Name:src Committed By: wiz Date: Thu Apr 6 14:35:16 UTC 2017 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: pxaip.4 src/share/man/man4/man4.evbarm: Makefile Added Files: src/share/man/man4/man4.evbarm: gxio.4 Log Message: Add evbarm/gxio(4). Based on PR 52137 by Stephan Meisinger, with some man page improvements by myself. To generate a diff of this commit: cvs rdiff -u -r1.1551 -r1.1552 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/pxaip.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.evbarm/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.evbarm/gxio.4 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.1551 src/distrib/sets/lists/man/mi:1.1552 --- src/distrib/sets/lists/man/mi:1.1551 Mon Mar 6 13:14:25 2017 +++ src/distrib/sets/lists/man/mi Thu Apr 6 14:35:15 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1551 2017/03/06 13:14:25 maya Exp $ +# $NetBSD: mi,v 1.1552 2017/04/06 14:35:15 wiz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1068,6 +1068,7 @@ ./usr/share/man/cat4/evbarm/bcmgpio.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/cpsw.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/epgpio.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/gxio.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/intro.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/iopaau.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/iopwdog.0 man-sys-catman .cat @@ -4177,6 +4178,7 @@ ./usr/share/man/html4/evbarm/bcmgpio.html man-sys-htmlman html ./usr/share/man/html4/evbarm/cpsw.html man-sys-htmlman html ./usr/share/man/html4/evbarm/epgpio.html man-sys-htmlman html +./usr/share/man/html4/evbarm/gxio.html man-sys-htmlman html ./usr/share/man/html4/evbarm/intro.html man-sys-htmlman html ./usr/share/man/html4/evbarm/iopaau.html man-sys-htmlman html ./usr/share/man/html4/evbarm/iopwdog.html man-sys-htmlman html @@ -7058,6 +7060,7 @@ ./usr/share/man/man4/evbarm/bcmgpio.4 man-sys-man .man ./usr/share/man/man4/evbarm/cpsw.4 man-sys-man .man ./usr/share/man/man4/evbarm/epgpio.4 man-sys-man .man +./usr/share/man/man4/evbarm/gxio.4 man-sys-man .man ./usr/share/man/man4/evbarm/intro.4 man-sys-man .man ./usr/share/man/man4/evbarm/iopaau.4 man-sys-man .man ./usr/share/man/man4/evbarm/iopwdog.4 man-sys-man .man Index: src/share/man/man4/pxaip.4 diff -u src/share/man/man4/pxaip.4:1.3 src/share/man/man4/pxaip.4:1.4 --- src/share/man/man4/pxaip.4:1.3 Mon Mar 6 22:29:35 2017 +++ src/share/man/man4/pxaip.4 Thu Apr 6 14:35:15 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: pxaip.4,v 1.3 2017/03/06 22:29:35 wiz Exp $ +.\" $NetBSD: pxaip.4,v 1.4 2017/04/06 14:35:15 wiz Exp $ .\" .\" Copyright (c) 2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -82,6 +82,7 @@ Sharp Zaurus remote controller. .El .Sh SEE ALSO .Xr com 4 , +.Xr evbarm/gxio 4 , .Xr ohci 4 , .Xr sm 4 .Sh HISTORY Index: src/share/man/man4/man4.evbarm/Makefile diff -u src/share/man/man4/man4.evbarm/Makefile:1.6 src/share/man/man4/man4.evbarm/Makefile:1.7 --- src/share/man/man4/man4.evbarm/Makefile:1.6 Wed Apr 23 07:04:01 2014 +++ src/share/man/man4/man4.evbarm/Makefile Thu Apr 6 14:35:15 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2014/04/23 07:04:01 kardel Exp $ +# $NetBSD: Makefile,v 1.7 2017/04/06 14:35:15 wiz Exp $ -MAN= bcmgpio.4 cpsw.4 epgpio.4 intro.4 iopaau.4 iopwdog.4 +MAN= bcmgpio.4 cpsw.4 epgpio.4 gxio.4 intro.4 iopaau.4 iopwdog.4 MANSUBDIR=/evbarm Added files: Index: src/share/man/man4/man4.evbarm/gxio.4 diff -u /dev/null src/share/man/man4/man4.evbarm/gxio.4:1.1 --- /dev/null Thu Apr 6 14:35:16 2017 +++ src/share/man/man4/man4.evbarm/gxio.4 Thu Apr 6 14:35:15 2017 @@ -0,0 +1,143 @@ +.\" $NetBSD: gxio.4,v 1.1 2017/04/06 14:35:15 wiz Exp $ +.\" +.\" Copyright (c) 2017 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Takashi Kiyohara. +.\" +.\" 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 AUTHOR 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
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: christos
Date: Thu Apr 6 14:01:27 UTC 2017
Modified Files:
src/external/bsd/dhcpcd/dist/src: if-options.c
Log Message:
The last stderr message felt lonely and committed suicide.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcpcd/dist/src/if-options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/if-options.c
diff -u src/external/bsd/dhcpcd/dist/src/if-options.c:1.1.1.1 src/external/bsd/dhcpcd/dist/src/if-options.c:1.2
--- src/external/bsd/dhcpcd/dist/src/if-options.c:1.1.1.1 Fri Mar 31 16:51:16 2017
+++ src/external/bsd/dhcpcd/dist/src/if-options.c Thu Apr 6 10:01:27 2017
@@ -2138,8 +2138,8 @@ parse_config_line(struct dhcpcd_ctx *ctx
continue;
if (cf_options[i].has_arg == required_argument && !line) {
- fprintf(stderr,
- PACKAGE ": option requires an argument -- %s\n",
+ syslog(LOG_ERR,
+ PACKAGE ": option requires an argument -- %s",
opt);
return -1;
}
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src Committed By: christos Date: Thu Apr 6 14:00:34 UTC 2017 Modified Files: src/external/bsd/dhcpcd/dist/src: dhcpcd.c Log Message: transposition police! To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcpcd/dist/src/dhcpcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.1.1.1 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.2 --- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.1.1.1 Fri Mar 31 16:51:15 2017 +++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Thu Apr 6 10:00:34 2017 @@ -1494,7 +1494,7 @@ main(int argc, char **argv) #ifdef USE_SIGNALS case 'k': sig = SIGALRM; - siga = "ARLM"; + siga = "ALRM"; break; case 'n': sig = SIGHUP;
CVS commit: src
Module Name:src Committed By: abhinav Date: Thu Apr 6 10:46:52 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile Log Message: Add MLINKS for extent_alloc1(9) and extent_alloc_subregion1(9). To generate a diff of this commit: cvs rdiff -u -r1.2118 -r1.2119 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.406 -r1.407 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2118 src/distrib/sets/lists/comp/mi:1.2119 --- src/distrib/sets/lists/comp/mi:1.2118 Thu Apr 6 05:08:17 2017 +++ src/distrib/sets/lists/comp/mi Thu Apr 6 10:46:52 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2118 2017/04/06 05:08:17 kre Exp $ +# $NetBSD: mi,v 1.2119 2017/04/06 10:46:52 abhinav Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -10352,8 +10352,10 @@ ./usr/share/man/cat9/extattr.0 comp-sys-catman .cat ./usr/share/man/cat9/extent.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_alloc.0 comp-sys-catman .cat +./usr/share/man/cat9/extent_alloc1.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_alloc_region.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_alloc_subregion.0 comp-sys-catman .cat +./usr/share/man/cat9/extent_alloc_subregion1.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_create.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_destroy.0 comp-sys-catman .cat ./usr/share/man/cat9/extent_free.0 comp-sys-catman .cat @@ -17668,8 +17670,10 @@ ./usr/share/man/html9/extattr.html comp-sys-htmlman html ./usr/share/man/html9/extent.html comp-sys-htmlman html ./usr/share/man/html9/extent_alloc.html comp-sys-htmlman html +./usr/share/man/html9/extent_alloc1.html comp-sys-htmlman html ./usr/share/man/html9/extent_alloc_region.html comp-sys-htmlman html ./usr/share/man/html9/extent_alloc_subregion.html comp-sys-htmlman html +./usr/share/man/html9/extent_alloc_subregion1.html comp-sys-htmlman html ./usr/share/man/html9/extent_create.html comp-sys-htmlman html ./usr/share/man/html9/extent_destroy.html comp-sys-htmlman html ./usr/share/man/html9/extent_free.html comp-sys-htmlman html @@ -25128,8 +25132,10 @@ ./usr/share/man/man9/extattr.9 comp-sys-man .man ./usr/share/man/man9/extent.9 comp-sys-man .man ./usr/share/man/man9/extent_alloc.9 comp-sys-man .man +./usr/share/man/man9/extent_alloc1.9 comp-sys-man .man ./usr/share/man/man9/extent_alloc_region.9 comp-sys-man .man ./usr/share/man/man9/extent_alloc_subregion.9 comp-sys-man .man +./usr/share/man/man9/extent_alloc_subregion1.9 comp-sys-man .man ./usr/share/man/man9/extent_create.9 comp-sys-man .man ./usr/share/man/man9/extent_destroy.9 comp-sys-man .man ./usr/share/man/man9/extent_free.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.406 src/share/man/man9/Makefile:1.407 --- src/share/man/man9/Makefile:1.406 Thu Apr 6 02:24:51 2017 +++ src/share/man/man9/Makefile Thu Apr 6 10:46:52 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.406 2017/04/06 02:24:51 pgoyette Exp $ +# $NetBSD: Makefile,v 1.407 2017/04/06 10:46:52 abhinav Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -302,7 +302,8 @@ MLINKS+=evcnt.9 evcnt_attach_dynamic.9 e MLINKS+=extent.9 extent_create.9 extent.9 extent_destroy.9 \ extent.9 extent_alloc.9 extent.9 extent_alloc_subregion.9 \ extent.9 extent_alloc_region.9 extent.9 extent_free.9 \ - extent.9 extent_print.9 + extent.9 extent_print.9 extent.9 extent_alloc1.9 \ + extent.9 extent_alloc_subregion1.9 MLINKS+=fetch.9 fubyte.9 fetch.9 fuibyte.9 fetch.9 fusword.9 \ fetch.9 fuswintr.9 fetch.9 fuword.9 fetch.9 fuiword.9 MLINKS+=file.9 closef.9 \
CVS commit: src/share/man/man9
Module Name:src Committed By: abhinav Date: Thu Apr 6 10:42:15 UTC 2017 Modified Files: src/share/man/man9: extent.9 Log Message: Add extent_alloc1 and extent_alloc_subregion1 to the NAME section. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man9/extent.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/extent.9 diff -u src/share/man/man9/extent.9:1.32 src/share/man/man9/extent.9:1.33 --- src/share/man/man9/extent.9:1.32 Sat Jul 14 10:24:59 2012 +++ src/share/man/man9/extent.9 Thu Apr 6 10:42:14 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: extent.9,v 1.32 2012/07/14 10:24:59 rkujawa Exp $ +.\" $NetBSD: extent.9,v 1.33 2017/04/06 10:42:14 abhinav Exp $ .\" .\" Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -36,6 +36,8 @@ .Nm extent_destroy , .Nm extent_alloc , .Nm extent_alloc_subregion , +.Nm extent_alloc1 , +.Nm extent_alloc_subregion1 , .Nm extent_alloc_region , .Nm extent_free , .Nm extent_print
CVS commit: src/share/man/man9
Module Name:src Committed By: abhinav Date: Thu Apr 6 09:52:32 UTC 2017 Modified Files: src/share/man/man9: ubc.9 Log Message: Use Xr to refer uiomove(9) and kcopy(9) Add kcopy(9) to SEE ALSO as well To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/ubc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/ubc.9 diff -u src/share/man/man9/ubc.9:1.12 src/share/man/man9/ubc.9:1.13 --- src/share/man/man9/ubc.9:1.12 Thu Apr 6 09:41:05 2017 +++ src/share/man/man9/ubc.9 Thu Apr 6 09:52:32 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: ubc.9,v 1.12 2017/04/06 09:41:05 wiz Exp $ +.\" $NetBSD: ubc.9,v 1.13 2017/04/06 09:52:32 abhinav Exp $ .\" .\" Copyright (c) 1998 Matthew R. Green .\" All rights reserved. @@ -84,9 +84,9 @@ Makes sense only for write. .Pp Once the mapping is created, it must be accessed only by methods that can handle faults, such as -.Fn uiomove +.Xr uiomove 9 or -.Fn kcopy . +.Xr kcopy 9 . Page faults on the mapping will result in the object's pager method being called to resolve the fault. .Pp @@ -137,6 +137,7 @@ The subsystem is implemented within the file .Pa sys/uvm/uvm_bio.c . .Sh SEE ALSO +.Xr kcopy 9 , .Xr pmap 9 , .Xr uiomove 9 , .Xr uvm 9 ,
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu Apr 6 09:41:05 UTC 2017 Modified Files: src/share/man/man9: ubc.9 Log Message: Add missing word. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/ubc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/ubc.9 diff -u src/share/man/man9/ubc.9:1.11 src/share/man/man9/ubc.9:1.12 --- src/share/man/man9/ubc.9:1.11 Thu Apr 6 02:22:52 2017 +++ src/share/man/man9/ubc.9 Thu Apr 6 09:41:05 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: ubc.9,v 1.11 2017/04/06 02:22:52 pgoyette Exp $ +.\" $NetBSD: ubc.9,v 1.12 2017/04/06 09:41:05 wiz Exp $ .\" .\" Copyright (c) 1998 Matthew R. Green .\" All rights reserved. @@ -124,7 +124,7 @@ occurs mid-transfer. sets a range of bytes in a UVM object to zero. The .Fa flags -parameter takes the same arguments +parameter takes the same arguments as .Fn ubc_release . .Pp .Fn ubc_purge
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: knakahara
Date: Thu Apr 6 09:39:12 UTC 2017
Modified Files:
src/sys/opencrypto: crypto.c
Log Message:
fix build failure ALL
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/opencrypto/crypto.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.52 src/sys/opencrypto/crypto.c:1.53
--- src/sys/opencrypto/crypto.c:1.52 Wed Apr 5 08:51:04 2017
+++ src/sys/opencrypto/crypto.c Thu Apr 6 09:39:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.52 2017/04/05 08:51:04 knakahara Exp $ */
+/* $NetBSD: crypto.c,v 1.53 2017/04/06 09:39:12 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.52 2017/04/05 08:51:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.53 2017/04/06 09:39:12 knakahara Exp $");
#include
#include
@@ -420,7 +420,7 @@ crypto_newsession(u_int64_t *sid, struct
crypto_drivers[hid].cc_sessions++;
} else {
DPRINTF(("%s: crypto_drivers[%d].cc_newsession() failed. error=%d\n",
- __func__, hid, error));
+ __func__, hid, err));
}
goto done;
/*break;*/
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Thu Apr 6 09:20:07 UTC 2017 Modified Files: src/sys/net: if.c src/sys/netipsec: ipsec.c ipsec.h ipsec_input.c ipsec_netbsd.c ipsec_output.c key.c key_debug.c xform_ah.c xform_esp.c xform_ipcomp.c xform_ipip.c xform_tcp.c Log Message: Prepare netipsec for rump-ification - Include "opt_*.h" only if _KERNEL_OPT is defined - Allow encapinit to be called twice (by ifinit and ipe4_attach) - ifinit didn't call encapinit if IPSEC is enabled (ipe4_attach called it instead), however, on a rump kernel ipe4_attach may not be called even if IPSEC is enabled. So we need to allow ifinit to call it anyway - Setup sysctls in ipsec_attach explicitly instead of using SYSCTL_SETUP - Call ip6flow_invalidate_all in key_spdadd only if in6_present - It's possible that a rump kernel loads the ipsec library but not the inet6 library To generate a diff of this commit: cvs rdiff -u -r1.391 -r1.392 src/sys/net/if.c cvs rdiff -u -r1.70 -r1.71 src/sys/netipsec/ipsec.c cvs rdiff -u -r1.38 -r1.39 src/sys/netipsec/ipsec.h cvs rdiff -u -r1.37 -r1.38 src/sys/netipsec/ipsec_input.c cvs rdiff -u -r1.39 -r1.40 src/sys/netipsec/ipsec_netbsd.c cvs rdiff -u -r1.41 -r1.42 src/sys/netipsec/ipsec_output.c cvs rdiff -u -r1.103 -r1.104 src/sys/netipsec/key.c cvs rdiff -u -r1.13 -r1.14 src/sys/netipsec/key_debug.c cvs rdiff -u -r1.44 -r1.45 src/sys/netipsec/xform_ah.c cvs rdiff -u -r1.46 -r1.47 src/sys/netipsec/xform_esp.c cvs rdiff -u -r1.31 -r1.32 src/sys/netipsec/xform_ipcomp.c cvs rdiff -u -r1.42 -r1.43 src/sys/netipsec/xform_ipip.c cvs rdiff -u -r1.8 -r1.9 src/sys/netipsec/xform_tcp.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/net/if.c diff -u src/sys/net/if.c:1.391 src/sys/net/if.c:1.392 --- src/sys/net/if.c:1.391 Thu Apr 6 03:54:59 2017 +++ src/sys/net/if.c Thu Apr 6 09:20:07 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.391 2017/04/06 03:54:59 ozaki-r Exp $ */ +/* $NetBSD: if.c,v 1.392 2017/04/06 09:20:07 ozaki-r Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.391 2017/04/06 03:54:59 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.392 2017/04/06 09:20:07 ozaki-r Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -138,9 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.391 #include #include #include -#ifndef IPSEC #include -#endif #include #ifdef INET6 @@ -292,7 +290,7 @@ ifinit(void) if_sysctl_setup(NULL); -#if (defined(INET) || defined(INET6)) && !defined(IPSEC) +#if (defined(INET) || defined(INET6)) encapinit(); #endif Index: src/sys/netipsec/ipsec.c diff -u src/sys/netipsec/ipsec.c:1.70 src/sys/netipsec/ipsec.c:1.71 --- src/sys/netipsec/ipsec.c:1.70 Fri Mar 3 07:13:06 2017 +++ src/sys/netipsec/ipsec.c Thu Apr 6 09:20:07 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.70 2017/03/03 07:13:06 ozaki-r Exp $ */ +/* $NetBSD: ipsec.c,v 1.71 2017/04/06 09:20:07 ozaki-r Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -32,17 +32,19 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.70 2017/03/03 07:13:06 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.71 2017/04/06 09:20:07 ozaki-r Exp $"); /* * IPsec controller part. */ +#if defined(_KERNEL_OPT) #include "opt_inet.h" #ifdef __FreeBSD__ #include "opt_inet6.h" #endif #include "opt_ipsec.h" +#endif #include #include @@ -2524,6 +2526,11 @@ ipsec_attach(void) ipsecstat_percpu = percpu_alloc(sizeof(uint64_t) * IPSEC_NSTATS); + sysctl_net_inet_ipsec_setup(NULL); +#ifdef INET6 + sysctl_net_inet6_ipsec6_setup(NULL); +#endif + ah_attach(); esp_attach(); ipcomp_attach(); Index: src/sys/netipsec/ipsec.h diff -u src/sys/netipsec/ipsec.h:1.38 src/sys/netipsec/ipsec.h:1.39 --- src/sys/netipsec/ipsec.h:1.38 Fri Mar 3 07:13:06 2017 +++ src/sys/netipsec/ipsec.h Thu Apr 6 09:20:07 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.h,v 1.38 2017/03/03 07:13:06 ozaki-r Exp $ */ +/* $NetBSD: ipsec.h,v 1.39 2017/04/06 09:20:07 ozaki-r Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */ @@ -378,6 +378,12 @@ INITFN void ipe4_attach(void); INITFN void ipe4_attach(void); INITFN void tcpsignature_attach(void); -INITFN void ipsec_attach(void); +void ipsec_attach(void); + +void sysctl_net_inet_ipsec_setup(struct sysctllog **); +#ifdef INET6 +void sysctl_net_inet6_ipsec6_setup(struct sysctllog **); +#endif + #endif /* _KERNEL */ #endif /* !_NETIPSEC_IPSEC_H_ */ Index: src/sys/netipsec/ipsec_input.c diff -u src/sys/netipsec/ipsec_input.c:1.37
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Apr 6 08:57:02 UTC 2017
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Fix typos:
- s/Readness/Readiness/
- s/Presense/Presence/
- s/supportted/supported/
- s/Rquester/Requester/
- s/Check Enab/Check Enable/
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.171 src/sys/dev/pci/pci_subr.c:1.172
--- src/sys/dev/pci/pci_subr.c:1.171 Thu Mar 30 08:44:33 2017
+++ src/sys/dev/pci/pci_subr.c Thu Apr 6 08:57:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.171 2017/03/30 08:44:33 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.172 2017/04/06 08:57:01 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.171 2017/03/30 08:44:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.172 2017/04/06 08:57:01 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -778,7 +778,7 @@ pci_conf_print_common(
onoff("Interrupt disable", rval, PCI_COMMAND_INTERRUPT_DISABLE);
printf("Status register: 0x%04x\n", (rval >> 16) & 0x);
- onoff("Immediate Readness", rval, PCI_STATUS_IMMD_READNESS);
+ onoff("Immediate Readiness", rval, PCI_STATUS_IMMD_READNESS);
onoff2("Interrupt status", rval, PCI_STATUS_INT_STATUS, "active",
"inactive");
onoff("Capability List support", rval, PCI_STATUS_CAPLIST_SUPPORT);
@@ -1898,7 +1898,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
onoff("Attention Button Pressed Enabled", reg, PCIE_SLCSR_ABE);
onoff("Power Fault Detected Enabled", reg, PCIE_SLCSR_PFE);
onoff("MRL Sensor Changed Enabled", reg, PCIE_SLCSR_MSE);
- onoff("Presense Detect Changed Enabled", reg, PCIE_SLCSR_PDE);
+ onoff("Presence Detect Changed Enabled", reg, PCIE_SLCSR_PDE);
onoff("Command Completed Interrupt Enabled", reg,
PCIE_SLCSR_CCE);
onoff("Hot-Plug Interrupt Enabled", reg, PCIE_SLCSR_HPE);
@@ -1946,7 +1946,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
onoff("Attention Button Pressed", reg, PCIE_SLCSR_ABP);
onoff("Power Fault Detected", reg, PCIE_SLCSR_PFD);
onoff("MRL Sensor Changed", reg, PCIE_SLCSR_MSC);
- onoff("Presense Detect Changed", reg, PCIE_SLCSR_PDC);
+ onoff("Presence Detect Changed", reg, PCIE_SLCSR_PDC);
onoff("Command Completed", reg, PCIE_SLCSR_CC);
onoff("MRL Open", reg, PCIE_SLCSR_MS);
onoff("Card Present in slot", reg, PCIE_SLCSR_PDS);
@@ -2013,7 +2013,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
printf(" TPH Completer Supported: ");
switch (__SHIFTOUT(reg, PCIE_DCAP2_TPH_COMP)) {
case 0:
- printf("Not supportted\n");
+ printf("Not supported\n");
break;
case 1:
printf("TPH\n");
@@ -2086,7 +2086,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
pci_print_pcie_compl_timeout(reg & PCIE_DCSR2_COMPT_VAL);
onoff("Completion Timeout Disabled", reg, PCIE_DCSR2_COMPT_DIS);
onoff("ARI Forwarding Enabled", reg, PCIE_DCSR2_ARI_FWD);
- onoff("AtomicOp Rquester Enabled", reg, PCIE_DCSR2_ATOM_REQ);
+ onoff("AtomicOp Requester Enabled", reg, PCIE_DCSR2_ATOM_REQ);
onoff("AtomicOp Egress Blocking", reg, PCIE_DCSR2_ATOM_EBLK);
onoff("IDO Request Enabled", reg, PCIE_DCSR2_IDO_REQ);
onoff("IDO Completion Enabled", reg, PCIE_DCSR2_IDO_COMP);
@@ -2447,7 +2447,7 @@ pci_conf_print_aer_cap_control(pcireg_t
onoff("ECRC Generation Capable", reg, PCI_AER_ECRC_GEN_CAPABLE);
onoff("ECRC Generation Enable", reg, PCI_AER_ECRC_GEN_ENABLE);
onoff("ECRC Check Capable", reg, PCI_AER_ECRC_CHECK_CAPABLE);
- onoff("ECRC Check Enab", reg, PCI_AER_ECRC_CHECK_ENABLE);
+ onoff("ECRC Check Enable", reg, PCI_AER_ECRC_CHECK_ENABLE);
onoff("Multiple Header Recording Capable", reg,
PCI_AER_MULT_HDR_CAPABLE);
onoff("Multiple Header Recording Enable", reg,PCI_AER_MULT_HDR_ENABLE);
