CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 09:13:23 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: pseye.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.21.34.5 -r1.21.34.6 src/sys/dev/usb/pseye.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/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.21.34.5 src/sys/dev/usb/pseye.c:1.21.34.6
--- src/sys/dev/usb/pseye.c:1.21.34.5 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/pseye.c Sat Mar 21 09:13:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.21.34.5 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: pseye.c,v 1.21.34.6 2015/03/21 09:13:23 skrll Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill jmcne...@invisible.ca
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.21.34.5 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.21.34.6 2015/03/21 09:13:23 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -184,7 +184,7 @@ pseye_attach(device_t parent, device_t s
{
struct pseye_softc *sc = device_private(self);
struct usbif_attach_arg *uaa = opaque;
- struct usbd_device * dev = uaa-device;
+ struct usbd_device *dev = uaa-device;
usb_interface_descriptor_t *id = NULL;
usb_endpoint_descriptor_t *ed = NULL, *ed_bulkin = NULL;
char *devinfop;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Sat Mar 21 09:02:12 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 631 598 To generate a diff of this commit: cvs rdiff -u -r1.1.2.233 -r1.1.2.234 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.233 src/doc/CHANGES-7.0:1.1.2.234 --- src/doc/CHANGES-7.0:1.1.2.233 Thu Mar 19 16:50:43 2015 +++ src/doc/CHANGES-7.0 Sat Mar 21 09:02:12 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.233 2015/03/19 16:50:43 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.234 2015/03/21 09:02:12 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -18786,3 +18786,54 @@ crypto/external/bsd/openssl/dist/ssl/s2_ X509_to_X509_REQ NULL pointer deref (CVE-2015-0288) [spz, ticket #625] +sys/dev/wscons/wsconsio.h 1.112 via patch +sys/dev/wsfb/genfb.c1.57 + + add WSDISPLAY_TYPE_MESON + support 24bpp framebuffers + [jmcneill, ticket #631] + +sys/arch/arm/amlogic/amlogic_board.c up to 1.9 +sys/arch/arm/amlogic/amlogic_canvasreg.h 1.1 +sys/arch/arm/amlogic/amlogic_com.c up to 1.4 +sys/arch/arm/amlogic/amlogic_comreg.h up to 1.3 +sys/arch/arm/amlogic/amlogic_comvar.h: 1.1 +sys/arch/arm/amlogic/amlogic_cpufreq.c: up to 1.2 +sys/arch/arm/amlogic/amlogic_crureg.h up to 1.7 +sys/arch/arm/amlogic/amlogic_dwctwo.c up to 1.2 +sys/arch/arm/amlogic/amlogic_genfb.c 1.1 +sys/arch/arm/amlogic/amlogic_gmac.c up to 1.2 +sys/arch/arm/amlogic/amlogic_hdmireg.h 1.1 +sys/arch/arm/amlogic/amlogic_intr.h up to 1.5 +sys/arch/arm/amlogic/amlogic_io.c up to 1.7 +sys/arch/arm/amlogic/amlogic_reg.h up to 1.9 +sys/arch/arm/amlogic/amlogic_rng.c 1.1 +sys/arch/arm/amlogic/amlogic_sdhc.c up to 1.3 +sys/arch/arm/amlogic/amlogic_sdhcreg.h 1.1 +sys/arch/arm/amlogic/amlogic_space.c 1.1 +sys/arch/arm/amlogic/amlogic_var.h up to 1.8 +sys/arch/arm/amlogic/amlogic_vpureg.h 1.1 +sys/arch/arm/arm/bootconfig.c 1.7-1.8 +sys/arch/arm/conf/files.arm 1.129 +sys/arch/arm/cortex/pl310.c 1.16-1.17 +sys/arch/arm/cortex/a9_mpsubr.S 1.25-1.29 +sys/arch/arm/cortex/a9tmr.c 1.8-1.12 +sys/arch/arm/cortex/a9tmr_var.h 1.4 +sys/arch/arm/cortex/a9wdt.c 1.3-1.4 +sys/arch/arm/cortex/armperiph.c 1.5-1.7 +sys/arch/arm/arm/cpufunc.c 1.151 +sys/arch/arm/include/bootconfig.h 1.7 +sys/arch/arm/include/locore.h 1.19 +sys/arch/evbarm/amlogic/amlogic_machdep.c up to 1.17 +sys/arch/evbarm/amlogic/amlogic_start.S up to 1.2 +sys/arch/evbarm/amlogic/genassym.cf 1.1 +sys/arch/evbarm/amlogic/platform.h 1.1 +sys/arch/evbarm/conf/files.amlogic up to 1.8 +sys/arch/evbarm/conf/std.amlogic up to 1.2 +sys/arch/evbarm/conf/mk.amlogic 1.1 +sys/arch/evbarm/conf/ODROID-C1 up to 1.12 +sys/arch/evarm/conf/ODROID-C1_INSTALL 1.1 + + Add suport for ODROID-C1. + [jmcneill, ticket #598] +
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 10:14:46 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: slurm.c uatp.c ubt.c ukyopon.c uyurex.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.1.18.2 -r1.1.18.3 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.51.4.3 -r1.51.4.4 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.16.16.2 -r1.16.16.3 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.9.14.3 -r1.9.14.4 src/sys/dev/usb/uyurex.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/slurm.c
diff -u src/sys/dev/usb/slurm.c:1.1.18.2 src/sys/dev/usb/slurm.c:1.1.18.3
--- src/sys/dev/usb/slurm.c:1.1.18.2 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/slurm.c Sat Mar 21 10:14:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: slurm.c,v 1.1.18.2 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: slurm.c,v 1.1.18.3 2015/03/21 10:14:45 skrll Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: slurm.c,v 1.1.18.2 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: slurm.c,v 1.1.18.3 2015/03/21 10:14:45 skrll Exp $);
#include sys/param.h
#include sys/proc.h
@@ -102,7 +102,7 @@ static const struct radio_hw_if slurm_ra
CFATTACH_DECL_NEW(slurm, sizeof(struct slurm_softc),
slurm_match, slurm_attach, slurm_detach, NULL);
-static int
+static int
slurm_match(device_t parent, cfdata_t match, void *aux)
{
const struct usbif_attach_arg * const uaa = aux;
@@ -117,7 +117,7 @@ slurm_match(device_t parent, cfdata_t ma
return UMATCH_NONE;
}
-static void
+static void
slurm_attach(device_t parent, device_t self, void *aux)
{
struct slurm_softc * const sc = device_private(self);
@@ -145,7 +145,7 @@ slurm_attach(device_t parent, device_t s
radio_attach_mi(slurm_radio, sc, self);
}
-static int
+static int
slurm_detach(device_t self, int flags)
{
struct slurm_softc * const sc = device_private(self);
@@ -202,7 +202,7 @@ static int
slurm_search(void *v, int f)
{
struct slurm_softc * const sc = v;
-
+
return slurm_si470x_search(sc, f);
}
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.10.4.1 src/sys/dev/usb/uatp.c:1.10.4.2
--- src/sys/dev/usb/uatp.c:1.10.4.1 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/uatp.c Sat Mar 21 10:14:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.10.4.1 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: uatp.c,v 1.10.4.2 2015/03/21 10:14:45 skrll Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
* Apple's protocol gives more detailed sensor data that lets us detect
* multiple fingers to emulate multi-button mice and scroll wheels.
*/
-
+
/*
* Protocol
*
@@ -104,7 +104,7 @@
* Should make a struct uatp_motion for all that state.
* XXX Add hooks for ignoring trackpad input while typing.
*/
-
+
/*
* Classifying devices
*
@@ -144,9 +144,9 @@
* tweak hw.uatp0.x_sensors and hw.uatp0.y_sensors, up to a maximum
* of 32 for each value.
*/
-
+
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.10.4.1 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.10.4.2 2015/03/21 10:14:45 skrll Exp $);
#include sys/types.h
#include sys/param.h
@@ -179,7 +179,7 @@ __KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.1
fail; \
}\
} while (0)
-
+
#define UATP_DEBUG_ATTACH (1 0)
#define UATP_DEBUG_MISC (1 1)
#define UATP_DEBUG_WSMOUSE (1 2)
@@ -238,7 +238,7 @@ __KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.1
#define UATP_STATUS_BUTTON (1 0) /* Button pressed */
#define UATP_STATUS_BASE (1 2) /* Base sensor data */
#define UATP_STATUS_POST_RESET (1 4) /* Post-reset */
-
+
/* Forward declarations */
struct uatp_softc; /* Device driver state. */
@@ -340,7 +340,7 @@ static bool motion_below_threshold(struc
int, int);
static int accelerate(struct uatp_softc *, unsigned int, unsigned int,
unsigned int, unsigned int, bool, int *);
-
+
struct uatp_knobs {
/*
* Button emulation. What do we do when two or three fingers
@@ -408,7 +408,7 @@ struct uatp_knobs {
unsigned int three_finger_tap_buttons;
unsigned int tap_track_distance_limit;
};
-
+
static const struct uatp_knobs default_knobs = {
/*
* Button emulation. Fingers on the trackpad don't change it
@@ -473,7 +473,7 @@ static const struct uatp_knobs default_k
.three_finger_tap_buttons = 0,
.tap_track_distance_limit = 200,
};
-
+
struct uatp_softc {
struct uhidev sc_hdev; /* USB parent. */
device_t sc_wsmousedev; /* Attached wsmouse device. */
@@ -522,7 +522,7 @@ struct uatp_softc {
uint32_t sc_debug_flags; /* Debugging output enabled. */
#endif
};
-
+
struct uatp_descriptor {
uint16_t vendor;
uint16_t product;
@@ -559,7 +559,7 @@ struct uatp_parameters {
/* Called on
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 10:07:15 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: uyurex.c
Log Message:
Remove unnecessary attachment arg pointer dance.
To generate a diff of this commit:
cvs rdiff -u -r1.9.14.2 -r1.9.14.3 src/sys/dev/usb/uyurex.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/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.9.14.2 src/sys/dev/usb/uyurex.c:1.9.14.3
--- src/sys/dev/usb/uyurex.c:1.9.14.2 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/uyurex.c Sat Mar 21 10:07:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.9.14.2 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: uyurex.c,v 1.9.14.3 2015/03/21 10:07:15 skrll Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uyurex.c,v 1.9.14.2 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uyurex.c,v 1.9.14.3 2015/03/21 10:07:15 skrll Exp $);
#include sys/param.h
#include sys/proc.h
@@ -116,8 +116,7 @@ CFATTACH_DECL_NEW(uyurex, sizeof(struct
int
uyurex_match(device_t parent, cfdata_t match, void *aux)
{
- struct usb_attach_arg *uaa = aux;
- struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)uaa;
+ struct uhidev_attach_arg *uha = aux;
if (uyurex_lookup(uha-uaa-vendor, uha-uaa-product) == NULL)
return UMATCH_NONE;
@@ -129,8 +128,7 @@ void
uyurex_attach(device_t parent, device_t self, void *aux)
{
struct uyurex_softc *sc = device_private(self);
- struct usb_attach_arg *uaa = aux;
- struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)uaa;
+ struct uhidev_attach_arg *uha = aux;
struct usbd_device * dev = uha-parent-sc_udev;
int size, repid, err;
void *desc;
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src
Committed By: snj
Date: Sat Mar 21 16:58:31 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-7]: rgephy.c rgephyreg.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #624):
sys/dev/mii/rgephy.c: revision 1.38
sys/dev/mii/rgephyreg.h: revision 1.7
add RTL8211F support
To generate a diff of this commit:
cvs rdiff -u -r1.35.4.1 -r1.35.4.2 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.6 -r1.6.34.1 src/sys/dev/mii/rgephyreg.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/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.35.4.1 src/sys/dev/mii/rgephy.c:1.35.4.2
--- src/sys/dev/mii/rgephy.c:1.35.4.1 Sat Jan 17 13:50:57 2015
+++ src/sys/dev/mii/rgephy.c Sat Mar 21 16:58:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $ */
+/* $NetBSD: rgephy.c,v 1.35.4.2 2015/03/21 16:58:31 snj Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.35.4.2 2015/03/21 16:58:31 snj Exp $);
/*
@@ -303,7 +303,14 @@ rgephy_service(struct mii_softc *sc, str
* need to restart the autonegotiation process. Read
* the BMSR twice in case it's latched.
*/
- if (sc-mii_mpd_rev = 2) {
+ if (sc-mii_mpd_rev = 6) {
+ /* RTL8211F */
+ reg = PHY_READ(sc, RGEPHY_MII_PHYSR);
+ if (reg RGEPHY_PHYSR_LINK) {
+sc-mii_ticks = 0;
+break;
+ }
+ } else if (sc-mii_mpd_rev = 2) {
/* RTL8211B(L) */
reg = PHY_READ(sc, RGEPHY_MII_SSR);
if (reg RGEPHY_SSR_LINK) {
@@ -351,13 +358,17 @@ static void
rgephy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc-mii_pdata;
- int gstat, bmsr, bmcr;
+ int gstat, bmsr, bmcr, physr;
uint16_t ssr;
mii-mii_media_status = IFM_AVALID;
mii-mii_media_active = IFM_ETHER;
- if (sc-mii_mpd_rev = 2) {
+ if (sc-mii_mpd_rev = 6) {
+ physr = PHY_READ(sc, RGEPHY_MII_PHYSR);
+ if (physr RGEPHY_PHYSR_LINK)
+ mii-mii_media_status |= IFM_ACTIVE;
+ } else if (sc-mii_mpd_rev = 2) {
ssr = PHY_READ(sc, RGEPHY_MII_SSR);
if (ssr RGEPHY_SSR_LINK)
mii-mii_media_status |= IFM_ACTIVE;
@@ -387,7 +398,28 @@ rgephy_status(struct mii_softc *sc)
}
}
- if (sc-mii_mpd_rev = 2) {
+ if (sc-mii_mpd_rev = 6) {
+ physr = PHY_READ(sc, RGEPHY_MII_PHYSR);
+ switch (__SHIFTOUT(physr, RGEPHY_PHYSR_SPEED)) {
+ case RGEPHY_PHYSR_SPEED_1000:
+ mii-mii_media_active |= IFM_1000_T;
+ break;
+ case RGEPHY_PHYSR_SPEED_100:
+ mii-mii_media_active |= IFM_100_TX;
+ break;
+ case RGEPHY_PHYSR_SPEED_10:
+ mii-mii_media_active |= IFM_10_T;
+ break;
+ default:
+ mii-mii_media_active |= IFM_NONE;
+ break;
+ }
+ if (physr RGEPHY_PHYSR_DUPLEX)
+ mii-mii_media_active |= mii_phy_flowstatus(sc) |
+ IFM_FDX;
+ else
+ mii-mii_media_active |= IFM_HDX;
+ } else if (sc-mii_mpd_rev = 2) {
ssr = PHY_READ(sc, RGEPHY_MII_SSR);
switch (ssr RGEPHY_SSR_SPD_MASK) {
case RGEPHY_SSR_S1000:
Index: src/sys/dev/mii/rgephyreg.h
diff -u src/sys/dev/mii/rgephyreg.h:1.6 src/sys/dev/mii/rgephyreg.h:1.6.34.1
--- src/sys/dev/mii/rgephyreg.h:1.6 Sun Jul 18 03:00:39 2010
+++ src/sys/dev/mii/rgephyreg.h Sat Mar 21 16:58:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephyreg.h,v 1.6 2010/07/18 03:00:39 jakllsch Exp $ */
+/* $NetBSD: rgephyreg.h,v 1.6.34.1 2015/03/21 16:58:31 snj Exp $ */
/*
* Copyright (c) 2003
@@ -55,4 +55,22 @@
#define RGEPHY_SSR_ALDPS 0x0008 /* RTL8211C(L) only */
#define RGEPHY_SSR_JABBER 0x0001 /* Jabber */
+/* RTL8211F */
+#define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */
+#define RGEPHY_PHYSR_ALDPS __BIT(14)
+#define RGEPHY_PHYSR_MDI_PLUG __BIT(13)
+#define RGEPHY_PHYSR_NWAY_EN __BIT(12)
+#define RGEPHY_PHYSR_MASTER __BIT(11)
+#define RGEPHY_PHYSR_EEE __BIT(8)
+#define RGEPHY_PHYSR_RXFLOW_EN __BIT(7)
+#define RGEPHY_PHYSR_TXFLOW_EN __BIT(6)
+#define RGEPHY_PHYSR_SPEED __BITS(5,4)
+#define RGEPHY_PHYSR_SPEED_10 0
+#define RGEPHY_PHYSR_SPEED_100 1
+#define RGEPHY_PHYSR_SPEED_1000 2
+#define RGEPHY_PHYSR_DUPLEX __BIT(3)
+#define RGEPHY_PHYSR_LINK __BIT(2)
+#define RGEPHY_PHYSR_MDI_XOVER __BIT(1)
+#define RGEPHY_PHYSR_JABBER __BIT(0)
+
#endif /* _DEV_MII_RGEPHYREG_H_ */
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Sat Mar 21 17:11:35 UTC 2015 Modified Files: src/distrib/sets/lists/modules [netbsd-7]: md.amd64 md.evbppc.powerpc md.i386 mi src/sys/dev/i2c [netbsd-7]: au8522.c cx24227.c dbcool.c hytp14.c i2c_exec.c lg3303.c mt2131.c nxt2k.c sdtemp.c spdmem_i2c.c tvpll.c xc3028.c xc5k.c zl10353.c src/sys/modules [netbsd-7]: Makefile Added Files: src/sys/modules/i2cexec [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by jmcneill in ticket #634): distrib/sets/lists/modules/md.amd64: revision 1.51 distrib/sets/lists/modules/md.evbppc.powerpc: revision 1.5 distrib/sets/lists/modules/md.i386: revision 1.55 distrib/sets/lists/modules/mi: revision 1.71 sys/dev/i2c/au8522.c: revision 1.7 sys/dev/i2c/cx24227.c: revision 1.7 sys/dev/i2c/dbcool.c: revision 1.42 sys/dev/i2c/hytp14.c: revision 1.3 sys/dev/i2c/i2c_exec.c: revision 1.10 sys/dev/i2c/lg3303.c: revision 1.9 sys/dev/i2c/mt2131.c: revision 1.5 sys/dev/i2c/nxt2k.c: revision 1.4 sys/dev/i2c/sdtemp.c: revision 1.24 sys/dev/i2c/spdmem_i2c.c: revision 1.10 sys/dev/i2c/tvpll.c: revision 1.6 sys/dev/i2c/xc3028.c: revision 1.7 sys/dev/i2c/xc5k.c: revision 1.6 sys/dev/i2c/zl10353.c: revision 1.4 sys/modules/Makefile: revision 1.143 sys/modules/i2cexec/Makefile: revision 1.1 i2c devices don't actually have a dependency on iic (the bus driver) but on i2cexec. Create an i2cexec module (i2c_exec.c) to mirror the dependencies in files.i2c and switch device drivers to depend on i2cexec module instead. A kernel with a USB stack and no I2C controller / bus attachment would spit out a bunch of WARNING: module error: can't find builtin dependency `iic' messages at boot. This change solves that problem. To generate a diff of this commit: cvs rdiff -u -r1.41.2.2 -r1.41.2.3 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.3 -r1.3.4.1 src/distrib/sets/lists/modules/md.evbppc.powerpc cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.69 -r1.69.2.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.6 -r1.6.28.1 src/sys/dev/i2c/au8522.c cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/dev/i2c/cx24227.c cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/dev/i2c/dbcool.c cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/i2c/hytp14.c cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/dev/i2c/i2c_exec.c cvs rdiff -u -r1.8 -r1.8.28.1 src/sys/dev/i2c/lg3303.c cvs rdiff -u -r1.4 -r1.4.28.1 src/sys/dev/i2c/mt2131.c src/sys/dev/i2c/xc5k.c cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/dev/i2c/nxt2k.c \ src/sys/dev/i2c/zl10353.c cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/dev/i2c/sdtemp.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/i2c/spdmem_i2c.c cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dev/i2c/tvpll.c cvs rdiff -u -r1.5 -r1.5.28.1 src/sys/dev/i2c/xc3028.c cvs rdiff -u -r1.140.2.1 -r1.140.2.2 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/i2cexec/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/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.41.2.2 src/distrib/sets/lists/modules/md.amd64:1.41.2.3 --- src/distrib/sets/lists/modules/md.amd64:1.41.2.2 Sun Jan 11 05:59:16 2015 +++ src/distrib/sets/lists/modules/md.amd64 Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41.2.2 2015/01/11 05:59:16 snj Exp $ +# $NetBSD: md.amd64,v 1.41.2.3 2015/03/21 17:11:35 snj Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -330,6 +330,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms/i915drmkms.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/i2cexecbase-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axebase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axenbase-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/md.evbppc.powerpc diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1 --- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3 Sun May 18 18:28:48 2014 +++ src/distrib/sets/lists/modules/md.evbppc.powerpc Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc.powerpc,v 1.3 2014/05/18 18:28:48 jakllsch Exp $ +# $NetBSD:
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:30:43 UTC 2015
Modified Files:
src/sys/dev/usb [netbsd-7]: TODO.usbmp uatp.c ucycom.c uhid.c uhidev.c
uhidev.h ukbd.c uyurex.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #626):
sys/dev/usb/TODO.usbmp: revision 1.9
sys/dev/usb/uatp.c: revision 1.11
sys/dev/usb/ucycom.c: revision 1.42
sys/dev/usb/uhid.c: revision 1.93, 1.94
sys/dev/usb/uhidev.c: revision 1.63
sys/dev/usb/uhidev.h: revision 1.17
sys/dev/usb/ukbd.c: revision 1.130
sys/dev/usb/uyurex.c: revision 1.10
properly protect uhid's sc_q member with sc_lock. should fix PR#49728.
while here, remove D_MPSAFE from uhid* and all uhid users, as it really
needs all the callers to be safe and they're not.
--
don't take the device lock when stopping the uhidev. that calls
to abort and close pipes, both of which may take an adaptive lock.
fixes a LOCKDEBUG abort see on one particular machine.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/usb/ucycom.c
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.61.2.1 -r1.61.2.2 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/sys/dev/usb/uhidev.h
cvs rdiff -u -r1.129 -r1.129.4.1 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.9 -r1.9.12.1 src/sys/dev/usb/uyurex.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/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.8 src/sys/dev/usb/TODO.usbmp:1.8.2.1
--- src/sys/dev/usb/TODO.usbmp:1.8 Sat Aug 2 15:50:16 2014
+++ src/sys/dev/usb/TODO.usbmp Sat Mar 21 17:30:43 2015
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.8 2014/08/02 15:50:16 skrll Exp $
+$NetBSD: TODO.usbmp,v 1.8.2.1 2015/03/21 17:30:43 snj Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -41,8 +41,8 @@ convert uhidev users to MPSAFE:
- own cdevsw that isn't D_MPSAFE; need to check intr handlers
uhid(4)
- - needs some locking here (not completely tested changes)
- - done
+ - D_MPSAFE not set as all users need it first.
+ - mostly done
ukbd(4)
ums(4)
@@ -135,7 +135,7 @@ driver testing: STATUS
- ral
- rum
- run
- - urtw
+ - urtw working
- urtwn
- upgt
- zyd
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.10 src/sys/dev/usb/uatp.c:1.10.2.1
--- src/sys/dev/usb/uatp.c:1.10 Thu Jul 17 17:11:12 2014
+++ src/sys/dev/usb/uatp.c Sat Mar 21 17:30:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.10 2014/07/17 17:11:12 riastradh Exp $ */
+/* $NetBSD: uatp.c,v 1.10.2.1 2015/03/21 17:30:43 snj Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.10 2014/07/17 17:11:12 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.10.2.1 2015/03/21 17:30:43 snj Exp $);
#include sys/types.h
#include sys/param.h
@@ -1350,8 +1350,7 @@ geyser34_initialize(struct uatp_softc *s
DPRINTF(sc, UATP_DEBUG_MISC, (initializing\n));
geyser34_enable_raw_mode(sc);
- usb_init_task(sc-sc_reset_task, geyser34_reset_task, sc,
- USB_TASKQ_MPSAFE);
+ usb_init_task(sc-sc_reset_task, geyser34_reset_task, sc, 0);
}
static int
@@ -2012,7 +2011,7 @@ tap_debug(struct uatp_softc *sc, const c
static void
tap_initialize(struct uatp_softc *sc)
{
- callout_init(sc-sc_untap_callout, CALLOUT_MPSAFE);
+ callout_init(sc-sc_untap_callout, 0);
callout_setfunc(sc-sc_untap_callout, untap_callout, sc);
mutex_init(sc-sc_tap_mutex, MUTEX_DEFAULT, IPL_USB);
cv_init(sc-sc_tap_cv, uatptap);
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.39 src/sys/dev/usb/ucycom.c:1.39.2.1
--- src/sys/dev/usb/ucycom.c:1.39 Fri Jul 25 08:10:39 2014
+++ src/sys/dev/usb/ucycom.c Sat Mar 21 17:30:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.39 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: ucycom.c,v 1.39.2.1 2015/03/21 17:30:43 snj Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ucycom.c,v 1.39 2014/07/25 08:10:39 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ucycom.c,v 1.39.2.1 2015/03/21 17:30:43 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1124,9 +1124,14 @@ ucycom_get_cfg(struct ucycom_softc *sc)
Static void
ucycom_cleanup(struct ucycom_softc *sc)
{
+ uint8_t *obuf;
+
DPRINTF((ucycom_cleanup: closing uhidev\n));
- if (sc-sc_obuf !=NULL)
- free (sc-sc_obuf, M_USBDEV);
+ obuf = sc-sc_obuf;
+ sc-sc_obuf = NULL;
uhidev_close(sc-sc_hdev);
+
+ if (obuf != NULL)
+ free (obuf, M_USBDEV);
}
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.92 src/sys/dev/usb/uhid.c:1.92.2.1
---
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 15:28:10 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usb.c
Log Message:
Convert to USBHIST
To generate a diff of this commit:
cvs rdiff -u -r1.156.2.5 -r1.156.2.6 src/sys/dev/usb/usb.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/usb.c
diff -u src/sys/dev/usb/usb.c:1.156.2.5 src/sys/dev/usb/usb.c:1.156.2.6
--- src/sys/dev/usb/usb.c:1.156.2.5 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/usb.c Sat Mar 21 15:28:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.156.2.5 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.156.2.6 2015/03/21 15:28:10 skrll Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.156.2.5 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.156.2.6 2015/03/21 15:28:10 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_usb.h
@@ -85,9 +85,6 @@ USBHIST_DEFINE(usbhist);
#define USB_DEV_MINOR 255
#ifdef USB_DEBUG
-#define DPRINTF(x) if (usbdebug) printf x
-#define DPRINTFN(n,x) if (usbdebug(n)) printf x
-int usbdebug = 0;
/*
* 0 - do usual exploration
* 1 - do not use timeout exploration
@@ -95,6 +92,7 @@ int usbdebug = 0;
*/
int usb_noexplore = 0;
+int usbdebug = 0;
SYSCTL_SETUP(sysctl_hw_usb_setup, sysctl hw.usb setup)
{
int err;
@@ -121,13 +119,12 @@ SYSCTL_SETUP(sysctl_hw_usb_setup, sysct
fail:
aprint_error(%s: sysctl_createv failed (err = %d)\n, __func__, err);
}
-
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
#define usb_noexplore 0
#endif
+#define DPRINTF(FMT,A,B,C,D) USBHIST_LOG(usbdebug,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(usbdebug,N,FMT,A,B,C,D)
+
struct usb_softc {
#if 0
device_t sc_dev; /* base device */
@@ -223,7 +220,8 @@ static const char *taskq_names[] = USB_T
int
usb_match(device_t parent, cfdata_t match, void *aux)
{
- DPRINTF((usbd_match\n));
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
return UMATCH_GENERIC;
}
@@ -315,7 +313,7 @@ usb_doattach(device_t self)
int speed;
struct usb_event *ue;
- DPRINTF((usbd_doattach\n));
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
sc-sc_bus-ub_usbctl = self;
sc-sc_port.up_power = USB_MAX_POWER;
@@ -403,17 +401,19 @@ usb_add_task(struct usbd_device *dev, st
{
struct usb_taskq *taskq;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
KASSERT(0 = queue);
KASSERT(queue USB_NUM_TASKQS);
taskq = usb_taskq[queue];
mutex_enter(taskq-lock);
if (atomic_cas_uint(task-queue, USB_NUM_TASKQS, queue) ==
USB_NUM_TASKQS) {
- DPRINTFN(2,(usb_add_task: task=%p\n, task));
+ DPRINTFN(2, task=%p, task, 0, 0, 0);
TAILQ_INSERT_TAIL(taskq-tasks, task, next);
cv_signal(taskq-cv);
} else {
- DPRINTFN(3,(usb_add_task: task=%p on q\n, task));
+ DPRINTFN(2, task=%p on q, task, 0, 0, 0);
}
mutex_exit(taskq-lock);
}
@@ -427,6 +427,8 @@ usb_rem_task(struct usbd_device *dev, st
{
unsigned queue;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
while ((queue = task-queue) != USB_NUM_TASKQS) {
struct usb_taskq *taskq = usb_taskq[queue];
mutex_enter(taskq-lock);
@@ -445,7 +447,7 @@ usb_event_thread(void *arg)
{
struct usb_softc *sc = arg;
- DPRINTF((usb_event_thread: start\n));
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
/*
* In case this controller is a companion controller to an
@@ -472,7 +474,7 @@ usb_event_thread(void *arg)
cv_timedwait(sc-sc_bus-ub_needsexplore_cv,
sc-sc_bus-ub_lock, usb_noexplore ? 0 : hz * 60);
- DPRINTFN(2,(usb_event_thread: woke up\n));
+ DPRINTFN(2, sc %p woke up, sc, 0, 0, 0);
}
sc-sc_event_thread = NULL;
@@ -480,7 +482,7 @@ usb_event_thread(void *arg)
cv_signal(sc-sc_bus-ub_needsexplore_cv);
mutex_exit(sc-sc_bus-ub_lock);
- DPRINTF((usb_event_thread: exit\n));
+ DPRINTF(sc %p exit, sc, 0, 0, 0);
kthread_exit(0);
}
@@ -491,8 +493,10 @@ usb_task_thread(void *arg)
struct usb_taskq *taskq;
bool mpsafe;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
taskq = arg;
- DPRINTF((usb_task_thread: start taskq %s\n, taskq-name));
+ DPRINTF(start taskq %p, taskq, 0, 0, 0);
mutex_enter(taskq-lock);
for (;;) {
@@ -501,7 +505,7 @@ usb_task_thread(void *arg)
cv_wait(taskq-cv, taskq-lock);
task = TAILQ_FIRST(taskq-tasks);
}
- DPRINTFN(2,(usb_task_thread: woke up task=%p\n, task));
+ DPRINTFN(2, woke up task=%p, task, 0, 0, 0);
if (task != NULL) {
mpsafe = ISSET(task-flags, USB_TASKQ_MPSAFE);
TAILQ_REMOVE(taskq-tasks, task, next);
@@ -663,6 +667,8 @@ usbioctl(dev_t devt, u_long cmd, void *d
struct usb_softc *sc;
int unit = minor(devt);
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
if (unit == USB_DEV_MINOR) {
switch (cmd) {
case FIONBIO:
@@ -710,7 +716,7 @@ usbioctl(dev_t devt, u_long cmd, void *d
if (!(flag FWRITE))
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Sat Mar 21 16:42:17 UTC 2015
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Actually create the done files, and test them for existence.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.5 src/external/public-domain/tz/tzdata2netbsd:1.6
--- src/external/public-domain/tz/tzdata2netbsd:1.5 Sat Mar 21 15:51:20 2015
+++ src/external/public-domain/tz/tzdata2netbsd Sat Mar 21 16:42:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.5 2015/03/21 15:51:20 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.6 2015/03/21 16:42:17 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -271,7 +271,7 @@ editimportmsg()
cvsimport()
{
- if [ -s ${IMPORTDONEFILE} ]; then
+ if [ -e ${IMPORTDONEFILE} ]; then
cat 2 EOF
The CVS import has already been performed.
EOF
@@ -290,20 +290,21 @@ EOF
( cd ${EXTRACTDIR}
DOIT cvs -d ${CVSROOT} import -m $(cat ${IMPORTMSGFILE}) \
${REPODIR} ${CVSBRANCHTAG} ${CVSNEWTAG}
- )
+ ) touch ${IMPORTDONEFILE}
}
cvsmerge()
{
cd ${TZDISTDIR} || exit 1
- if [ -s ${MERGEDONEFILE} ]; then
+ if [ -e ${MERGEDONEFILE} ]; then
cat 2 EOF
The CVS merge has already been performed.
EOF
return 0
fi
- DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG}
+ DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG} \
+ touch ${MERGEDONEFILE}
}
resolveconflicts()
@@ -330,13 +331,14 @@ Not performing cvs commit.
EOF
return 1
fi
- if [ -s ${COMMITMERGEDONEFILE} ]; then
+ if [ -e ${COMMITMERGEDONEFILE} ]; then
cat 2 EOF
The CVS commmit (of the merge result) has already been performed.
EOF
return 0
fi
- DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER}
+ DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER} \
+ touch ${COMMITMERGEDONEFILE}
}
extra()
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 16:42:55 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c
Log Message:
G/C unused variable/code
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.45 -r1.234.2.46 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.45 src/sys/dev/usb/ehci.c:1.234.2.46
--- src/sys/dev/usb/ehci.c:1.234.2.45 Thu Mar 19 17:26:42 2015
+++ src/sys/dev/usb/ehci.c Sat Mar 21 16:42:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.45 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.46 2015/03/21 16:42:55 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.45 2015/03/19 17:26:42 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.46 2015/03/21 16:42:55 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -142,10 +142,6 @@ struct ehci_pipe {
struct {
u_int length;
} intr;
- /* Bulk pipe */
- struct {
- u_int length;
- } bulk;
/* Iso pipe */
struct {
u_int next_frame;
@@ -3735,8 +3731,6 @@ ehci_device_bulk_start(struct usbd_xfer
isread = UE_GET_DIR(endpt) == UE_DIR_IN;
sqh = epipe-sqh;
- epipe-u.bulk.length = len;
-
err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer, data,
dataend);
if (err) {
CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:32:13 UTC 2015
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: autoconf.c machdep.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #628):
sys/arch/sparc64/sparc64/autoconf.c: revision 1.202
sys/arch/sparc64/sparc64/machdep.c: revision 1.281
Reuse results of bootpath and bootargs from openfirmware
instead of calling openfirmware in each sysctl CPU_BOOT*.
This change reduces openfirmware calls from userland since sysctl
CPU_BOOTED_KERNEL is used in system commands such as pstat and
netstat.
To generate a diff of this commit:
cvs rdiff -u -r1.198.2.1 -r1.198.2.2 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.278.2.2 -r1.278.2.3 src/sys/arch/sparc64/sparc64/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.198.2.1 src/sys/arch/sparc64/sparc64/autoconf.c:1.198.2.2
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.198.2.1 Tue Aug 12 18:56:51 2014
+++ src/sys/arch/sparc64/sparc64/autoconf.c Sat Mar 21 17:32:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.198.2.1 2014/08/12 18:56:51 riz Exp $ */
+/* $NetBSD: autoconf.c,v 1.198.2.2 2015/03/21 17:32:13 snj Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.198.2.1 2014/08/12 18:56:51 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.198.2.2 2015/03/21 17:32:13 snj Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -145,6 +145,7 @@ int kgdb_break_at_attach;
char machine_banner[100];
char machine_model[100];
char ofbootpath[OFPATHLEN], *ofboottarget, *ofbootpartition;
+char ofbootargs[OFPATHLEN], *ofbootfile, *ofbootflags;
int ofbootpackage;
static int mbprint(void *, const char *);
@@ -417,8 +418,9 @@ get_bootpath_from_prom(void)
/* Setup pointer to boot flags */
if (OF_getprop(chosen, bootargs, sbuf, sizeof(sbuf)) == -1)
return;
+ strcpy(ofbootargs, sbuf);
- cp = sbuf;
+ cp = ofbootargs;
/* Find start of boot flags */
while (*cp) {
@@ -426,8 +428,12 @@ get_bootpath_from_prom(void)
if (*cp == '-' || *cp == '\0')
break;
while(*cp != ' ' *cp != '\t' *cp != '\0') cp++;
-
+ if (*cp != '\0')
+ *cp++ = '\0';
}
+ if (cp != ofbootargs)
+ ofbootfile = ofbootargs;
+ ofbootflags = cp;
if (*cp != '-')
return;
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.2 src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.3
--- src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.2 Mon Nov 10 17:59:57 2014
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat Mar 21 17:32:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.278.2.2 2014/11/10 17:59:57 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.278.2.3 2015/03/21 17:32:13 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.278.2.2 2014/11/10 17:59:57 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.278.2.3 2015/03/21 17:32:13 snj Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -295,59 +295,6 @@ setregs(struct lwp *l, struct exec_packa
#endif
}
-static char *parse_bootfile(char *);
-static char *parse_bootargs(char *);
-
-static char *
-parse_bootfile(char *args)
-{
- char *cp;
-
- /*
- * bootargs is of the form: [kernelname] [args...]
- * It can be the empty string if we booted from the default
- * kernel name.
- */
- cp = args;
- for (cp = args; *cp != 0 *cp != ' ' *cp != '\t'; cp++) {
- if (*cp == '-') {
- int c;
- /*
- * If this `-' is most likely the start of boot
- * options, we're done.
- */
- if (cp == args)
-break;
- if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
- }
- }
- /* Now we've separated out the kernel name from the args */
- *cp = '\0';
- return (args);
-}
-
-static char *
-parse_bootargs(char *args)
-{
- char *cp;
-
- for (cp = args; *cp != '\0'; cp++) {
- if (*cp == '-') {
- int c;
- /*
- * Looks like options start here, but check this
- * `-' is not part of the kernel name.
- */
- if (cp == args)
-break;
- if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
- }
- }
- return (cp);
-}
-
/*
* machine dependent system variables.
*/
@@ -355,31 +302,28 @@ static int
sysctl_machdep_boot(SYSCTLFN_ARGS)
{
struct sysctlnode node = *rnode;
- u_int chosen;
- char bootargs[256];
- const char *cp;
-
- if ((chosen = OF_finddevice(/chosen)) == -1)
- return (ENOENT);
- if (node.sysctl_num == CPU_BOOTED_DEVICE)
- cp = bootpath;
- else
- cp = bootargs;
- if (OF_getprop(chosen, cp, bootargs, sizeof bootargs) 0)
- return (ENOENT);
+ char bootpath[256];
+ const char *cp = NULL;
+ extern char ofbootpath[], *ofbootpartition, *ofbootfile,
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:49:03 UTC 2015
Modified Files:
src/sys/net/npf [netbsd-7]: npf_ctl.c npf_ruleset.c
src/usr.sbin/npf/npfctl [netbsd-7]: npf_build.c npf_show.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #630):
sys/net/npf/npf_ctl.c: revision 1.41
sys/net/npf/npf_ruleset.c: revision 1.42
usr.sbin/npf/npfctl/npf_build.c: revision 1.39
usr.sbin/npf/npfctl/npf_show.c: revision 1.18
NPF: replace the TAILQ of the dynamic rules with a linked list and fix the
inheriting of the active dynamic rules during the reload; also, fix a bug
in the insert path by putting a memory barrier in the right place.
--
npfctl:
- Fix the filter criteria when to/from is omitted but port used.
- Print more user-friendly error if an NPF table has a duplicate entry.
To generate a diff of this commit:
cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.37.2.3 -r1.37.2.4 src/sys/net/npf/npf_ruleset.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/usr.sbin/npf/npfctl/npf_show.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/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.38.2.1 src/sys/net/npf/npf_ctl.c:1.38.2.2
--- src/sys/net/npf/npf_ctl.c:1.38.2.1 Fri Aug 29 11:14:14 2014
+++ src/sys/net/npf/npf_ctl.c Sat Mar 21 17:49:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.38.2.1 2014/08/29 11:14:14 martin Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.38.2.2 2015/03/21 17:49:03 snj Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_ctl.c,v 1.38.2.1 2014/08/29 11:14:14 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_ctl.c,v 1.38.2.2 2015/03/21 17:49:03 snj Exp $);
#include sys/param.h
#include sys/conf.h
@@ -778,6 +778,9 @@ npfctl_rule(u_long cmd, void *data)
}
case NPF_CMD_RULE_LIST: {
retdict = npf_ruleset_list(rlset, ruleset_name);
+ if (!retdict) {
+ error = ESRCH;
+ }
break;
}
case NPF_CMD_RULE_FLUSH: {
@@ -797,6 +800,7 @@ npfctl_rule(u_long cmd, void *data)
npf_config_exit();
if (rl) {
+ KASSERT(error);
npf_rule_free(rl);
}
out:
Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.37.2.3 src/sys/net/npf/npf_ruleset.c:1.37.2.4
--- src/sys/net/npf/npf_ruleset.c:1.37.2.3 Wed Feb 4 07:13:04 2015
+++ src/sys/net/npf/npf_ruleset.c Sat Mar 21 17:49:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ruleset.c,v 1.37.2.3 2015/02/04 07:13:04 snj Exp $ */
+/* $NetBSD: npf_ruleset.c,v 1.37.2.4 2015/03/21 17:49:03 snj Exp $ */
/*-
* Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_ruleset.c,v 1.37.2.3 2015/02/04 07:13:04 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_ruleset.c,v 1.37.2.4 2015/03/21 17:49:03 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -89,21 +89,24 @@ struct npf_rule {
npf_natpolicy_t * r_natp;
npf_rproc_t * r_rproc;
- /* Rule priority: (highest) 1, 2 ... n (lowest). */
- pri_t r_priority;
-
- /*
- * Dynamic group: subset queue and a dynamic group list entry.
- * Dynamic rule: entry and the parent rule (the group).
- */
union {
- TAILQ_HEAD(npf_ruleq, npf_rule) r_subset;
- TAILQ_ENTRY(npf_rule) r_entry;
- } /* C11 */;
- union {
- LIST_ENTRY(npf_rule) r_dentry;
- npf_rule_t * r_parent;
- } /* C11 */;
+ /*
+ * Dynamic group: rule subset and a group list entry.
+ */
+ struct {
+ npf_rule_t * r_subset;
+ LIST_ENTRY(npf_rule) r_dentry;
+ };
+
+ /*
+ * Dynamic rule: priority, parent group and next rule.
+ */
+ struct {
+ int r_priority;
+ npf_rule_t * r_parent;
+ npf_rule_t * r_next;
+ };
+ };
/* Rule ID, name and the optional key. */
uint64_t r_id;
@@ -147,19 +150,6 @@ npf_ruleset_create(size_t slots)
return rlset;
}
-static void
-npf_ruleset_unlink(npf_ruleset_t *rlset, npf_rule_t *rl)
-{
- if (NPF_DYNAMIC_GROUP_P(rl-r_attr)) {
- LIST_REMOVE(rl, r_dentry);
- }
- if (NPF_DYNAMIC_RULE_P(rl-r_attr)) {
- npf_rule_t *rg = rl-r_parent;
- TAILQ_REMOVE(rg-r_subset, rl, r_entry);
- }
- LIST_REMOVE(rl, r_aentry);
-}
-
void
npf_ruleset_destroy(npf_ruleset_t *rlset)
{
@@ -167,7 +157,19 @@ npf_ruleset_destroy(npf_ruleset_t *rlset
npf_rule_t *rl;
while ((rl = LIST_FIRST(rlset-rs_all)) != NULL) {
- npf_ruleset_unlink(rlset, rl);
+ if (NPF_DYNAMIC_GROUP_P(rl-r_attr)) {
+ /*
+ * Note: r_subset may point to the rules which
+ * were inherited by a new ruleset.
+ */
+ rl-r_subset = NULL;
+ LIST_REMOVE(rl, r_dentry);
+ }
+ if (NPF_DYNAMIC_RULE_P(rl-r_attr)) {
+ /* Not removing from r_subset, see above. */
+ KASSERT(rl-r_parent != NULL);
+ }
+ LIST_REMOVE(rl, r_aentry);
npf_rule_free(rl);
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Sat Mar 21 17:56:02 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: tickets 621, 624, 626-630, 632-634. To generate a diff of this commit: cvs rdiff -u -r1.1.2.234 -r1.1.2.235 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.234 src/doc/CHANGES-7.0:1.1.2.235 --- src/doc/CHANGES-7.0:1.1.2.234 Sat Mar 21 09:02:12 2015 +++ src/doc/CHANGES-7.0 Sat Mar 21 17:56:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.234 2015/03/21 09:02:12 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.235 2015/03/21 17:56:02 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -18837,3 +18837,103 @@ sys/arch/evarm/conf/ODROID-C1_INSTALL 1 Add suport for ODROID-C1. [jmcneill, ticket #598] +sys/dev/mii/rgephy.c1.38 +sys/dev/mii/rgephyreg.h1.7 + + Add RTL8211F support. + [jmcneill, ticket #624] + +distrib/sets/lists/modules/md.amd64 1.51 +distrib/sets/lists/modules/md.evbppc.powerpc 1.5 +distrib/sets/lists/modules/md.i386 1.55 +distrib/sets/lists/modules/mi 1.71 +sys/dev/i2c/au8522.c1.7 +sys/dev/i2c/cx24227.c1.7 +sys/dev/i2c/dbcool.c1.42 +sys/dev/i2c/hytp14.c1.3 +sys/dev/i2c/i2c_exec.c1.10 +sys/dev/i2c/lg3303.c1.9 +sys/dev/i2c/mt2131.c1.5 +sys/dev/i2c/nxt2k.c1.4 +sys/dev/i2c/sdtemp.c1.24 +sys/dev/i2c/spdmem_i2c.c 1.10 +sys/dev/i2c/tvpll.c1.6 +sys/dev/i2c/xc3028.c1.7 +sys/dev/i2c/xc5k.c1.6 +sys/dev/i2c/zl10353.c1.4 +sys/modules/Makefile1.143 +sys/modules/i2cexec/Makefile 1.1 + + Create an i2cexec module (i2c_exec.c) to mirror the dependencies + in files.i2c and switch device drivers to depend on i2cexec + module instead. + [jmcneill, ticket #634] + +sys/arch/arm/vfp/vfp_init.c 1.43-1.46 + + Don't try to catch undefined VFP instructions if we own the + FPU. Let them raise SIGILL. PR 49754. + [martin, ticket #621] + +sys/arch/arm/cortex/gic.c 1.16 + + Remove trailing whitespace + [skrll, ticket #627] + +sys/dev/usb/TODO.usbmp1.9 +sys/dev/usb/uatp.c1.11 +sys/dev/usb/ucycom.c1.42 +sys/dev/usb/uhid.c1.93, 1.94 +sys/dev/usb/uhidev.c1.63 +sys/dev/usb/uhidev.h1.17 +sys/dev/usb/ukbd.c1.130 +sys/dev/usb/uyurex.c1.10 + + Properly protect uhid's sc_q member with sc_lock. PR 49728. + Remove D_MPSAFE from uhid* and all uhid users, as it really + needs all the callers to be safe and they're not. + Don't take the device lock when stopping the uhidev. That calls + to abort and close pipes, both of which may take an adaptive lock. + [mrg, ticket #626] + +sys/arch/sparc64/sparc64/autoconf.c 1.202 +sys/arch/sparc64/sparc64/machdep.c 1.281 + + Reuse results of bootpath and bootargs from openfirmware + instead of calling openfirmware in each sysctl CPU_BOOT*. + [nakayama, ticket #628] + +sys/dev/pckbport/synaptics.c 1.33 + + Fix clickpad button detection. PR 49767. + [nonaka, ticket #629] + +sys/net/npf/npf_ctl.c1.41 +sys/net/npf/npf_ruleset.c 1.42 +usr.sbin/npf/npfctl/npf_build.c 1.39 +usr.sbin/npf/npfctl/npf_show.c 1.18 + + NPF: replace the TAILQ of the dynamic rules with a linked list + and fix the inheriting of the active dynamic rules during the + reload; also, fix a bug in the insert path by putting a memory + barrier in the right place. + npfctl: + - Fix the filter criteria when to/from is omitted but port used. + - Print more user-friendly error if an NPF table has a duplicate + entry. + [rmind, ticket #630] + +lib/libc/arch/arm/gen/flt_rounds.c 1.5 +lib/libc/arch/mips/gen/flt_rounds.c 1.9 +lib/libc/arch/powerpc/gen/flt_rounds.c 1.12 +lib/libc/arch/powerpc64/gen/flt_rounds.c 1.2 +lib/libc/arch/sh3/gen/flt_rounds.c 1.6 + + Call libc's fpgetround. + [joerg, ticket #632] + +sys/arch/arm/include/mcontext.h 1.17 + + Ensure _lwp_setcontext gets consistent language binding. + [joerg, ticket #633] +
CVS commit: [netbsd-7] src/sys/dev
Module Name:src
Committed By: snj
Date: Sat Mar 21 08:46:05 UTC 2015
Modified Files:
src/sys/dev/wscons [netbsd-7]: wsconsio.h
src/sys/dev/wsfb [netbsd-7]: genfb.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #631):
sys/dev/wscons/wsconsio.h: revision 1.112 via patch
sys/dev/wsfb/genfb.c: revision 1.57
add WSDISPLAY_TYPE_MESON
--
support 24bpp framebuffers
To generate a diff of this commit:
cvs rdiff -u -r1.108.10.1 -r1.108.10.2 src/sys/dev/wscons/wsconsio.h
cvs rdiff -u -r1.55.2.1 -r1.55.2.2 src/sys/dev/wsfb/genfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.108.10.1 src/sys/dev/wscons/wsconsio.h:1.108.10.2
--- src/sys/dev/wscons/wsconsio.h:1.108.10.1 Fri Nov 14 13:26:46 2014
+++ src/sys/dev/wscons/wsconsio.h Sat Mar 21 08:46:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.108.10.1 2014/11/14 13:26:46 martin Exp $ */
+/* $NetBSD: wsconsio.h,v 1.108.10.2 2015/03/21 08:46:05 snj Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -335,6 +335,7 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
+#define WSDISPLAY_TYPE_MESON 62 /* Amlogic Meson ARM Soc */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.55.2.1 src/sys/dev/wsfb/genfb.c:1.55.2.2
--- src/sys/dev/wsfb/genfb.c:1.55.2.1 Fri Oct 3 16:22:58 2014
+++ src/sys/dev/wsfb/genfb.c Sat Mar 21 08:46:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.55.2.1 2014/10/03 16:22:58 martin Exp $ */
+/* $NetBSD: genfb.c,v 1.55.2.2 2015/03/21 08:46:05 snj Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.55.2.1 2014/10/03 16:22:58 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.55.2.2 2015/03/21 08:46:05 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -545,10 +545,12 @@ genfb_init_screen(void *cookie, struct v
ri-ri_flg |= RI_CLEAR;
}
- if (ri-ri_depth == 32) {
+ if (ri-ri_depth == 32 || ri-ri_depth == 24) {
bool is_bgr = false;
- ri-ri_flg |= RI_ENABLE_ALPHA;
+ if (ri-ri_depth == 32) {
+ ri-ri_flg |= RI_ENABLE_ALPHA;
+ }
prop_dictionary_get_bool(device_properties(sc-sc_dev),
is_bgr, is_bgr);
if (is_bgr) {
@@ -568,7 +570,7 @@ genfb_init_screen(void *cookie, struct v
ri-ri_gpos = 8;
ri-ri_bpos = 0;
}
- }
+ }
if (ri-ri_depth == 8 sc-sc_cmcb != NULL)
ri-ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 09:42:37 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: uthum.c
Log Message:
Remove unnecessary attachment arg pointer dance.
To generate a diff of this commit:
cvs rdiff -u -r1.10.14.4 -r1.10.14.5 src/sys/dev/usb/uthum.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/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.10.14.4 src/sys/dev/usb/uthum.c:1.10.14.5
--- src/sys/dev/usb/uthum.c:1.10.14.4 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/uthum.c Sat Mar 21 09:42:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.10.14.4 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: uthum.c,v 1.10.14.5 2015/03/21 09:42:37 skrll Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uthum.c,v 1.10.14.4 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uthum.c,v 1.10.14.5 2015/03/21 09:42:37 skrll Exp $);
#include sys/param.h
#include sys/proc.h
@@ -117,8 +117,7 @@ CFATTACH_DECL_NEW(uthum, sizeof(struct u
int
uthum_match(device_t parent, cfdata_t match, void *aux)
{
- struct usb_attach_arg *uaa = aux;
- struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)uaa;
+ struct uhidev_attach_arg *uha = aux;
return uthum_lookup(uha-uaa-vendor, uha-uaa-product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
@@ -128,8 +127,7 @@ void
uthum_attach(device_t parent, device_t self, void *aux)
{
struct uthum_softc *sc = device_private(self);
- struct usb_attach_arg *uaa = aux;
- struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)uaa;
+ struct uhidev_attach_arg *uha = aux;
struct usbd_device *dev = uha-parent-sc_udev;
int size, repid;
void *desc;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 15:30:11 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_mem.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.65.2.8 -r1.65.2.9 src/sys/dev/usb/usb_mem.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/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.65.2.8 src/sys/dev/usb/usb_mem.c:1.65.2.9
--- src/sys/dev/usb/usb_mem.c:1.65.2.8 Sat Mar 21 15:29:38 2015
+++ src/sys/dev/usb/usb_mem.c Sat Mar 21 15:30:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.65.2.8 2015/03/21 15:29:38 skrll Exp $ */
+/* $NetBSD: usb_mem.c,v 1.65.2.9 2015/03/21 15:30:11 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.65.2.8 2015/03/21 15:29:38 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.65.2.9 2015/03/21 15:30:11 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_usb.h
@@ -299,7 +299,7 @@ usb_allocmem_flags(struct usbd_bus *bus,
LIST_FOREACH(f, usb_frag_freelist, ufd_next) {
KDASSERTMSG(usb_valid_block_p(f-ufd_block, usb_blk_fraglist),
%s: usb frag %p: unknown block pointer %p,
- __func__, f, f-ufd_block);
+ __func__, f, f-ufd_block);
if (f-ufd_block-tag == tag)
break;
}
@@ -357,7 +357,7 @@ usb_freemem(struct usbd_bus *bus, usb_dm
}
KDASSERTMSG(usb_valid_block_p(p-udma_block, usb_blk_fraglist),
%s: dma %p: invalid block pointer %p,
- __func__, p, p-udma_block);
+ __func__, p, p-udma_block);
//usb_syncmem(p, 0, USB_MEM_SMALL, BUS_DMASYNC_POSTREAD);
f = KERNADDR(p, 0);
#ifdef USB_FRAG_DMA_WORKAROUND
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Mar 21 15:45:38 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19405 Log Message: Import tzdata2015b from ftp://ftp.iana.org/tz/releases/tzdata2015b.tar.gz Summary of changes in tzdata2015b (2015-03-19 23:28:11 -0700): * Mongolia will start observing DST again in 2015, from the last Saturday in March at 02:00 to the last Saturday in September at 00:00. * Palestine will start DST on March 28, not March 27, in 2015. * The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a regression. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. * Correct the 1992-2010 DST abbreviation in Volgograd from MSK to MSD. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015B U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Sat Mar 21 15:51:21 UTC 2015
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Update tzdata2netbsd for tzdata2015b.
* Edit version numbers.
* Make the script deal better with being re-run multiple times. It
now keeps a status file for each non-trivial step, and doesn't repeat
the step if the sttaus file exists.
* Instead of spawning a subshell to resolve merge conflicts, print a message
and exit, with a suggestion to rte-run the script after conflicts
are resolved.
* Check whether there are any conflicts before trying to do anything
about conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.4 src/external/public-domain/tz/tzdata2netbsd:1.5
--- src/external/public-domain/tz/tzdata2netbsd:1.4 Thu Oct 23 03:42:09 2014
+++ src/external/public-domain/tz/tzdata2netbsd Sat Mar 21 15:51:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.4 2014/10/23 03:42:09 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.5 2015/03/21 15:51:20 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -13,8 +13,8 @@
#redo non-trivial work done by earlier runs.
#
-OLDVER=2014h
-NEWVER=2014i
+OLDVER=2015a
+NEWVER=2015b
# Uppercase variants of OLDVER and NEWVER
OLDVER_UC=$( echo ${OLDVER} | tr '[a-z]' '[A-Z]' )
@@ -40,11 +40,14 @@ EXTRACTDIR=${WORKDIR}/extract
# Files in the work directory
DISTFILE=${WORKDIR}/${DISTURL##*/}
SIGFILE=${DISTFILE}.sig
+PGPVERIFYLOG=${WORKDIR}/pgpverify.log
NEWSFILE=${WORKDIR}/NEWS
NEWSTRIMFILE=${WORKDIR}/NEWS.trimmed
IMPORTMSGFILE=${WORKDIR}/import.msg
+IMPORTDONEFILE=${WORKDIR}/import.done
MERGSMSGFILE=${WORKDIR}/merge.msg
-PGPVERIFYLOG=${WORKDIR}/pgpverify.log
+MERGEDONEFILE=${WORKDIR}/merge.done
+COMMITMERGEDONEFILE=${WORKDIR}/commitmerge.done
DOIT()
{
@@ -268,6 +271,12 @@ editimportmsg()
cvsimport()
{
+ if [ -s ${IMPORTDONEFILE} ]; then
+ cat 2 EOF
+The CVS import has already been performed.
+EOF
+ return 0
+ fi
if ! [ -s ${IMPORTMSGFILE} ] \
|| grep -q '^EDIT' ${IMPORTMSGFILE}
then
@@ -285,25 +294,33 @@ EOF
}
cvsmerge()
-{(
+{
cd ${TZDISTDIR} || exit 1
+ if [ -s ${MERGEDONEFILE} ]; then
+ cat 2 EOF
+The CVS merge has already been performed.
+EOF
+ return 0
+ fi
DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG}
-)}
+}
resolveconflicts()
{
- cat EOF
-Resolve conflicts resulting from the cvs merge.
-exit 0 when done. exit 1 to abort.
+ cd ${TZDISTDIR} || exit 1
+ if grep -l '^[=][=][=]' *
+ then
+ cat EOF
+There appear to be conflicts in the files listed above.
+Resolve conflicts, then re-run this script.
EOF
- nl='
-'
- PS1=[inside ${0##*/}]${nl}${PS1} sh -i
+ return 1
+ fi
}
cvscommitmerge()
-{(
+{
cd ${TZDISTDIR} || exit 1
if grep -l '^[=][=][=]' *
then
@@ -313,8 +330,14 @@ Not performing cvs commit.
EOF
return 1
fi
+ if [ -s ${COMMITMERGEDONEFILE} ]; then
+ cat 2 EOF
+The CVS commmit (of the merge result) has already been performed.
+EOF
+ return 0
+ fi
DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER}
-)}
+}
extra()
{
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:52:19 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: We have tzdata2015b. To generate a diff of this commit: cvs rdiff -u -r1.1209 -r1.1210 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1209 src/doc/3RDPARTY:1.1210 --- src/doc/3RDPARTY:1.1209 Fri Mar 13 13:48:18 2015 +++ src/doc/3RDPARTY Sat Mar 21 15:52:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1209 2015/03/13 13:48:18 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1210 2015/03/21 15:52:19 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1338,8 +1338,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2015a / tzdata2015a -Current Vers: tzcode2015a / tzdata2015a +Version: tzcode2015a / tzdata2015b +Current Vers: tzcode2015b / tzdata2015b Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src
Committed By: martin
Date: Sat Mar 21 15:56:54 UTC 2015
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: bf.inc bn.inc
des.inc rc4.inc
Log Message:
Make more compile time options the same as the pkgsrc version
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc
cvs rdiff -u -r0 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc:1.1
--- /dev/null Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc Sat Mar 21 15:56:54 2015
@@ -0,0 +1,5 @@
+# $NetBSD: bf.inc,v 1.1 2015/03/21 15:56:54 martin Exp $
+
+CPPFLAGS+= -DBF_PTR
+
+.include ${.CURDIR}/bf.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc:1.1
--- /dev/null Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc Sat Mar 21 15:56:54 2015
@@ -0,0 +1,3 @@
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+= -DBN_LLONG=long long
+.include ../../bn.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc:1.1
--- /dev/null Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc Sat Mar 21 15:56:54 2015
@@ -0,0 +1,3 @@
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+= -DRC4_CHUNK=unsigned long -DRC4_INT=unsigned char
+.include ../../rc4.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc:1.3
--- /dev/null Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc Sat Mar 21 15:56:54 2015
@@ -0,0 +1,5 @@
+# $NetBSD: des.inc,v 1.3 2015/03/21 15:56:54 martin Exp $
+
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+= -DDES_INT -DDES_UNROLL
+.include ${.CURDIR}/des.inc
CVS commit: [netbsd-7] src/sys/arch/arm/cortex
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:24:20 UTC 2015
Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: gic.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #627):
sys/arch/arm/cortex/gic.c: revision 1.16
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.3 -r1.10.2.4 src/sys/arch/arm/cortex/gic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.10.2.3 src/sys/arch/arm/cortex/gic.c:1.10.2.4
--- src/sys/arch/arm/cortex/gic.c:1.10.2.3 Sun Mar 15 22:46:38 2015
+++ src/sys/arch/arm/cortex/gic.c Sat Mar 21 17:24:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $ */
+/* $NetBSD: gic.c,v 1.10.2.4 2015/03/21 17:24:19 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.10.2.4 2015/03/21 17:24:19 snj Exp $);
#include sys/param.h
#include sys/bus.h
@@ -270,7 +270,7 @@ armgic_irq_handler(void *tf)
#if 0
const int ipl = armgic_priority_to_ipl(gicc_read(sc, GICC_RPR));
KASSERTMSG(panicstr != NULL || ipl == is-is_ipl,
- %s: irq %d: running ipl %d != source ipl %u,
+ %s: irq %d: running ipl %d != source ipl %u,
ci-ci_data.cpu_name, irq, ipl, is-is_ipl);
#else
const int ipl = is-is_ipl;
@@ -332,7 +332,7 @@ armgic_establish_irq(struct pic_softc *p
irq %u: not valid (group[%zu]=0x%08x [0x%08x]),
is-is_irq, group, sc-sc_gic_valid_lines[group],
(uint32_t)__BIT(irq));
-
+
KASSERTMSG(is-is_type == IST_LEVEL || is-is_type == IST_EDGE,
irq %u: type %u unsupported, is-is_irq, is-is_type);
@@ -342,7 +342,7 @@ armgic_establish_irq(struct pic_softc *p
uint32_t cfg = gicd_read(sc, cfg_reg);
if (group 0) {
- /*
+ /*
* There are 4 irqs per TARGETS register. For now bind
* to the primary cpu.
*/
@@ -357,7 +357,7 @@ armgic_establish_irq(struct pic_softc *p
targets |= 1 byte_shift;
gicd_write(sc, targets_reg, targets);
- /*
+ /*
* There are 16 irqs per CFG register. 10=EDGE 00=LEVEL
*/
uint32_t new_cfg = cfg;
@@ -384,7 +384,7 @@ armgic_establish_irq(struct pic_softc *p
#endif
}
- /*
+ /*
* There are 4 irqs per PRIORITY register. Map the IPL
* to GIC priority.
*/
@@ -436,7 +436,7 @@ static void
armgic_cpu_init_targets(struct armgic_softc *sc)
{
/*
- * Update the mpsafe targets
+ * Update the mpsafe targets
*/
for (size_t irq = 32; irq sc-sc_pic.pic_maxsources; irq++) {
struct intrsource * const is = sc-sc_pic.pic_sources[irq];
CVS commit: [netbsd-7] src/sys/dev/pckbport
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:34:21 UTC 2015
Modified Files:
src/sys/dev/pckbport [netbsd-7]: synaptics.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #629):
sys/dev/pckbport/synaptics.c: revision 1.33
Fix clickpad button detection (From Rhialto)
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.32 src/sys/dev/pckbport/synaptics.c:1.32.2.1
--- src/sys/dev/pckbport/synaptics.c:1.32 Fri May 23 01:11:29 2014
+++ src/sys/dev/pckbport/synaptics.c Sat Mar 21 17:34:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.32 2014/05/23 01:11:29 christos Exp $ */
+/* $NetBSD: synaptics.c,v 1.32.2.1 2015/03/21 17:34:21 snj Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include opt_pms.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.32 2014/05/23 01:11:29 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.32.2.1 2015/03/21 17:34:21 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -197,18 +197,46 @@ pms_synaptics_probe_extended(struct pms_
cmd[0] = PMS_SEND_DEV_STATUS;
res |= pckbport_poll_cmd(psc-sc_kbctag,
psc-sc_kbcslot, cmd, 1, 3, resp, 0);
+/*
+ * The following describes response for the
+ * SYNAPTICS_CONTINUED_CAPABILITIES query.
+ *
+ * byte mask name meaning
+ * ---
+ * 0 0x01 adjustable threshold capacitive button sensitivity
+ * can be adjusted
+ * 0 0x02 report max query 0x0d gives max coord reported
+ * 0 0x04 clearpad sensor is ClearPad product
+ * 0 0x08 advanced gesture not particularly meaningful
+ * 0 0x10 clickpad bit 0 1-button ClickPad
+ * 0 0x60 multifinger mode identifies firmware finger counting
+ * (not reporting!) algorithm.
+ * Not particularly meaningful
+ * 0 0x80 covered pad W clipped to 14, 15 == pad mostly covered
+ * 1 0x01 clickpad bit 1 2-button ClickPad
+ * 1 0x02 deluxe LED controls touchpad support LED commands
+ * ala multimedia control bar
+ * 1 0x04 reduced filtering firmware does less filtering on
+ * position data, driver should watch
+ * for noise.
+ * 1 0x08 image sensor image sensor tracks 5 fingers, but only
+ * reports 2.
+ * 1 0x01 uniform clickpad whole clickpad moves instead of being
+ * hinged at the top.
+ * 1 0x20 report min query 0x0f gives min coord reported
+ */
if (res == 0) {
- u_char clickpad_type = (resp[1] 0x1);
- clickpad_type |= ((resp[0] 4) 0x1);
+ u_char clickpad_type = (resp[0] 0x10);
+ clickpad_type |= (resp[1] 0x01);
aprint_debug_dev(psc-sc_dev, %s: Continued
Capabilities 0x%02x 0x%02x 0x%02x.\n, __func__,
resp[0], resp[1], resp[2]);
switch (clickpad_type) {
- case 1:
+ case 0x10:
sc-flags |= SYN_FLAG_HAS_ONE_BUTTON_CLICKPAD;
break;
- case 2:
+ case 0x01:
sc-flags |= SYN_FLAG_HAS_TWO_BUTTON_CLICKPAD;
break;
default:
CVS commit: [netbsd-7] src/sys/arch/arm/include
Module Name:src
Committed By: snj
Date: Sat Mar 21 17:43:27 UTC 2015
Modified Files:
src/sys/arch/arm/include [netbsd-7]: mcontext.h
Log Message:
Pull up following revision(s) (requested by joerg in ticket #633):
sys/arch/arm/include/mcontext.h: revision 1.17
Ensure _lwp_setcontext gets consistent language binding.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/arm/include/mcontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/mcontext.h
diff -u src/sys/arch/arm/include/mcontext.h:1.16 src/sys/arch/arm/include/mcontext.h:1.16.4.1
--- src/sys/arch/arm/include/mcontext.h:1.16 Thu Aug 15 22:34:59 2013
+++ src/sys/arch/arm/include/mcontext.h Sat Mar 21 17:43:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.16 2013/08/15 22:34:59 matt Exp $ */
+/* $NetBSD: mcontext.h,v 1.16.4.1 2015/03/21 17:43:26 snj Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -120,6 +120,7 @@ typedef struct {
#define __UCONTEXT_SIZE 256
#endif
+__BEGIN_DECLS
static __inline void *
__lwp_getprivate_fast(void)
{
@@ -146,5 +147,6 @@ __lwp_getprivate_fast(void)
void vfp_getcontext(struct lwp *, mcontext_t *, int *);
void vfp_setcontext(struct lwp *, const mcontext_t *);
#endif
+__END_DECLS
#endif /* !_ARM_MCONTEXT_H_ */
CVS commit: [netbsd-7] src/sys/arch/arm/vfp
Module Name:src Committed By: snj Date: Sat Mar 21 17:51:21 UTC 2015 Modified Files: src/sys/arch/arm/vfp [netbsd-7]: vfp_init.c Log Message: Pull up following revision(s) (requested by martin in ticket #621): sys/arch/arm/vfp/vfp_init.c: revisions 1.43-1.46 If we own the FPU, don't take anymore undefined faults. Instead generate SIGILLs since we obviously don't understand the instruction. -- Don't try to catch undefined VFP instructions if we own the the FPU. Let them raise SIGILL. -- Not only check to see if we own the VFP but that the VFP is enabled. -- Remove extra ) To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/arm/vfp/vfp_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/vfp/vfp_init.c diff -u src/sys/arch/arm/vfp/vfp_init.c:1.41 src/sys/arch/arm/vfp/vfp_init.c:1.41.2.1 --- src/sys/arch/arm/vfp/vfp_init.c:1.41 Fri Jul 18 22:54:53 2014 +++ src/sys/arch/arm/vfp/vfp_init.c Sat Mar 21 17:51:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vfp_init.c,v 1.41 2014/07/18 22:54:53 matt Exp $ */ +/* $NetBSD: vfp_init.c,v 1.41.2.1 2015/03/21 17:51:21 snj Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -373,7 +373,8 @@ vfp_attach(struct cpu_info *ci) install_coproc_handler(VFP_COPROC, vfp_handler); install_coproc_handler(VFP_COPROC2, vfp_handler); #ifdef CPU_CORTEX - install_coproc_handler(CORE_UNKNOWN_HANDLER, neon_handler); + if (cpu_neon_present) + install_coproc_handler(CORE_UNKNOWN_HANDLER, neon_handler); #endif } @@ -396,6 +397,11 @@ vfp_handler(u_int address, u_int insn, t * If we are just changing/fetching FPSCR, don't bother loading it. */ if (!vfp_fpscr_handler(address, insn, frame, fault_code)) + return 1; + + /* if we already own the FPU and it's enabled, raise SIGILL */ + if (curcpu()-ci_pcu_curlwp[PCU_FPU] == curlwp + (armreg_fpexc_read() VFP_FPEXC_EN) != 0) return 0; /* @@ -465,6 +471,11 @@ neon_handler(u_int address, u_int insn, if (fault_code != FAULT_USER) panic(NEON fault in non-user mode); + /* if we already own the FPU and it's enabled, raise SIGILL */ + if (curcpu()-ci_pcu_curlwp[PCU_FPU] == curlwp + (armreg_fpexc_read() VFP_FPEXC_EN) != 0) + return 0; + pcu_load(arm_vfp_ops); /* Need to restart the faulted instruction. */
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Mar 21 15:29:38 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_mem.c
Log Message:
COnvert to USBHIST
To generate a diff of this commit:
cvs rdiff -u -r1.65.2.7 -r1.65.2.8 src/sys/dev/usb/usb_mem.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/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.65.2.7 src/sys/dev/usb/usb_mem.c:1.65.2.8
--- src/sys/dev/usb/usb_mem.c:1.65.2.7 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/usb_mem.c Sat Mar 21 15:29:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.65.2.7 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: usb_mem.c,v 1.65.2.8 2015/03/21 15:29:38 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.65.2.7 2015/03/19 17:26:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.65.2.8 2015/03/21 15:29:38 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_usb.h
@@ -62,15 +62,10 @@ __KERNEL_RCSID(0, $NetBSD: usb_mem.c,v
#include dev/usb/usbdi.h
#include dev/usb/usbdivar.h /* just for usb_dma_t */
#include dev/usb/usb_mem.h
+#include dev/usb/usbhist.h
-#ifdef USB_DEBUG
-#define DPRINTF(x) if (usbdebug) printf x
-#define DPRINTFN(n,x) if (usbdebug(n)) printf x
-extern int usbdebug;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
+#define DPRINTF(FMT,A,B,C,D) USBHIST_LOG(usbdebug,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(usbdebug,N,FMT,A,B,C,D)
#define USB_MEM_SMALL roundup(64, CACHE_LINE_SIZE)
#define USB_MEM_CHUNKS 64
@@ -120,7 +115,8 @@ usb_block_allocmem(bus_dma_tag_t tag, si
usb_dma_block_t *b;
int error;
- DPRINTFN(5, (usb_block_allocmem: size=%zu align=%zu\n, size, align));
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+ DPRINTFN(5, size=%zu align=%zu, size, align, 0, 0);
ASSERT_SLEEPABLE();
KASSERT(size != 0);
@@ -135,13 +131,12 @@ usb_block_allocmem(bus_dma_tag_t tag, si
LIST_REMOVE(b, next);
usb_blk_nfree--;
*dmap = b;
- DPRINTFN(6,(usb_block_allocmem: free list size=%zu\n,
- b-size));
+ DPRINTFN(6, free list size=%zu, b-size, 0, 0, 0);
return USBD_NORMAL_COMPLETION;
}
}
- DPRINTFN(6, (usb_block_allocmem: no free\n));
+ DPRINTFN(6, no free, 0, 0, 0, 0);
b = kmem_zalloc(sizeof *b, KM_SLEEP);
if (b == NULL)
return USBD_NOMEM;
@@ -246,7 +241,8 @@ usb_block_freemem(usb_dma_block_t *b)
KASSERT(mutex_owned(usb_blk_lock));
- DPRINTFN(6, (usb_block_freemem: size=%zu\n, b-size));
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+ DPRINTFN(6, size=%zu, b-size, 0, 0, 0);
#ifdef DEBUG
LIST_REMOVE(b, next);
#endif
@@ -273,6 +269,8 @@ usb_allocmem_flags(struct usbd_bus *bus,
static ONCE_DECL(init_control);
bool frag;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
ASSERT_SLEEPABLE();
RUN_ONCE(init_control, usb_mem_init);
@@ -281,7 +279,7 @@ usb_allocmem_flags(struct usbd_bus *bus,
/* If the request is large then just use a full block. */
if (size USB_MEM_SMALL || align USB_MEM_SMALL) {
- DPRINTFN(1, (usb_allocmem: large alloc %d\n, (int)size));
+ DPRINTFN(1, large alloc %d, size, 0, 0, 0);
size = (size + USB_MEM_BLOCK - 1) ~(USB_MEM_BLOCK - 1);
mutex_enter(usb_blk_lock);
err = usb_block_allocmem(tag, size, align, p-udma_block, frag);
@@ -306,7 +304,7 @@ usb_allocmem_flags(struct usbd_bus *bus,
break;
}
if (f == NULL) {
- DPRINTFN(1, (usb_allocmem: adding fragments\n));
+ DPRINTFN(1, adding fragments, 0, 0, 0, 0);
err = usb_block_allocmem(tag, USB_MEM_BLOCK, USB_MEM_SMALL, b,
false);
if (err) {
@@ -335,7 +333,7 @@ usb_allocmem_flags(struct usbd_bus *bus,
#endif
LIST_REMOVE(f, ufd_next);
mutex_exit(usb_blk_lock);
- DPRINTFN(5, (usb_allocmem: use frag=%p size=%d\n, f, (int)size));
+ DPRINTFN(5, use frag=%p size=%d, f, size, 0, 0);
return USBD_NORMAL_COMPLETION;
}
@@ -345,12 +343,14 @@ usb_freemem(struct usbd_bus *bus, usb_dm
{
struct usb_frag_dma *f;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
mutex_enter(usb_blk_lock);
if (p-udma_block-flags USB_DMA_FULLBLOCK) {
KDASSERTMSG(usb_valid_block_p(p-udma_block, usb_blk_fulllist),
%s: dma %p: invalid block pointer %p,
- __func__, p, p-udma_block);
- DPRINTFN(1, (usb_freemem: large free\n));
+ __func__, p, p-udma_block);
+ DPRINTFN(1, large free, 0, 0, 0, 0);
usb_block_freemem(p-udma_block);
mutex_exit(usb_blk_lock);
return;
@@ -370,7 +370,7 @@ usb_freemem(struct usbd_bus *bus, usb_dm
#endif
LIST_INSERT_HEAD(usb_frag_freelist, f, ufd_next);
mutex_exit(usb_blk_lock);
- DPRINTFN(5, (usb_freemem: frag=%p\n, f));
+ DPRINTFN(5, frag=%p, f, 0, 0, 0);
}
bus_addr_t
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:54:11 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015b. [apb 20150321] Also s/tzdata/tzcode in another line. To generate a diff of this commit: cvs rdiff -u -r1.2054 -r1.2055 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2054 src/doc/CHANGES:1.2055 --- src/doc/CHANGES:1.2054 Mon Mar 9 02:03:19 2015 +++ src/doc/CHANGES Sat Mar 21 15:54:11 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2054 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2055 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -132,10 +132,11 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libevent: Import libevent 2.0.22 [spz 20150129] dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130] zoneinfo: Import tzdata2015a. [apb 20150131] - libc: Import tzdata2015a. [christos 20150131] + libc: Import tzcode2015a. [christos 20150131] bind: patch to version 9.10.1-P2. [spz 20150221] network: introduce RTF_LOCAL for local address routes. [roy 20150226] evbarm: Add support for RPI2. [skrll 20150304] evbarm: Add support for ODROID-C1. [jmcneill 20150304] dtrace: Add syscall support [christos 20150307] dtrace: Add lockstat support [riastradh, christos 20150308] + zoneinfo: Import tzdata2015b. [apb 20150321]
CVS commit: [netbsd-7] src/lib/libc/arch
Module Name:src Committed By: snj Date: Sat Mar 21 17:41:38 UTC 2015 Modified Files: src/lib/libc/arch/arm/gen [netbsd-7]: flt_rounds.c src/lib/libc/arch/mips/gen [netbsd-7]: flt_rounds.c src/lib/libc/arch/powerpc/gen [netbsd-7]: flt_rounds.c src/lib/libc/arch/powerpc64/gen [netbsd-7]: flt_rounds.c src/lib/libc/arch/sh3/gen [netbsd-7]: flt_rounds.c Log Message: Pull up following revision(s) (requested by joerg in ticket #632): lib/libc/arch/arm/gen/flt_rounds.c: revision 1.5 lib/libc/arch/mips/gen/flt_rounds.c: revision 1.9 lib/libc/arch/powerpc/gen/flt_rounds.c: revision 1.12 lib/libc/arch/powerpc64/gen/flt_rounds.c: revision 1.2 lib/libc/arch/sh3/gen/flt_rounds.c: revision 1.6 Call libc's fpgetround. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.10.1 src/lib/libc/arch/arm/gen/flt_rounds.c cvs rdiff -u -r1.7 -r1.7.10.1 src/lib/libc/arch/mips/gen/flt_rounds.c cvs rdiff -u -r1.11 -r1.11.20.1 src/lib/libc/arch/powerpc/gen/flt_rounds.c cvs rdiff -u -r1.1 -r1.1.64.1 src/lib/libc/arch/powerpc64/gen/flt_rounds.c cvs rdiff -u -r1.5 -r1.5.10.1 src/lib/libc/arch/sh3/gen/flt_rounds.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/arch/arm/gen/flt_rounds.c diff -u src/lib/libc/arch/arm/gen/flt_rounds.c:1.4 src/lib/libc/arch/arm/gen/flt_rounds.c:1.4.10.1 --- src/lib/libc/arch/arm/gen/flt_rounds.c:1.4 Wed Mar 21 20:04:57 2012 +++ src/lib/libc/arch/arm/gen/flt_rounds.c Sat Mar 21 17:41:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.c,v 1.4 2012/03/21 20:04:57 he Exp $ */ +/* $NetBSD: flt_rounds.c,v 1.4.10.1 2015/03/21 17:41:38 snj Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe @@ -33,9 +33,10 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: flt_rounds.c,v 1.4 2012/03/21 20:04:57 he Exp $); +__RCSID($NetBSD: flt_rounds.c,v 1.4.10.1 2015/03/21 17:41:38 snj Exp $); #endif /* LIBC_SCCS and not lint */ +#include namespace.h #include sys/types.h #include ieeefp.h Index: src/lib/libc/arch/mips/gen/flt_rounds.c diff -u src/lib/libc/arch/mips/gen/flt_rounds.c:1.7 src/lib/libc/arch/mips/gen/flt_rounds.c:1.7.10.1 --- src/lib/libc/arch/mips/gen/flt_rounds.c:1.7 Sun Jun 24 15:26:02 2012 +++ src/lib/libc/arch/mips/gen/flt_rounds.c Sat Mar 21 17:41:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.c,v 1.7 2012/06/24 15:26:02 christos Exp $ */ +/* $NetBSD: flt_rounds.c,v 1.7.10.1 2015/03/21 17:41:38 snj Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,9 +7,10 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: flt_rounds.c,v 1.7 2012/06/24 15:26:02 christos Exp $); +__RCSID($NetBSD: flt_rounds.c,v 1.7.10.1 2015/03/21 17:41:38 snj Exp $); #endif /* LIBC_SCCS and not lint */ +#include namespace.h #include machine/float.h #include ieeefp.h Index: src/lib/libc/arch/powerpc/gen/flt_rounds.c diff -u src/lib/libc/arch/powerpc/gen/flt_rounds.c:1.11 src/lib/libc/arch/powerpc/gen/flt_rounds.c:1.11.20.1 --- src/lib/libc/arch/powerpc/gen/flt_rounds.c:1.11 Sun Jul 10 21:18:47 2011 +++ src/lib/libc/arch/powerpc/gen/flt_rounds.c Sat Mar 21 17:41:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.c,v 1.11 2011/07/10 21:18:47 matt Exp $ */ +/* $NetBSD: flt_rounds.c,v 1.11.20.1 2015/03/21 17:41:38 snj Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe @@ -33,9 +33,10 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: flt_rounds.c,v 1.11 2011/07/10 21:18:47 matt Exp $); +__RCSID($NetBSD: flt_rounds.c,v 1.11.20.1 2015/03/21 17:41:38 snj Exp $); #endif /* LIBC_SCCS and not lint */ +#include namespace.h #include ieeefp.h #include float.h #include stdint.h Index: src/lib/libc/arch/powerpc64/gen/flt_rounds.c diff -u src/lib/libc/arch/powerpc64/gen/flt_rounds.c:1.1 src/lib/libc/arch/powerpc64/gen/flt_rounds.c:1.1.64.1 --- src/lib/libc/arch/powerpc64/gen/flt_rounds.c:1.1 Sat Jul 1 16:37:20 2006 +++ src/lib/libc/arch/powerpc64/gen/flt_rounds.c Sat Mar 21 17:41:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.c,v 1.1 2006/07/01 16:37:20 ross Exp $ */ +/* $NetBSD: flt_rounds.c,v 1.1.64.1 2015/03/21 17:41:38 snj Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe @@ -33,9 +33,10 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: flt_rounds.c,v 1.1 2006/07/01 16:37:20 ross Exp $); +__RCSID($NetBSD: flt_rounds.c,v 1.1.64.1 2015/03/21 17:41:38 snj Exp $); #endif /* LIBC_SCCS and not lint */ +#include namespace.h #include ieeefp.h #include float.h #include stdint.h Index: src/lib/libc/arch/sh3/gen/flt_rounds.c diff -u src/lib/libc/arch/sh3/gen/flt_rounds.c:1.5 src/lib/libc/arch/sh3/gen/flt_rounds.c:1.5.10.1 --- src/lib/libc/arch/sh3/gen/flt_rounds.c:1.5 Thu Mar 22 08:58:39 2012 +++ src/lib/libc/arch/sh3/gen/flt_rounds.c Sat Mar 21 17:41:38 2015 @@ -1,4 +1,4 @@ -/*
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sat Mar 21 13:28:32 UTC 2015 Modified Files: src/sys/uvm: uvm_page.h Log Message: Address O-A loan case in comments, pointed out by chs@. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/uvm/uvm_page.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/uvm/uvm_page.h diff -u src/sys/uvm/uvm_page.h:1.77 src/sys/uvm/uvm_page.h:1.78 --- src/sys/uvm/uvm_page.h:1.77 Sat Mar 21 13:11:14 2015 +++ src/sys/uvm/uvm_page.h Sat Mar 21 13:28:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.h,v 1.77 2015/03/21 13:11:14 riastradh Exp $ */ +/* $NetBSD: uvm_page.h,v 1.78 2015/03/21 13:28:32 riastradh Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -122,8 +122,9 @@ * o owned by a uvm_object * = pageq.queue is entry on wired page queue, if any * = listq.queue is entry on list of pages in object - * = uanon is NULL + * = uanon is NULL or the vm_anon to which it has been O-A loaned * = uobject is owner + * = iff O-A loaned, PQ_ANON is set in pqflags * o owned by a vm_anon * = pageq is unused (XXX correct?) * = listq is unused (XXX correct?)
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sat Mar 21 13:58:31 UTC 2015 Modified Files: src/sys/uvm: uvm_page.h Log Message: No, PQ_ANON is set only if owned by anon, not if loaned to anon. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_page.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/uvm/uvm_page.h diff -u src/sys/uvm/uvm_page.h:1.78 src/sys/uvm/uvm_page.h:1.79 --- src/sys/uvm/uvm_page.h:1.78 Sat Mar 21 13:28:32 2015 +++ src/sys/uvm/uvm_page.h Sat Mar 21 13:58:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.h,v 1.78 2015/03/21 13:28:32 riastradh Exp $ */ +/* $NetBSD: uvm_page.h,v 1.79 2015/03/21 13:58:31 riastradh Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -124,7 +124,6 @@ * = listq.queue is entry on list of pages in object * = uanon is NULL or the vm_anon to which it has been O-A loaned * = uobject is owner - * = iff O-A loaned, PQ_ANON is set in pqflags * o owned by a vm_anon * = pageq is unused (XXX correct?) * = listq is unused (XXX correct?)
CVS commit: src/sys/uvm
Module Name:src
Committed By: riastradh
Date: Sat Mar 21 13:11:14 UTC 2015
Modified Files:
src/sys/uvm: uvm_page.h
Log Message:
Elaborate on locking scheme and vm_page states.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/uvm/uvm_page.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/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.76 src/sys/uvm/uvm_page.h:1.77
--- src/sys/uvm/uvm_page.h:1.76 Fri Oct 25 14:30:21 2013
+++ src/sys/uvm/uvm_page.h Sat Mar 21 13:11:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.76 2013/10/25 14:30:21 martin Exp $ */
+/* $NetBSD: uvm_page.h,v 1.77 2015/03/21 13:11:14 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -98,36 +98,71 @@
*
* Field markings and the corresponding locks:
*
- * o: page owner's lock (UVM object or amap/anon)
- * p: lock on the page queues
- * o|p: either lock can be acquired
- * op: both locks are required
+ * f: free page queue lock, uvm_fpageqlock
+ * o: page owner (uvm_object::vmobjlock, vm_amap::am_lock, vm_anon::an_lock)
+ * p: page queue lock, uvm_pageqlock
+ * o,p: o|p for read, op for write
+ * w: wired page queue or uvm_pglistalloc:
+ * = wired page queue: op to change, stable from wire to unwire
+ * XXX What about concurrent or nested wire?
+ * = uvm_pglistalloc: owned by caller
* ?: locked by pmap or assumed page owner's lock
*
* UVM and pmap(9) may use uvm_page_locked_p() to assert whether the
* page owner's lock is acquired.
+ *
+ * A page can be in one of four life states:
+ *
+ * o free
+ * = pageq.list is entry on global free page queue
+ * = listq.list is entry on per-CPU free page queue
+ * = uanon is unused (or (void *)0xdeadbeef for DEBUG)
+ * = uobject is unused (or (void *)0xdeadbeef for DEBUG)
+ * = PQ_FREE is set in pqflags
+ * o owned by a uvm_object
+ * = pageq.queue is entry on wired page queue, if any
+ * = listq.queue is entry on list of pages in object
+ * = uanon is NULL
+ * = uobject is owner
+ * o owned by a vm_anon
+ * = pageq is unused (XXX correct?)
+ * = listq is unused (XXX correct?)
+ * = uanon is owner
+ * = uobject is NULL
+ * = PQ_ANON is set in pqflags
+ * o allocated by uvm_pglistalloc
+ * = pageq.queue is entry on resulting pglist, owned by caller
+ * = listq is unused (XXX correct?)
+ * = uanon is unused
+ * = uobject is unused
+ *
+ * The following transitions are allowed:
+ *
+ * - uvm_pagealloc: free - owned by a uvm_object/vm_anon
+ * - uvm_pagefree: owned by a uvm_object/vm_anon - free
+ * - uvm_pglistalloc: free - allocated by uvm_pglistalloc
+ * - uvm_pglistfree: allocated by uvm_pglistalloc - free
*/
struct vm_page {
struct rb_node rb_node; /* o: tree of pages in obj */
union {
- TAILQ_ENTRY(vm_page) queue;
- LIST_ENTRY(vm_page) list;
- } pageq;/* p: queue info for FIFO
- * queue or free list */
+ TAILQ_ENTRY(vm_page) queue; /* w: wired page queue
+ * or uvm_pglistalloc output */
+ LIST_ENTRY(vm_page) list; /* f: global free page queue */
+ } pageq;
+
union {
- TAILQ_ENTRY(vm_page) queue;
- LIST_ENTRY(vm_page) list;
- } listq;/* o: pages in same object */
+ TAILQ_ENTRY(vm_page) queue; /* o: pages in same object */
+ LIST_ENTRY(vm_page) list; /* f: CPU free page queue */
+ } listq;
struct vm_anon *uanon; /* o,p: anon */
struct uvm_object *uobject; /* o,p: object */
voff_t offset; /* o,p: offset into object */
uint16_t flags; /* o: object flags */
- uint16_t loan_count; /* number of active loans
- * o|p: for reading
- * op: for modification */
+ uint16_t loan_count; /* o,p: num. active loans */
uint16_t wire_count; /* p: wired down map refs */
uint16_t pqflags; /* p: page queue flags */
paddr_t phys_addr; /* physical address of page */
@@ -149,9 +184,9 @@ struct vm_page {
*
* Locking notes:
*
- * PG_, struct vm_page::flags = locked by the owner
- * PQ_, struct vm_page::pqflags = locked by the page-queue lock
- * PQ_FREE = additionally locked by free-queue lock
+ * PG_, struct vm_page::flags = locked by owner
+ * PQ_, struct vm_page::pqflags = locked by uvm_pageqlock
+ * PQ_FREE = additionally locked by uvm_fpageqlock
*
* Flag descriptions:
*
CVS commit: src/crypto/external/bsd/openssl/dist/crypto
Module Name:src
Committed By: martin
Date: Sat Mar 21 13:35:48 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h
Log Message:
In a native build, this file is postprocessed by a perl script and some
lines are changed into either #define SOMETHING or #undef SOMETHING,
but in our in-tree build it is installed verbatim - so comment out all
#undef parts, to allow our makefile fragments to freely -DSOMETHING
and not have it silently canceld here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
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/openssl/dist/crypto/opensslconf.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.7 src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.8
--- src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.7 Fri Oct 17 16:34:25 2014
+++ src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h Sat Mar 21 13:35:48 2015
@@ -154,7 +154,7 @@ extern C {
#if defined(HEADER_BN_H) !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
-#undef BN_LLONG
+/* #undef BN_LLONG */
/* Should we define BN_DIV2W here? */
@@ -174,7 +174,7 @@ extern C {
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
-#undef RC4_INDEX
+/* #undef RC4_INDEX */
#endif
#if defined(HEADER_BF_LOCL_H) !defined(CONFIG_HEADER_BF_LOCL_H)
@@ -188,18 +188,18 @@ extern C {
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
-#undef DES_PTR
+/* #undef DES_PTR */
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
-#undef DES_RISC1
+/* #undef DES_RISC1 */
#endif
#ifndef DES_RISC2
-#undef DES_RISC2
+/* #undef DES_RISC2 */
#endif
#if defined(DES_RISC1) defined(DES_RISC2)
@@ -209,7 +209,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
-#undef DES_UNROLL
+/* #undef DES_UNROLL */
#endif
/* These default values were supplied by
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Mar 21 19:10:44 UTC 2015 Modified Files: src/distrib/sets/lists/etc: mi src/distrib/sets/lists/man: mi src/etc/defaults: rc.conf src/etc/mtree: special src/etc/rc.d: Makefile src/share/man/man5: Makefile src/usr.sbin/postinstall: postinstall Added Files: src/etc/rc.d: modules src/share/man/man5: modules.conf.5 Log Message: Process /etc/modules.conf (if present) at startup, before securelevel is raised, to allow module loading on ports without a module aware bootloader. To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.1496 -r1.1497 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.131 -r1.132 src/etc/defaults/rc.conf cvs rdiff -u -r1.151 -r1.152 src/etc/mtree/special cvs rdiff -u -r1.91 -r1.92 src/etc/rc.d/Makefile cvs rdiff -u -r0 -r1.1 src/etc/rc.d/modules cvs rdiff -u -r1.70 -r1.71 src/share/man/man5/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man5/modules.conf.5 cvs rdiff -u -r1.189 -r1.190 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/etc/mi diff -u src/distrib/sets/lists/etc/mi:1.235 src/distrib/sets/lists/etc/mi:1.236 --- src/distrib/sets/lists/etc/mi:1.235 Sat Feb 21 23:13:00 2015 +++ src/distrib/sets/lists/etc/mi Sat Mar 21 19:10:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.235 2015/02/21 23:13:00 joerg Exp $ +# $NetBSD: mi,v 1.236 2015/03/21 19:10:43 jmcneill Exp $ # # Note: end-user configuration files that are moved to another location # should not be marked obsolete; they should just be removed from @@ -232,6 +232,7 @@ ./etc/rc.d/makemandbetc-man-rc ./etc/rc.d/mdnsdetc-mdns-rc ./etc/rc.d/mixerctletc-audio-rc +./etc/rc.d/modulesetc-sys-rc ./etc/rc.d/mopd etc-bootserver-rc ./etc/rc.d/motd etc-sys-rc ./etc/rc.d/mountalletc-sys-rc Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1496 src/distrib/sets/lists/man/mi:1.1497 --- src/distrib/sets/lists/man/mi:1.1496 Mon Mar 2 21:55:45 2015 +++ src/distrib/sets/lists/man/mi Sat Mar 21 19:10:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1496 2015/03/02 21:55:45 christos Exp $ +# $NetBSD: mi,v 1.1497 2015/03/21 19:10:43 jmcneill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2114,6 +2114,7 @@ ./usr/share/man/cat5/master.passwd.0 man-sys-catman .cat ./usr/share/man/cat5/memcache_table.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/mixerctl.conf.0 man-audio-catman .cat +./usr/share/man/cat5/modules.conf.0 man-sys-catman .cat ./usr/share/man/cat5/moduli.0 man-secsh-catman crypto,.cat ./usr/share/man/cat5/monthly.0 man-sys-catman .cat ./usr/share/man/cat5/monthly.conf.0 man-sys-catman .cat @@ -5081,6 +5082,7 @@ ./usr/share/man/html5/master.passwd.html man-sys-htmlman html ./usr/share/man/html5/memcache_table.html man-postfix-htmlman postfix,html ./usr/share/man/html5/mixerctl.conf.html man-audio-htmlman html +./usr/share/man/html5/modules.conf.html man-sys-htmlman html ./usr/share/man/html5/moduli.html man-secsh-htmlman crypto,html ./usr/share/man/html5/monthly.conf.html man-sys-htmlman html ./usr/share/man/html5/monthly.html man-sys-htmlman html @@ -7998,6 +8000,7 @@ ./usr/share/man/man5/master.passwd.5 man-sys-man .man ./usr/share/man/man5/memcache_table.5 man-postfix-man postfix,.man ./usr/share/man/man5/mixerctl.conf.5 man-audio-man .man +./usr/share/man/man5/modules.conf.5 man-sys-man .man ./usr/share/man/man5/moduli.5 man-secsh-man crypto,.man ./usr/share/man/man5/monthly.5 man-sys-man .man ./usr/share/man/man5/monthly.conf.5 man-sys-man .man Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.131 src/etc/defaults/rc.conf:1.132 --- src/etc/defaults/rc.conf:1.131 Sat Feb 21 23:13:00 2015 +++ src/etc/defaults/rc.conf Sat Mar 21 19:10:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.131 2015/02/21 23:13:00 joerg Exp $ +# $NetBSD: rc.conf,v 1.132 2015/03/21 19:10:43 jmcneill Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -132,6 +132,7 @@ ldconfig=YES # rebuild a.out ldconfi sysdb=YES # build system databases rndctl=NO rndctl_flags= # configure rndctl(8) gpio=NO # configure GPIO devices +modules=YES # process /etc/modules.conf # cope with other OSes using the real time clock at localtime on this # machine (by adjusting kern.rtc_offset at boot) Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.151 src/etc/mtree/special:1.152 --- src/etc/mtree/special:1.151 Sat Feb 21 23:13:00 2015 +++ src/etc/mtree/special Sat Mar 21 19:10:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.151 2015/02/21 23:13:00 joerg Exp $ +# $NetBSD: special,v 1.152 2015/03/21 19:10:43 jmcneill
