Re: CVS commit: src/sys/external/bsd/drm2/i915drm
Hi, PR/48705 is useful for you? 2014-04-07 1:42 GMT+09:00 Taylor R Campbell riastr...@netbsd.org: Module Name:src Committed By: riastradh Date: Sun Apr 6 16:42:00 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: Restore is_console=1 for i915, even if I keep it off for debugging. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. -- NONAKA Kimihiro
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:14:29 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added Logitec LAN-W450ANU2E. To generate a diff of this commit: cvs rdiff -u -r1.665 -r1.666 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.665 src/sys/dev/usb/usbdevs:1.666 --- src/sys/dev/usb/usbdevs:1.665 Fri Feb 28 11:52:09 2014 +++ src/sys/dev/usb/usbdevs Sun Apr 6 09:14:29 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.665 2014/02/28 11:52:09 martin Exp $ +$NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1990,6 +1990,7 @@ product LOGITEC RT2870_2 0x0163 RT2870 product LOGITEC RT2870_3 0x0164 RT2870 product LOGITEC LANW300NU2 0x0166 LAN-W300N/U2 product LOGITEC RT3020 0x0168 RT3020 +product LOGITEC LAN_W450ANU2E 0x016b LAN-W450ANU2E /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nonaka
Date: Sun Apr 6 09:15:42 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.657 -r1.658 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.658 -r1.659 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.657 src/sys/dev/usb/usbdevs.h:1.658
--- src/sys/dev/usb/usbdevs.h:1.657 Fri Feb 28 11:54:47 2014
+++ src/sys/dev/usb/usbdevs.h Sun Apr 6 09:15:41 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.657 2014/02/28 11:54:47 martin Exp $ */
+/* $NetBSD: usbdevs.h,v 1.658 2014/04/06 09:15:41 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.665 2014/02/28 11:52:09 martin Exp
+ * NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp
*/
/*
@@ -1997,6 +1997,7 @@
#define USB_PRODUCT_LOGITEC_RT2870_3 0x0164 /* RT2870 */
#define USB_PRODUCT_LOGITEC_LANW300NU2 0x0166 /* LAN-W300N/U2 */
#define USB_PRODUCT_LOGITEC_RT3020 0x0168 /* RT3020 */
+#define USB_PRODUCT_LOGITEC_LAN_W450ANU2E 0x016b /* LAN-W450ANU2E */
/* Logitech products */
#define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452 keyboard */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.658 src/sys/dev/usb/usbdevs_data.h:1.659
--- src/sys/dev/usb/usbdevs_data.h:1.658 Fri Feb 28 11:54:47 2014
+++ src/sys/dev/usb/usbdevs_data.h Sun Apr 6 09:15:42 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.658 2014/02/28 11:54:47 martin Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.659 2014/04/06 09:15:42 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.665 2014/02/28 11:52:09 martin Exp
+ * NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp
*/
/*
@@ -6183,6 +6183,10 @@ const struct usb_product usb_products[]
RT3020,
},
{
+ USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LAN_W450ANU2E,
+ LAN-W450ANU2E,
+ },
+ {
USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
M2452 keyboard,
},
@@ -10115,4 +10119,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1990;
+const int usb_nproducts = 1991;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:26:11 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added some PLANEX wlan devices. To generate a diff of this commit: cvs rdiff -u -r1.666 -r1.667 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.666 src/sys/dev/usb/usbdevs:1.667 --- src/sys/dev/usb/usbdevs:1.666 Sun Apr 6 09:14:29 2014 +++ src/sys/dev/usb/usbdevs Sun Apr 6 09:26:11 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp $ +$NetBSD: usbdevs,v 1.667 2014/04/06 09:26:11 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2515,10 +2515,12 @@ product PLANEX2 GWUS300MINIS 0xab24 GW-U product PLANEX2 RT3070 0xab25 RT3070 product PLANEX2 GWUSNANO 0xab28 GW-USNano product PLANEX2 GWUSMICRO300 0xab29 GW-USMicro300 -product PLANEX2 RTL8188CU_1 0xab2a RTL8188CU -product PLANEX2 RTL8192CU 0xab2b RTL8192CU +product PLANEX2 RTL8188CU_1 0xab2a GW-USNano2 +product PLANEX2 RTL8192CU 0xab2b GW-USEco300 product PLANEX2 RTL8188CU_4 0xab2e RTL8188CU +product PLANEX2 GW900D 0xab30 GW-900D product PLANEX2 GW450D 0xab31 GW-450D +product PLANEX2 GW450S 0xab32 GW-450S product PLANEX2 GWUS54MINI2 0xab50 GW-US54Mini2 product PLANEX2 GWUS54SG 0xc002 GW-US54SG product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nonaka
Date: Sun Apr 6 09:26:33 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.658 -r1.659 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.659 -r1.660 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.658 src/sys/dev/usb/usbdevs.h:1.659
--- src/sys/dev/usb/usbdevs.h:1.658 Sun Apr 6 09:15:41 2014
+++ src/sys/dev/usb/usbdevs.h Sun Apr 6 09:26:33 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.658 2014/04/06 09:15:41 nonaka Exp $ */
+/* $NetBSD: usbdevs.h,v 1.659 2014/04/06 09:26:33 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp
+ * NetBSD: usbdevs,v 1.667 2014/04/06 09:26:11 nonaka Exp
*/
/*
@@ -2522,10 +2522,12 @@
#define USB_PRODUCT_PLANEX2_RT3070 0xab25 /* RT3070 */
#define USB_PRODUCT_PLANEX2_GWUSNANO 0xab28 /* GW-USNano */
#define USB_PRODUCT_PLANEX2_GWUSMICRO300 0xab29 /* GW-USMicro300 */
-#define USB_PRODUCT_PLANEX2_RTL8188CU_1 0xab2a /* RTL8188CU */
-#define USB_PRODUCT_PLANEX2_RTL8192CU 0xab2b /* RTL8192CU */
+#define USB_PRODUCT_PLANEX2_RTL8188CU_1 0xab2a /* GW-USNano2 */
+#define USB_PRODUCT_PLANEX2_RTL8192CU 0xab2b /* GW-USEco300 */
#define USB_PRODUCT_PLANEX2_RTL8188CU_4 0xab2e /* RTL8188CU */
+#define USB_PRODUCT_PLANEX2_GW900D 0xab30 /* GW-900D */
#define USB_PRODUCT_PLANEX2_GW450D 0xab31 /* GW-450D */
+#define USB_PRODUCT_PLANEX2_GW450S 0xab32 /* GW-450S */
#define USB_PRODUCT_PLANEX2_GWUS54MINI2 0xab50 /* GW-US54Mini2 */
#define USB_PRODUCT_PLANEX2_GWUS54SG 0xc002 /* GW-US54SG */
#define USB_PRODUCT_PLANEX2_GWUS54GZL 0xc007 /* GW-US54GZL */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.659 src/sys/dev/usb/usbdevs_data.h:1.660
--- src/sys/dev/usb/usbdevs_data.h:1.659 Sun Apr 6 09:15:42 2014
+++ src/sys/dev/usb/usbdevs_data.h Sun Apr 6 09:26:33 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.659 2014/04/06 09:15:42 nonaka Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.660 2014/04/06 09:26:33 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.666 2014/04/06 09:14:29 nonaka Exp
+ * NetBSD: usbdevs,v 1.667 2014/04/06 09:26:11 nonaka Exp
*/
/*
@@ -7720,21 +7720,29 @@ const struct usb_product usb_products[]
},
{
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CU_1,
- RTL8188CU,
+ GW-USNano2,
},
{
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8192CU,
- RTL8192CU,
+ GW-USEco300,
},
{
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CU_4,
RTL8188CU,
},
{
+ USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW900D,
+ GW-900D,
+ },
+ {
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW450D,
GW-450D,
},
{
+ USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW450S,
+ GW-450S,
+ },
+ {
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2,
GW-US54Mini2,
},
@@ -10119,4 +10127,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1991;
+const int usb_nproducts = 1993;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sun Apr 6 09:53:59 UTC 2014 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: Remove a comment that became largely redundant with the PMAP_NOCACHE change. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/arm/arm32/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/bus_dma.c diff -u src/sys/arch/arm/arm32/bus_dma.c:1.84 src/sys/arch/arm/arm32/bus_dma.c:1.85 --- src/sys/arch/arm/arm32/bus_dma.c:1.84 Wed Apr 2 12:28:54 2014 +++ src/sys/arch/arm/arm32/bus_dma.c Sun Apr 6 09:53:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.84 2014/04/02 12:28:54 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.85 2014/04/06 09:53:59 skrll Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include opt_arm_bus_space.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.84 2014/04/02 12:28:54 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.85 2014/04/06 09:53:59 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -1362,15 +1362,6 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, PMAP_WIRED | (uncached ? PMAP_NOCACHE : 0)); - - /* - * If the memory must remain coherent with the - * cache then we must make the memory uncacheable - * in order to maintain virtual cache coherency. - * We must also guarantee the cache does not already - * contain the virtal addresses we are making - * uncacheable. - */ } } pmap_update(pmap_kernel());
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: pettai Date: Sun Apr 6 11:24:25 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal: heimdal2netbsd Log Message: fix small nit + missing step To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/heimdal2netbsd 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/heimdal/heimdal2netbsd diff -u src/crypto/external/bsd/heimdal/heimdal2netbsd:1.4 src/crypto/external/bsd/heimdal/heimdal2netbsd:1.5 --- src/crypto/external/bsd/heimdal/heimdal2netbsd:1.4 Sat Oct 8 19:30:02 2011 +++ src/crypto/external/bsd/heimdal/heimdal2netbsd Sun Apr 6 11:24:25 2014 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: heimdal2netbsd,v 1.4 2011/10/08 19:30:02 christos Exp $ +# $NetBSD: heimdal2netbsd,v 1.5 2014/04/06 11:24:25 pettai Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,9 +37,10 @@ # $ export HEIMDAL_SRCDIR=src/crypto/external/bsd/heimdal # $ cd /some/where/temporary # $ git clone git://svn.h5l.org/heimdal.git -# $ sh $SRCDIR/$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd` +# $ sh $SRCDIR/../$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd` # $ cd $HEIMDAL_SRCDIR/dist # $ cvs -d ... import $HEIMDAL_SRCDIR/dist HEIMDAL head-20110317 +# if any conflicts, merge, fix and commit them. # $ cd /some/where/temporary/heimdal # $ autoreconf -f -i # $ ./configure
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: skrll
Date: Sun Apr 6 12:43:19 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: std.rpi
src/sys/arch/evbarm/rpi: rpi.h rpi_machdep.c
Log Message:
Re-arrange RPI VM layout and enable __HAVE_MM_MD_DIRECT_MAPPED_PHYS. RPI
kernels now boot again.
I'm not admitting defeat in why there are problems with the
non-__HAVE_MM_MD_DIRECT_MAPPED_PHYS case.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/rpi/rpi.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/rpi/rpi_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/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.13 src/sys/arch/evbarm/conf/std.rpi:1.14
--- src/sys/arch/evbarm/conf/std.rpi:1.13 Tue Feb 25 19:37:30 2014
+++ src/sys/arch/evbarm/conf/std.rpi Sun Apr 6 12:43:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.13 2014/02/25 19:37:30 skrll Exp $
+# $NetBSD: std.rpi,v 1.14 2014/04/06 12:43:18 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -13,6 +13,7 @@ options ARM11_COMPAT_MMU
options __HAVE_CPU_COUNTER
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options TPIDRPRW_IS_CURCPU
options ARM_HAS_VBAR
options KERNEL_BASE_EXT=0xc000
Index: src/sys/arch/evbarm/rpi/rpi.h
diff -u src/sys/arch/evbarm/rpi/rpi.h:1.2 src/sys/arch/evbarm/rpi/rpi.h:1.3
--- src/sys/arch/evbarm/rpi/rpi.h:1.2 Thu Sep 5 07:09:33 2013
+++ src/sys/arch/evbarm/rpi/rpi.h Sun Apr 6 12:43:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi.h,v 1.2 2013/09/05 07:09:33 skrll Exp $ */
+/* $NetBSD: rpi.h,v 1.3 2014/04/06 12:43:19 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
/*
* Kernel VM space: KERNEL_VM_BASE to 0xf000
*/
-#define KERNEL_VM_BASE (KERNEL_BASE + 0x0100)
+#define KERNEL_VM_BASE (KERNEL_BASE + 0x2000)
#define KERNEL_VM_SIZE (0xf000 - KERNEL_VM_BASE)
/*
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.40 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.41
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.40 Tue Apr 1 06:55:29 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sun Apr 6 12:43:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.40 2014/04/01 06:55:29 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.41 2014/04/06 12:43:19 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.40 2014/04/01 06:55:29 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.41 2014/04/06 12:43:19 skrll Exp $);
#include opt_evbarm_boardtype.h
#include opt_ddb.h
@@ -537,11 +537,41 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf(initarm: Configuring system ...\n);
#endif
- arm32_bootmem_init(bootconfig.dram[0].address,
- bootconfig.dram[0].pages * PAGE_SIZE, (uintptr_t)KERNEL_BASE_phys);
+
+ psize_t ram_size = bootconfig.dram[0].pages * PAGE_SIZE;
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ if (ram_size KERNEL_VM_BASE - KERNEL_BASE) {
+ printf(%s: dropping RAM size from %luMB to %uMB\n,
+ __func__, (unsigned long) (ram_size 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) 20);
+ ram_size = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+
+ /*
+ * If MEMSIZE specified less than what we really have, limit ourselves
+ * to that.
+ */
+#ifdef MEMSIZE
+ if (ram_size == 0 || ram_size (unsigned)MEMSIZE * 1024 * 1024)
+ ram_size = (unsigned)MEMSIZE * 1024 * 1024;
+#else
+ KASSERTMSG(ram_size 0, RAM size unknown and MEMSIZE undefined);
+#endif
+
+ arm32_bootmem_init(bootconfig.dram[0].address, ram_size,
+ (uintptr_t)KERNEL_BASE_phys);
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+ KASSERT(ram_size = KERNEL_VM_BASE - KERNEL_BASE);
+#else
+ const bool mapallmem_p = false;
+#endif
arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, rpi_devmap,
- false);
+ mapallmem_p);
cpu_reset_address = bcm2835_system_reset;
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/roken
Module Name:src Committed By: christos Date: Sun Apr 6 14:36:35 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/roken: resolve.c Log Message: PR/48718: Juergen Hannken-Illjes: Heimdal leaks file descriptors Add missing call to free the resolve handle on success. XXX: pullup 6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1 Wed Apr 13 14:15:42 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Sun Apr 6 10:36:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: resolve.c,v 1.1.1.1 2011/04/13 18:15:42 elric Exp $ */ +/* $NetBSD: resolve.c,v 1.2 2014/04/06 14:36:35 christos Exp $ */ /* * Copyright (c) 1995 - 2006 Kungliga Tekniska Högskolan @@ -590,6 +590,7 @@ dns_lookup_int(const char *domain, int r len = min(len, size); r = parse_reply(reply, len); +resolve_free_handle(handle); free(reply); return r; }
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: martin
Date: Sun Apr 6 14:47:46 UTC 2014
Modified Files:
src/sys/arch/powerpc/powerpc: procfs_machdep.c
Log Message:
Make it compilable
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/powerpc/procfs_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/powerpc/powerpc/procfs_machdep.c
diff -u src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.8 src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.9
--- src/sys/arch/powerpc/powerpc/procfs_machdep.c:1.8 Sat Apr 5 18:44:32 2014
+++ src/sys/arch/powerpc/powerpc/procfs_machdep.c Sun Apr 6 14:47:46 2014
@@ -1,7 +1,7 @@
-/* $NetBSD: procfs_machdep.c,v 1.8 2014/04/05 18:44:32 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.9 2014/04/06 14:47:46 martin Exp $ */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_machdep.c,v 1.8 2014/04/05 18:44:32 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_machdep.c,v 1.9 2014/04/06 14:47:46 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -22,7 +22,7 @@ __KERNEL_RCSID(0, $NetBSD: procfs_machd
int
procfs_getcpuinfstr(char *buf, size_t *len)
{
- *size_t = 0;
+ *len = 0;
return 0;
}
CVS commit: [tls-earlyentropy] src/sys/arch/amd64/conf
Module Name:src Committed By: tls Date: Sun Apr 6 15:59:42 UTC 2014 Added Files: src/sys/arch/amd64/conf [tls-earlyentropy]: RNDVERBOSE Log Message: RNDVERBOSE kernel for testing. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/amd64/conf/RNDVERBOSE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/amd64/conf/RNDVERBOSE diff -u /dev/null src/sys/arch/amd64/conf/RNDVERBOSE:1.1.2.1 --- /dev/null Sun Apr 6 15:59:42 2014 +++ src/sys/arch/amd64/conf/RNDVERBOSE Sun Apr 6 15:59:42 2014 @@ -0,0 +1,24 @@ +# $NetBSD: RNDVERBOSE,v 1.1.2.1 2014/04/06 15:59:42 tls Exp $ +# +# GENERIC machine description file +# +# This machine description file is used to generate the default NetBSD +# kernel. The generic kernel does not include all options, subsystems +# and device drivers, but should be useful for most applications. +# +# The machine description file can be customised for your specific +# machine to reduce the kernel size and improve its performance. +# +# For further information on compiling NetBSD kernels, see the config(8) +# man page. +# +# For further information on hardware support for this architecture, see +# the intro(4) man page. For further information about kernel options +# for this architecture, see the options(4) man page. For an explanation +# of each device driver in this file see the section 4 man page for the +# device. + +include arch/amd64/conf/GENERIC + +options DEBUG,LOCKDEBUG,RND_VERBOSE +makeoptions DEBUG=-g
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Apr 6 16:38:34 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: Add missing declaration from last commit. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.5 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.6 --- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.5 Fri Apr 4 16:02:34 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Sun Apr 6 16:38:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci.c,v 1.5 2014/04/04 16:02:34 riastradh Exp $ */ +/* $NetBSD: i915_pci.c,v 1.6 2014/04/06 16:38:34 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.5 2014/04/04 16:02:34 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.6 2014/04/06 16:38:34 riastradh Exp $); #include sys/types.h #ifndef _MODULE @@ -75,6 +75,7 @@ static int i915drm_detach_framebuffer(de static int i915drm_fb_probe(struct drm_fb_helper *, struct drm_fb_helper_surface_size *); +static void i915drm_fb_detach(struct drm_fb_helper *); static int i915drm_fb_create_handle(struct drm_framebuffer *, struct drm_file *, unsigned int *); static void i915drm_fb_destroy(struct drm_framebuffer *); @@ -411,7 +412,7 @@ i915drm_fb_probe(struct drm_fb_helper *f goto fail3; } - prop_dictionary_set_bool(dict, is_console, 1); /* XXX */ + prop_dictionary_set_bool(dict, is_console, 0); /* XXX */ prop_dictionary_set_uint32(dict, width, mode_cmd.width); prop_dictionary_set_uint32(dict, height, mode_cmd.height); prop_dictionary_set_uint8(dict, depth, sizes-surface_bpp);
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Apr 6 16:42:00 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: Restore is_console=1 for i915, even if I keep it off for debugging. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.6 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.7 --- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.6 Sun Apr 6 16:38:34 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Sun Apr 6 16:42:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci.c,v 1.6 2014/04/06 16:38:34 riastradh Exp $ */ +/* $NetBSD: i915_pci.c,v 1.7 2014/04/06 16:42:00 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.6 2014/04/06 16:38:34 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.7 2014/04/06 16:42:00 riastradh Exp $); #include sys/types.h #ifndef _MODULE @@ -412,7 +412,7 @@ i915drm_fb_probe(struct drm_fb_helper *f goto fail3; } - prop_dictionary_set_bool(dict, is_console, 0); /* XXX */ + prop_dictionary_set_bool(dict, is_console, 1); /* XXX */ prop_dictionary_set_uint32(dict, width, mode_cmd.width); prop_dictionary_set_uint32(dict, height, mode_cmd.height); prop_dictionary_set_uint8(dict, depth, sizes-surface_bpp);
CVS commit: src/etc/rc.d
Module Name:src Committed By: khorben Date: Sun Apr 6 17:13:57 UTC 2014 Modified Files: src/etc/rc.d: dhcpcd Log Message: Allow the extra command reload to dhcpcd's rc script, letting it reload its configuration and rebind directly via the script. LGTM roy@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/dhcpcd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/dhcpcd diff -u src/etc/rc.d/dhcpcd:1.2 src/etc/rc.d/dhcpcd:1.3 --- src/etc/rc.d/dhcpcd:1.2 Tue Jun 25 13:02:53 2013 +++ src/etc/rc.d/dhcpcd Sun Apr 6 17:13:57 2014 @@ -9,6 +9,7 @@ $_rc_subr_loaded . /etc/rc.subr name=dhcpcd rcvar=$name command=/sbin/$name +extra_commands=reload load_rc_config $name
CVS commit: src
Module Name:src Committed By: kardel Date: Sun Apr 6 17:59:39 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi src/doc: CHANGES src/share/man/man4: Makefile src/sys/arch/evbarm/conf: RPI src/sys/dev/spi: files.spi Added Files: src/share/man/man4: mcp23s17gpio.4 src/sys/dev/spi: mcp23s17.c mcp23s17.h Log Message: add Microchip MCP23S17 GPIO driver (via SPI interface) To generate a diff of this commit: cvs rdiff -u -r1.1467 -r1.1468 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1910 -r1.1911 src/doc/CHANGES cvs rdiff -u -r1.611 -r1.612 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/mcp23s17gpio.4 cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spi/files.spi cvs rdiff -u -r0 -r1.1 src/sys/dev/spi/mcp23s17.c src/sys/dev/spi/mcp23s17.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1467 src/distrib/sets/lists/man/mi:1.1468 --- src/distrib/sets/lists/man/mi:1.1467 Tue Apr 1 21:40:46 2014 +++ src/distrib/sets/lists/man/mi Sun Apr 6 17:59:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1467 2014/04/01 21:40:46 christos Exp $ +# $NetBSD: mi,v 1.1468 2014/04/06 17:59:39 kardel Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1391,6 +1391,7 @@ ./usr/share/man/cat4/mlx.0 man-sys-catman .cat ./usr/share/man/cat4/mly.0 man-sys-catman .cat ./usr/share/man/cat4/module.0 man-obsolete obsolete +./usr/share/man/cat4/mcp23s17gpio.0 man-sys-catman .cat ./usr/share/man/cat4/mpii.0 man-sys-catman .cat ./usr/share/man/cat4/mpl115a.0 man-sys-catman .cat ./usr/share/man/cat4/mpls.0 man-sys-catman .cat @@ -4387,6 +4388,7 @@ ./usr/share/man/html4/mlx.html man-sys-htmlman html ./usr/share/man/html4/mly.html man-sys-htmlman html ./usr/share/man/html4/module.html man-obsolete obsolete +./usr/share/man/html4/mcp23s17gpio.html man-sys-htmlman html ./usr/share/man/html4/mpii.html man-sys-htmlman html ./usr/share/man/html4/mpl115a.html man-sys-htmlman html ./usr/share/man/html4/mpls.html man-sys-htmlman html @@ -7231,6 +7233,7 @@ ./usr/share/man/man4/mlx.4 man-sys-man .man ./usr/share/man/man4/mly.4 man-sys-man .man ./usr/share/man/man4/module.4 man-obsolete obsolete +./usr/share/man/man4/mcp23s17gpio.4 man-sys-man .man ./usr/share/man/man4/mpii.4 man-sys-man .man ./usr/share/man/man4/mpl115a.4 man-sys-man .man ./usr/share/man/man4/mpls.4 man-sys-man .man Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1910 src/doc/CHANGES:1.1911 --- src/doc/CHANGES:1.1910 Sat Apr 5 02:25:44 2014 +++ src/doc/CHANGES Sun Apr 6 17:59:39 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1910 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1911 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -382,3 +382,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: ptyfs: Allow multiple mounts and support proper device visibility in chroots (Ilya Zykov) [christos 20140404] i386: Switched to GCC 4.8. [christos 20140404] + mcp23s17gpio: Add Microchip MCP23S17 16-bit GPIO chip driver. + e.g. Rasberry Pi interface boards [kardel 20140406] \ No newline at end of file Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.611 src/share/man/man4/Makefile:1.612 --- src/share/man/man4/Makefile:1.611 Wed Mar 19 15:26:41 2014 +++ src/share/man/man4/Makefile Sun Apr 6 17:59:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.611 2014/03/19 15:26:41 nonaka Exp $ +# $NetBSD: Makefile,v 1.612 2014/04/06 17:59:39 kardel Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -37,7 +37,8 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a jme.4 jmide.4 joy.4 \ kloader.4 kse.4 ksyms.4 kttcp.4 \ lc.4 ld.4 lii.4 lo.4 lua.4 lxtphy.4 \ - mainbus.4 makphy.4 malo.4 mbe.4 mca.4 mcclock.4 md.4 mfb.4 mfi.4 mhzc.4 \ + mainbus.4 makphy.4 malo.4 mbe.4 mca.4 mcclock.4 mcp23s17gpio.4 md.4 mfb.4 \ + mfi.4 mhzc.4 \ micphy.4 midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpls.4 mpii.4 mpt.4 mpu.4 mtd.4 \ mtio.4 msm6242b.4 multicast.4 mvsata.4 \ nadb.4 ne.4 neo.4 netintro.4 nfe.4 nfsmb.4 njata.4 njs.4 \ Index: src/sys/arch/evbarm/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.42 src/sys/arch/evbarm/conf/RPI:1.43 --- src/sys/arch/evbarm/conf/RPI:1.42 Fri Jan 31 08:18:03 2014 +++ src/sys/arch/evbarm/conf/RPI Sun Apr 6 17:59:39 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.42 2014/01/31 08:18:03 skrll Exp $ +# $NetBSD: RPI,v 1.43 2014/04/06 17:59:39 kardel Exp $ # # RPi -- Raspberry Pi # @@ -225,6 +225,15 @@ iic* at i2cbus? bcmspi* at obio? spi* at spibus? +# PIFace or other boards using that chip (needs gpio) +#mcp23s17gpio0 at spi? slave 0 flags
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: joerg Date: Sun Apr 6 18:48:06 UTC 2014 Modified Files: src/sys/arch/x86/include: loadfile_machdep.h Log Message: x86_progress takes a format string. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/loadfile_machdep.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/x86/include/loadfile_machdep.h diff -u src/sys/arch/x86/include/loadfile_machdep.h:1.4 src/sys/arch/x86/include/loadfile_machdep.h:1.5 --- src/sys/arch/x86/include/loadfile_machdep.h:1.4 Sat Mar 21 15:01:56 2009 +++ src/sys/arch/x86/include/loadfile_machdep.h Sun Apr 6 18:48:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.4 2009/03/21 15:01:56 ad Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.5 2014/04/06 18:48:06 joerg Exp $ */ /*- * Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ #define DEALLOC(a, b) dealloc(a, b) #define OKMAGIC(a) ((a) == ZMAGIC) -void x86_progress(const char *, ...); +void x86_progress(const char *, ...) __printflike(1, 2); void vpbcopy(const void *, void *, size_t); void pbzero(void *, size_t); ssize_t pread(int, void *, size_t);
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Sun Apr 6 19:11:26 UTC 2014
Modified Files:
src/sys/arch/i386/stand/lib: bootmenu.c menuutils.c
Log Message:
Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/bootmenu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/lib/menuutils.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/i386/stand/lib/bootmenu.c
diff -u src/sys/arch/i386/stand/lib/bootmenu.c:1.11 src/sys/arch/i386/stand/lib/bootmenu.c:1.12
--- src/sys/arch/i386/stand/lib/bootmenu.c:1.11 Sun Jul 28 08:50:09 2013
+++ src/sys/arch/i386/stand/lib/bootmenu.c Sun Apr 6 19:11:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bootmenu.c,v 1.11 2013/07/28 08:50:09 he Exp $ */
+/* $NetBSD: bootmenu.c,v 1.12 2014/04/06 19:11:26 jakllsch Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -345,7 +345,7 @@ bootdefault(void)
}
}
-void
+__dead void
doboottypemenu(void)
{
int choice;
Index: src/sys/arch/i386/stand/lib/menuutils.c
diff -u src/sys/arch/i386/stand/lib/menuutils.c:1.3 src/sys/arch/i386/stand/lib/menuutils.c:1.4
--- src/sys/arch/i386/stand/lib/menuutils.c:1.3 Sun Dec 14 18:46:33 2008
+++ src/sys/arch/i386/stand/lib/menuutils.c Sun Apr 6 19:11:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: menuutils.c,v 1.3 2008/12/14 18:46:33 christos Exp $ */
+/* $NetBSD: menuutils.c,v 1.4 2014/04/06 19:11:26 jakllsch Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -61,7 +61,7 @@ docommand(char *arg)
command_help(NULL);
}
-void
+__dead void
bootmenu(void)
{
char input[80];
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Sun Apr 6 19:18:00 UTC 2014
Modified Files:
src/sys/arch/i386/stand/lib: exec.c
Log Message:
Misc WARNS=4 fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/stand/lib/exec.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/i386/stand/lib/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.58 src/sys/arch/i386/stand/lib/exec.c:1.59
--- src/sys/arch/i386/stand/lib/exec.c:1.58 Fri Jan 10 17:40:51 2014
+++ src/sys/arch/i386/stand/lib/exec.c Sun Apr 6 19:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.58 2014/01/10 17:40:51 jakllsch Exp $ */
+/* $NetBSD: exec.c,v 1.59 2014/04/06 19:18:00 jakllsch Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -418,7 +418,7 @@ out:
static void
extract_device(const char *path, char *buf, size_t buflen)
{
- int i;
+ size_t i;
if (strchr(path, ':') != NULL) {
for (i = 0; i buflen - 2 path[i] != ':'; i++)
@@ -440,7 +440,7 @@ module_path(boot_module_t *bm, const cha
for (name2 = name; *name2; ++name2) {
if (*name2 == ' ' || *name2 == '\t') {
strlcpy(name_buf, name, sizeof(name_buf));
- if (name2 - name sizeof(name_buf))
+ if ((uintptr_t)name2 - (uintptr_t)name sizeof(name_buf))
name_buf[name2 - name] = '\0';
name = name_buf;
break;
@@ -504,7 +504,7 @@ module_init(const char *kernel_path)
char kdev[64];
char *buf;
boot_module_t *bm;
- size_t len;
+ ssize_t len;
off_t off;
int err, fd, nfail = 0;
CVS commit: src/sys/fs
Module Name:src
Committed By: jakllsch
Date: Sun Apr 6 19:25:22 UTC 2014
Modified Files:
src/sys/fs: unicode.h
Log Message:
Use size_t instead of int for character count to avoid sign compare issues.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/fs/unicode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/unicode.h
diff -u src/sys/fs/unicode.h:1.6 src/sys/fs/unicode.h:1.7
--- src/sys/fs/unicode.h:1.6 Mon Apr 28 20:24:02 2008
+++ src/sys/fs/unicode.h Sun Apr 6 19:25:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: unicode.h,v 1.6 2008/04/28 20:24:02 martin Exp $ */
+/* $NetBSD: unicode.h,v 1.7 2014/04/06 19:25:22 jakllsch Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ static int wput_utf8(char *, size_t, u_i
static u_int16_t
wget_utf8(const char **str, size_t *sz)
{
- int c;
+ size_t c;
u_int16_t rune = 0;
const char *s = *str;
static const int _utf_count[16] = {
CVS commit: src/tests/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Sun Apr 6 19:28:59 UTC 2014
Modified Files:
src/tests/lib/libc/ssp: Makefile t_ssp.sh
Added Files:
src/tests/lib/libc/ssp: h_stpcpy.c h_stpncpy.c
Log Message:
add stp*cpy() tests
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/ssp/Makefile \
src/tests/lib/libc/ssp/t_ssp.sh
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/ssp/h_stpcpy.c \
src/tests/lib/libc/ssp/h_stpncpy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.6 src/tests/lib/libc/ssp/Makefile:1.7
--- src/tests/lib/libc/ssp/Makefile:1.6 Sun Sep 23 13:22:25 2012
+++ src/tests/lib/libc/ssp/Makefile Sun Apr 6 15:28:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/23 17:22:25 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/04/06 19:28:59 christos Exp $
NOMAN= # defined
@@ -39,6 +39,8 @@ PROGS+= h_read
PROGS+= h_readlink
PROGS+= h_snprintf
PROGS+= h_sprintf
+PROGS+= h_stpcpy
+PROGS+= h_stpncpy
PROGS+= h_strcat
PROGS+= h_strcpy
PROGS+= h_strncat
Index: src/tests/lib/libc/ssp/t_ssp.sh
diff -u src/tests/lib/libc/ssp/t_ssp.sh:1.6 src/tests/lib/libc/ssp/t_ssp.sh:1.7
--- src/tests/lib/libc/ssp/t_ssp.sh:1.6 Fri Jan 10 05:45:34 2014
+++ src/tests/lib/libc/ssp/t_ssp.sh Sun Apr 6 15:28:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_ssp.sh,v 1.6 2014/01/10 10:45:34 martin Exp $
+# $NetBSD: t_ssp.sh,v 1.7 2014/04/06 19:28:59 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -167,6 +167,19 @@ strcpy_body()
h_fail $prog 0123456789
}
+atf_test_case stpcpy
+stpcpy_head()
+{
+ atf_set descr Checks stpcpy(3)
+}
+stpcpy_body()
+{
+ prog=$(atf_get_srcdir)/h_stpcpy
+
+ h_pass $prog 0123456
+ h_fail $prog 0123456789
+}
+
atf_test_case strcat
strcat_head()
{
@@ -193,6 +206,19 @@ strncpy_body()
h_fail $prog 11
}
+atf_test_case stpncpy
+stpncpy_head()
+{
+ atf_set descr Checks stpncpy(3)
+}
+stpncpy_body()
+{
+ prog=$(atf_get_srcdir)/h_stpncpy
+
+ h_pass $prog 10
+ h_fail $prog 11
+}
+
atf_test_case strncat
strncat_head()
{
@@ -269,6 +295,8 @@ atf_init_test_cases()
atf_add_test_case memcpy
atf_add_test_case memmove
atf_add_test_case memset
+ atf_add_test_case stpcpy
+ atf_add_test_case stpncpy
atf_add_test_case strcat
atf_add_test_case strcpy
atf_add_test_case strncat
Added files:
Index: src/tests/lib/libc/ssp/h_stpcpy.c
diff -u /dev/null src/tests/lib/libc/ssp/h_stpcpy.c:1.1
--- /dev/null Sun Apr 6 15:28:59 2014
+++ src/tests/lib/libc/ssp/h_stpcpy.c Sun Apr 6 15:28:59 2014
@@ -0,0 +1,49 @@
+/* $NetBSD: h_stpcpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $ */
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__COPYRIGHT(@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.);
+__RCSID($NetBSD: h_stpcpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $);
+
+#include stdio.h
+#include stdlib.h
+#include string.h
+
+int
+main(int argc, char *argv[])
+{
+ char b[10];
+ char *q = stpcpy(b, argv[1]);
+
+ if ((size_t)(q - b) != strlen(argv[1]))
+ abort();
+
+ (void)printf(%s\n, b);
+ return 0;
+}
Index: src/tests/lib/libc/ssp/h_stpncpy.c
diff -u /dev/null src/tests/lib/libc/ssp/h_stpncpy.c:1.1
--- /dev/null Sun Apr 6 15:28:59 2014
+++ src/tests/lib/libc/ssp/h_stpncpy.c Sun Apr 6 15:28:59 2014
@@ -0,0 +1,51 @@
+/* $NetBSD: h_stpncpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $ */
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ *
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Sun Apr 6 19:29:25 UTC 2014
Modified Files:
src/lib/libc/ssp: stpcpy_chk.c
Log Message:
fix incorrect bounds check
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/ssp/stpcpy_chk.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/ssp/stpcpy_chk.c
diff -u src/lib/libc/ssp/stpcpy_chk.c:1.4 src/lib/libc/ssp/stpcpy_chk.c:1.5
--- src/lib/libc/ssp/stpcpy_chk.c:1.4 Sat Apr 5 21:13:59 2014
+++ src/lib/libc/ssp/stpcpy_chk.c Sun Apr 6 15:29:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stpcpy_chk.c,v 1.4 2014/04/06 01:13:59 christos Exp $ */
+/* $NetBSD: stpcpy_chk.c,v 1.5 2014/04/06 19:29:25 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: stpcpy_chk.c,v 1.4 2014/04/06 01:13:59 christos Exp $);
+__RCSID($NetBSD: stpcpy_chk.c,v 1.5 2014/04/06 19:29:25 christos Exp $);
/*LINTLIBRARY*/
@@ -45,11 +45,11 @@ char *__stpcpy_chk(char * __restrict, co
char *
__stpcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{
- size_t len = strlen(src) + 1;
+ size_t len = strlen(src);
- if (len slen)
+ if (len = slen)
__chk_fail();
- (void)memcpy(dst, src, len);
- return dst + len - 1;
+ (void)memcpy(dst, src, len + 1);
+ return dst + len;
}
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Sun Apr 6 19:29:37 UTC 2014
Modified Files:
src/lib/libc/ssp: Makefile.inc
Log Message:
add __stpncpy_chk
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/ssp/Makefile.inc
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/ssp/Makefile.inc
diff -u src/lib/libc/ssp/Makefile.inc:1.4 src/lib/libc/ssp/Makefile.inc:1.5
--- src/lib/libc/ssp/Makefile.inc:1.4 Wed Nov 6 21:01:42 2013
+++ src/lib/libc/ssp/Makefile.inc Sun Apr 6 15:29:37 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2013/11/07 02:01:42 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/04/06 19:29:37 christos Exp $
.PATH: ${.CURDIR}/ssp
SSP_SRCS= gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
- snprintf_chk.c sprintf_chk.c stpcpy_chk.c \
+ snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
vsnprintf_chk.c vsprintf_chk.c
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Sun Apr 6 19:29:58 UTC 2014 Modified Files: src/include/ssp: string.h Log Message: add stpncpy() To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/ssp/string.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/ssp/string.h diff -u src/include/ssp/string.h:1.9 src/include/ssp/string.h:1.10 --- src/include/ssp/string.h:1.9 Wed Nov 6 21:00:54 2013 +++ src/include/ssp/string.h Sun Apr 6 15:29:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: string.h,v 1.9 2013/11/07 02:00:54 christos Exp $ */ +/* $NetBSD: string.h,v 1.10 2014/04/06 19:29:58 christos Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -82,6 +82,7 @@ __ssp_bos_icheck3_restrict(memcpy, void __ssp_bos_icheck3(memmove, void *, const void *) __ssp_bos_icheck3(memset, void *, int) __ssp_bos_icheck2_restrict(stpcpy, char *, const char *) +__ssp_bos_icheck3_restrict(stpncpy, char *, const char *) __ssp_bos_icheck2_restrict(strcpy, char *, const char *) __ssp_bos_icheck2_restrict(strcat, char *, const char *) __ssp_bos_icheck3_restrict(strncpy, char *, const char *) @@ -92,6 +93,7 @@ __END_DECLS #define memmove(dst, src, len) __ssp_bos_check3(memmove, dst, src, len) #define memset(dst, val, len) __ssp_bos_check3(memset, dst, val, len) #define stpcpy(dst, src) __ssp_bos_check2(stpcpy, dst, src) +#define stpncpy(dst, src, len) __ssp_bos_check3(stpncpy, dst, src, len) #define strcpy(dst, src) __ssp_bos_check2(strcpy, dst, src) #define strcat(dst, src) __ssp_bos_check2(strcat, dst, src) #define strncpy(dst, src, len) __ssp_bos_check3(strncpy, dst, src, len)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sun Apr 6 19:47:20 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Move kernel to load at 16MB since the first 14MB is reserved for use by u-boot. Support direct-mapped memory since the 1GB can fit in the space between KERNEL_BASE and KERNEL_VM_BASE. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/MIRABOX diff -u src/sys/arch/evbarm/conf/MIRABOX:1.3 src/sys/arch/evbarm/conf/MIRABOX:1.4 --- src/sys/arch/evbarm/conf/MIRABOX:1.3 Tue Mar 18 08:22:05 2014 +++ src/sys/arch/evbarm/conf/MIRABOX Sun Apr 6 19:47:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: MIRABOX,v 1.3 2014/03/18 08:22:05 matt Exp $ +# $NetBSD: MIRABOX,v 1.4 2014/04/06 19:47:20 matt Exp $ # # This configuration supports for generically GlobalScale MiraBox # @@ -13,6 +13,13 @@ options EVBARM_BOARDTYPE=mirabox #options VERBOSE_INIT_ARM no options MEMSIZE options MEMSIZE=0x4000 +options __HAVE_MM_MD_DIRECT_MAPPED_PHYS +#options UVMHIST +#options UVMHIST_PRINT,KERNHIST_DELAY=0 +no makeoptions KERNEL_BASE_PHYS +makeoptions KERNEL_BASE_PHYS=0x0100 +no makeoptions KERNEL_BASE_VIRT +makeoptions KERNEL_BASE_VIRT=0x8100 # CPU options options FPU_VFP
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Apr 6 19:51:40 UTC 2014 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add stp*cpy tests. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.563 -r1.564 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.54 src/distrib/sets/lists/debug/mi:1.55 --- src/distrib/sets/lists/debug/mi:1.54 Tue Apr 1 17:40:46 2014 +++ src/distrib/sets/lists/debug/mi Sun Apr 6 15:51:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.54 2014/04/01 21:40:46 christos Exp $ +# $NetBSD: mi,v 1.55 2014/04/06 19:51:39 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1881,6 +1881,8 @@ ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_readlink.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_snprintf.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_sprintf.debug tests-lib-debug debug,atf,ssp +./usr/libdata/debug/usr/tests/lib/libc/ssp/h_stpcpy.debug tests-lib-debug debug,atf,ssp +./usr/libdata/debug/usr/tests/lib/libc/ssp/h_stpncpy.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcat.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcpy.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncat.debug tests-lib-debug debug,atf,ssp Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.563 src/distrib/sets/lists/tests/mi:1.564 --- src/distrib/sets/lists/tests/mi:1.563 Sat Feb 8 14:17:43 2014 +++ src/distrib/sets/lists/tests/mi Sun Apr 6 15:51:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.563 2014/02/08 19:17:43 jmmv Exp $ +# $NetBSD: mi,v 1.564 2014/04/06 19:51:40 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2109,6 +2109,8 @@ ./usr/tests/lib/libc/ssp/h_readlink tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_snprintf tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_sprintf tests-lib-tests atf,ssp +./usr/tests/lib/libc/ssp/h_stpcpy tests-lib-tests atf,ssp +./usr/tests/lib/libc/ssp/h_stpncpy tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_strcat tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_strcpy tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_strncat tests-lib-tests atf,ssp
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Sun Apr 6 23:29:58 UTC 2014 Modified Files: src/sys/dev/ic: com.c Log Message: PR/48720: John Kelly: com driver does not allow B0 to be set. The code to handle B0 was commented out for no reason given at revision 1.99. POSIX mandates to hangup on B0: http://pubs.opengroup.org/onlinepubs/9699919799/functions/tcsetattr.html To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/dev/ic/com.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/ic/com.c diff -u src/sys/dev/ic/com.c:1.323 src/sys/dev/ic/com.c:1.324 --- src/sys/dev/ic/com.c:1.323 Sun Mar 16 01:20:27 2014 +++ src/sys/dev/ic/com.c Sun Apr 6 19:29:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.323 2014/03/16 05:20:27 dholland Exp $ */ +/* $NetBSD: com.c,v 1.324 2014/04/06 23:29:58 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.323 2014/03/16 05:20:27 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.324 2014/04/06 23:29:58 christos Exp $); #include opt_com.h #include opt_ddb.h @@ -296,11 +296,9 @@ comspeed(long speed, long frequency, int divisor = 13; } -#if 0 if (speed == 0) return (0); -#endif - if (speed = 0) + if (speed 0) return (-1); x = divrnd(frequency / divisor, speed); if (x = 0) @@ -1426,9 +1424,9 @@ comparam(struct tty *tp, struct termios } sc-sc_msr_mask = sc-sc_msr_cts | sc-sc_msr_dcd; -#if 0 if (ospeed == 0) CLR(sc-sc_mcr, sc-sc_mcr_dtr); +#if 0 else SET(sc-sc_mcr, sc-sc_mcr_dtr); #endif
CVS commit: src/sys/net80211
Module Name:src
Committed By: pooka
Date: Mon Apr 7 00:07:40 UTC 2014
Modified Files:
src/sys/net80211: ieee80211_netbsd.c ieee80211_netbsd.h
ieee80211_rssadapt.c
Log Message:
Use module-compatible sysctl init instead of link sets.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/net80211/ieee80211_netbsd.h \
src/sys/net80211/ieee80211_rssadapt.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/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.25 src/sys/net80211/ieee80211_netbsd.c:1.26
--- src/sys/net80211/ieee80211_netbsd.c:1.25 Tue Feb 25 18:30:12 2014
+++ src/sys/net80211/ieee80211_netbsd.c Mon Apr 7 00:07:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.25 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.26 2014/04/07 00:07:40 pooka Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -30,7 +30,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $);
#else
-__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.25 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.26 2014/04/07 00:07:40 pooka Exp $);
#endif
/*
@@ -68,6 +68,8 @@ static struct ieee80211_node *ieee80211_
struct ieee80211_node_walk *, u_short);
static int ieee80211_sysctl_node(SYSCTLFN_ARGS);
+static void ieee80211_sysctl_setup(void);
+
#ifdef IEEE80211_DEBUG
int ieee80211_debug = 0;
#endif
@@ -81,6 +83,8 @@ ieee80211_init0(void)
{
ieee80211_setup_func * const *ieee80211_setup, f;
+ ieee80211_sysctl_setup();
+
if (max_linkhdr ALIGN(sizeof(struct ieee80211_qosframe_addr4))) {
max_linkhdr = ALIGN(sizeof(struct ieee80211_qosframe_addr4));
}
@@ -459,28 +463,32 @@ cleanup:
*
* TBD condition CTLFLAG_PERMANENT on being a module or not
*/
-SYSCTL_SETUP(sysctl_ieee80211, sysctl ieee80211 subtree setup)
+static struct sysctllog *ieee80211_sysctllog;
+static void
+ieee80211_sysctl_setup(void)
{
int rc;
const struct sysctlnode *cnode, *rnode;
- if ((rnode = ieee80211_sysctl_treetop(clog)) == NULL)
+ if ((rnode = ieee80211_sysctl_treetop(ieee80211_sysctllog)) == NULL)
return;
- if ((rc = sysctl_createv(clog, 0, rnode, NULL,
+ if ((rc = sysctl_createv(ieee80211_sysctllog, 0, rnode, NULL,
CTLFLAG_PERMANENT, CTLTYPE_NODE, nodes, client/peer stations,
ieee80211_sysctl_node, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
#ifdef IEEE80211_DEBUG
/* control debugging printfs */
- if ((rc = sysctl_createv(clog, 0, rnode, cnode,
+ if ((rc = sysctl_createv(ieee80211_sysctllog, 0, rnode, cnode,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
debug, SYSCTL_DESCR(control debugging printfs),
NULL, 0, ieee80211_debug, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
#endif /* IEEE80211_DEBUG */
+ ieee80211_rssadapt_sysctl_setup(ieee80211_sysctllog);
+
return;
err:
printf(%s: sysctl_createv failed (rc = %d)\n, __func__, rc);
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.18 src/sys/net80211/ieee80211_netbsd.h:1.19
--- src/sys/net80211/ieee80211_netbsd.h:1.18 Thu Jun 27 17:47:18 2013
+++ src/sys/net80211/ieee80211_netbsd.h Mon Apr 7 00:07:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.18 2013/06/27 17:47:18 christos Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.19 2014/04/07 00:07:40 pooka Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -240,6 +240,8 @@ void ieee80211_sysctl_attach(struct ieee
void ieee80211_sysctl_detach(struct ieee80211com *);
void ieee80211_load_module(const char *);
+void ieee80211_rssadapt_sysctl_setup(struct sysctllog **);
+
void ieee80211_init(void);
#define IEEE80211_CRYPTO_SETUP(name)\
static void name(void); \
Index: src/sys/net80211/ieee80211_rssadapt.c
diff -u src/sys/net80211/ieee80211_rssadapt.c:1.18 src/sys/net80211/ieee80211_rssadapt.c:1.19
--- src/sys/net80211/ieee80211_rssadapt.c:1.18 Tue Feb 25 18:30:12 2014
+++ src/sys/net80211/ieee80211_rssadapt.c Mon Apr 7 00:07:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_rssadapt.c,v 1.18 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ieee80211_rssadapt.c,v 1.19 2014/04/07 00:07:40 pooka Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_rssadapt.c,v 1.18 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_rssadapt.c,v 1.19 2014/04/07 00:07:40 pooka Exp $);
#endif
#include sys/param.h
@@ -141,8 +141,8 @@ sysctl_ieee80211_rssadapt_expavgctl(SYSC
*
* TBD condition CTLFLAG_PERMANENT on being a module or not
*/
CVS commit: [tls-earlyentropy] src
Module Name:src Committed By: tls Date: Mon Apr 7 01:10:55 UTC 2014 Modified Files: src/external/bsd/liblzf/dist [tls-earlyentropy]: lzfP.h lzf_c.c lzf_d.c src/sys/lib/libkern [tls-earlyentropy]: Makefile.libkern libkern.h Log Message: LZF in the kernel. As an entropy estimator for now but it's very small, and we could use it for ipcomp, for hibernation, for paging, for core dumps, etc. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/liblzf/dist/lzfP.h cvs rdiff -u -r1.4 -r1.4.8.1 src/external/bsd/liblzf/dist/lzf_c.c cvs rdiff -u -r1.3 -r1.3.22.1 src/external/bsd/liblzf/dist/lzf_d.c cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/lib/libkern/Makefile.libkern cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/lib/libkern/libkern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/liblzf/dist/lzfP.h diff -u src/external/bsd/liblzf/dist/lzfP.h:1.3 src/external/bsd/liblzf/dist/lzfP.h:1.3.8.1 --- src/external/bsd/liblzf/dist/lzfP.h:1.3 Sun Sep 16 18:59:27 2012 +++ src/external/bsd/liblzf/dist/lzfP.h Mon Apr 7 01:10:55 2014 @@ -37,22 +37,21 @@ #ifndef LZFP_h #define LZFP_h -#define STANDALONE 1 /* at the moment, this is ok. */ - -#ifndef STANDALONE -# include lzf.h +#if !defined(_KERNEL) !defined(_STANDALONE) +#include sys/types.h +#include inttypes.h #endif /* - * Size of hashtable is (1 HLOG) * sizeof (char *) + * Size of hashtable is (1 LZF_HLOG) * sizeof (char *) * decompression is independent of the hash table size * the difference between 15 and 14 is very small * for small blocks (and 14 is usually a bit faster). - * For a low-memory/faster configuration, use HLOG == 13; + * For a low-memory/faster configuration, use LZF_HLOG == 13; * For best compression, use 15 or 16 (or more, up to 23). */ -#ifndef HLOG -# define HLOG 16 +#ifndef LZF_HLOG +# define LZF_HLOG 16 #endif /* @@ -77,9 +76,12 @@ /* * Unconditionally aligning does not cost very much, so do it if unsure + * + * In fact, on modern x86 processors, strict alignment is faster whether + * in 32 or 64 bit mode. */ -#ifndef STRICT_ALIGN -# define STRICT_ALIGN !(defined(__i386) || defined (__amd64)) +#ifndef STRICT_ALIGN +# define STRICT_ALIGN 1 /* !(defined(__i386) || defined (__amd64)) */ #endif /* @@ -124,21 +126,11 @@ /*/ /* nothing should be changed below */ -typedef unsigned char u8; - -typedef const u8 *LZF_STATE[1 (HLOG)]; +typedef uint8_t u8; +typedef uint16_t u16; -#if !STRICT_ALIGN -/* for unaligned accesses we need a 16 bit datatype. */ -# include limits.h -# if USHRT_MAX == 65535 -typedef unsigned short u16; -# elif UINT_MAX == 65535 -typedef unsigned int u16; -# else -# undef STRICT_ALIGN -# define STRICT_ALIGN 1 -# endif +#if !defined(_KERNEL) !defined(STANDALONE) +typedef const u8 *LZF_STATE[1 (LZF_HLOG)]; #endif #if ULTRA_FAST Index: src/external/bsd/liblzf/dist/lzf_c.c diff -u src/external/bsd/liblzf/dist/lzf_c.c:1.4 src/external/bsd/liblzf/dist/lzf_c.c:1.4.8.1 --- src/external/bsd/liblzf/dist/lzf_c.c:1.4 Sun Sep 16 18:59:27 2012 +++ src/external/bsd/liblzf/dist/lzf_c.c Mon Apr 7 01:10:55 2014 @@ -34,9 +34,14 @@ * either the BSD or the GPL. */ +#if defined(_KERNEL) || defined (_STANDALONE) +#include lib/libkern/libkern.h +#include lzfP.h +#else #include lzf.h +#endif -#define HSIZE (1 (HLOG)) +#define HSIZE (1 (LZF_HLOG)) /* * don't play with this unless you benchmark! @@ -48,16 +53,16 @@ # define FRST(p) (((p[0]) 8) | p[1]) # define NEXT(v,p) (((v) 8) | p[2]) # if ULTRA_FAST -# define IDX(h) ((( h (3*8 - HLOG)) - h ) (HSIZE - 1)) +# define IDX(h) ((( h (3*8 - LZF_HLOG)) - h ) (HSIZE - 1)) # elif VERY_FAST -# define IDX(h) ((( h (3*8 - HLOG)) - h*5) (HSIZE - 1)) +# define IDX(h) ((( h (3*8 - LZF_HLOG)) - h*5) (HSIZE - 1)) # else -# define IDX(h) h ^ (h 5)) (3*8 - HLOG)) - h*5) (HSIZE - 1)) +# define IDX(h) h ^ (h 5)) (3*8 - LZF_HLOG)) - h*5) (HSIZE - 1)) # endif #endif /* * IDX works because it is very similar to a multiplicative hash, e.g. - * ((h * 57321 (3*8 - HLOG)) (HSIZE - 1)) + * ((h * 57321 (3*8 - LZF_HLOG)) (HSIZE - 1)) * the latter is also quite fast on newer CPUs, and compresses similarly. * * the next one is also quite good, albeit slow ;) @@ -147,7 +152,7 @@ lzf_compress_r (const void *const in_dat #endif (off = ip - ref - 1) MAX_OFF ip + 4 in_end - ref (u8 *)in_data + ref (const u8 *)in_data #if STRICT_ALIGN ref[0] == ip[0] ref[1] == ip[1] Index: src/external/bsd/liblzf/dist/lzf_d.c diff -u src/external/bsd/liblzf/dist/lzf_d.c:1.3 src/external/bsd/liblzf/dist/lzf_d.c:1.3.22.1 --- src/external/bsd/liblzf/dist/lzf_d.c:1.3 Tue Apr 5 06:24:42
CVS commit: src/external/bsd/libpcap/include
Module Name:src Committed By: pooka Date: Mon Apr 7 01:29:12 UTC 2014 Modified Files: src/external/bsd/libpcap/include: config.h Log Message: Re-add cloning bpf definition that got lost in rev 1.4. Needed at least for wpa_supplicant against a rump kernel (which does not create the old-style bpf device nodes). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libpcap/include/config.h diff -u src/external/bsd/libpcap/include/config.h:1.5 src/external/bsd/libpcap/include/config.h:1.6 --- src/external/bsd/libpcap/include/config.h:1.5 Tue Dec 31 17:08:14 2013 +++ src/external/bsd/libpcap/include/config.h Mon Apr 7 01:29:12 2014 @@ -5,7 +5,7 @@ /* #undef BDEBUG */ /* define if you have a cloning BPF device */ -/* #undef HAVE_CLONING_BPF */ +#define HAVE_CLONING_BPF 1 /* define if you have the DAG API */ /* #undef HAVE_DAG_API */
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Mon Apr 7 01:45:36 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_if_iwn: Makefile PCI_IF_IWN.ioconf
iwn_at_pci.c shlib_version
Log Message:
Add a rump kernel component for the iwn wireless driver, tested with
the one in my laptop:
iwn0 at pci0 dev 19 function 0: vendor 0x8086 product 0x4237 (rev. 0x00)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_iwn/Makefile \
src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf \
src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c \
src/sys/rump/dev/lib/libpci_if_iwn/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.8 src/sys/rump/dev/Makefile.rumpdevcomp:1.9
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.8 Fri Apr 4 14:49:40 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Mon Apr 7 01:45:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.8 2014/04/04 14:49:40 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.9 2014/04/07 01:45:36 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -7,7 +7,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvct
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
-RUMPPCIDEVS= pci pci_if_wm
+RUMPPCIDEVS= pci pci_if_iwn pci_if_wm
# Not really a PCI device, but
RUMPPCIDEVS= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_if_iwn/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/Makefile Mon Apr 7 01:45:36 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/04/07 01:45:36 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_if_iwn
+IOCONF= PCI_IF_IWN.ioconf
+
+SRCS= iwn_at_pci.c
+
+SRCS+= if_iwn.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf Mon Apr 7 01:45:36 2014
@@ -0,0 +1,12 @@
+# $NetBSD: PCI_IF_IWN.ioconf,v 1.1 2014/04/07 01:45:36 pooka Exp $
+#
+
+ioconf pci_if_iwn
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root pci*
+
+iwn* at pci? dev ? function ?# Intel PRO/Wireless
Index: src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c Mon Apr 7 01:45:36 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: iwn_at_pci.c,v 1.1 2014/04/07 01:45:36 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: iwn_at_pci.c,v 1.1 2014/04/07 01:45:36 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+
+#include rump_private.h
+
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci_if_iwn,
+ cfattach_ioconf_pci_if_iwn, cfdata_ioconf_pci_if_iwn);
+}
Index: src/sys/rump/dev/lib/libpci_if_iwn/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/shlib_version:1.1
CVS commit: [tls-earlyentropy] src/sys
Module Name:src
Committed By: tls
Date: Mon Apr 7 02:00:00 UTC 2014
Modified Files:
src/sys/kern [tls-earlyentropy]: kern_rndpool.c kern_rndq.c
src/sys/sys [tls-earlyentropy]: rnd.h
Log Message:
Entropy estimation changes:
1) Avoid wraparound problems with delta estimator by making estimation
framework 64-bit.
2) Adjust rnd_counter to always return a 64-bit value, accordingly.
3) Make delta estimator generic and create two instances: delta-time and
delta-value.
4) Add LZF estimator -- used mostly to protect us against injection of
bulk data we think is random but is really constant.
5) Allow value and time estimation/collection to be controlled separately.
6) Expose estimator performance to userspace.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/sys/rnd.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/kern/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.5 src/sys/kern/kern_rndpool.c:1.5.2.1
--- src/sys/kern/kern_rndpool.c:1.5 Thu Aug 29 01:04:49 2013
+++ src/sys/kern/kern_rndpool.c Mon Apr 7 02:00:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.5 2013/08/29 01:04:49 tls Exp $*/
+/* $NetBSD: kern_rndpool.c,v 1.5.2.1 2014/04/07 02:00:00 tls Exp $*/
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.5 2013/08/29 01:04:49 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.5.2.1 2014/04/07 02:00:00 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,6 +85,12 @@ rndpool_get_entropy_count(rndpool_t *rp)
return (rp-stats.curentropy);
}
+void
+rndpool_set_entropy_count(rndpool_t *rp, u_int32_t count)
+{
+ rp-stats.curentropy = count;
+}
+
void rndpool_get_stats(rndpool_t *rp, void *rsp, int size)
{
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.23 src/sys/kern/kern_rndq.c:1.23.2.1
--- src/sys/kern/kern_rndq.c:1.23 Tue Mar 11 20:26:08 2014
+++ src/sys/kern/kern_rndq.c Mon Apr 7 02:00:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.23.2.1 2014/04/07 02:00:00 tls Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.23.2.1 2014/04/07 02:00:00 tls Exp $);
#include sys/param.h
#include sys/ioctl.h
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, $NetBSD: kern_rndq.c,
#endif
#ifdef RND_DEBUG
-#define DPRINTF(l,x) if (rnd_debug (l)) printf x
+#define DPRINTF(l,x) if (rnd_debug (l)) rnd_printf x
int rnd_debug = 0;
#else
#define DPRINTF(l,x)
@@ -81,6 +81,10 @@ int rnd_debug = 0;
#define RND_VERBOSE
#endif
+#ifdef RND_VERBOSE
+static unsigned int deltacnt;
+#endif
+
/*
* This is a little bit of state information attached to each device that we
* collect entropy from. This is simply a collection buffer, and when it
@@ -93,7 +97,7 @@ typedef struct _rnd_sample_t {
krndsource_t *source;
int cursor;
int entropy;
- u_int32_t ts[RND_SAMPLE_COUNT];
+ uint64_t ts[RND_SAMPLE_COUNT];
u_int32_t values[RND_SAMPLE_COUNT];
} rnd_sample_t;
@@ -129,31 +133,45 @@ static krndsource_t rnd_source_no_collec
/* LIST_ENTRY list */
.name = { 'N', 'o', 'C', 'o', 'l', 'l', 'e', 'c', 't',
0, 0, 0, 0, 0, 0, 0 },
- .last_time = 0, .last_delta = 0, .last_delta2 = 0, .total = 0,
+ .total = 0,
.type = RND_TYPE_UNKNOWN,
.flags = (RND_FLAG_NO_COLLECT |
- RND_FLAG_NO_ESTIMATE |
- RND_TYPE_UNKNOWN),
+ RND_FLAG_NO_ESTIMATE),
+ .state = NULL,
+ .test_cnt = 0,
+ .test = NULL
+};
+
+static krndsource_t rnd_source_anonymous = {
+ /* LIST_ENTRY list */
+ .name = { 'A', 'n', 'o', 'n', 'y', 'm', 'o', 'u', 's',
+ 0, 0, 0, 0, 0, 0, 0 },
+ .total = 0,
+ .type = RND_TYPE_UNKNOWN,
+.flags = (RND_FLAG_COLLECT_TIME|
+ RND_FLAG_COLLECT_VALUE|
+ RND_FLAG_ESTIMATE_TIME),
.state = NULL,
.test_cnt = 0,
.test = NULL
};
+
void *rnd_process, *rnd_wakeup;
struct callout skew_callout;
-void rnd_wakeup_readers(void);
-static inline u_int32_t rnd_estimate_entropy(krndsource_t *, u_int32_t);
-static inline u_int32_t rnd_counter(void);
+void rnd_wakeup_readers(void);
+static inline uint64_t rnd_counter(void);
staticvoid rnd_intr(void *);
static void rnd_wake(void *);
static void rnd_process_events(void);
u_int32_t rnd_extract_data_locked(void *, u_int32_t, u_int32_t); /* XXX */
static void rnd_add_data_ts(krndsource_t *, const void *const,
- uint32_t, uint32_t, uint32_t);
+ uint32_t, uint32_t, uint64_t);
static
CVS commit: [tls-earlyentropy] src/sys
Module Name:src
Committed By: tls
Date: Mon Apr 7 02:20:00 UTC 2014
Modified Files:
src/sys/kern [tls-earlyentropy]: init_main.c kern_rndq.c kern_sysctl.c
subr_autoconf.c subr_prf.c
src/sys/sys [tls-earlyentropy]: kprintf.h
Log Message:
Get more entropy into the system early:
1) Add device attach timings from autoconf.
2) Accumulate the output of kernel printf (as well as the times
when it's called) and add this periodically. To avoid issues
with recursion through diagnostic printfs, we use SHA512 to
accumulate the printf output, then mix in its output.
3) Add all sysctl settings -- mixes in the hostname and likely a
bit more.
To generate a diff of this commit:
cvs rdiff -u -r1.454 -r1.454.2.1 src/sys/kern/init_main.c
cvs rdiff -u -r1.23.2.1 -r1.23.2.2 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.249 -r1.249.2.1 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.230 -r1.230.2.1 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.153 -r1.153.2.1 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.11 -r1.11.26.1 src/sys/sys/kprintf.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/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.454 src/sys/kern/init_main.c:1.454.2.1
--- src/sys/kern/init_main.c:1.454 Wed Oct 2 21:38:55 2013
+++ src/sys/kern/init_main.c Mon Apr 7 02:20:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.454 2013/10/02 21:38:55 apb Exp $ */
+/* $NetBSD: init_main.c,v 1.454.2.1 2014/04/07 02:20:00 tls Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.454 2013/10/02 21:38:55 apb Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.454.2.1 2014/04/07 02:20:00 tls Exp $);
#include opt_ddb.h
#include opt_ipsec.h
@@ -522,6 +522,9 @@ main(void)
/* Enable deferred processing of RNG samples */
rnd_init_softint();
+ /* Enable periodic injection of console output into entropy pool */
+ kprintf_init_callout();
+
#ifdef SYSVSHM
/* Initialize System V style shared memory. */
shminit();
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.23.2.1 src/sys/kern/kern_rndq.c:1.23.2.2
--- src/sys/kern/kern_rndq.c:1.23.2.1 Mon Apr 7 02:00:00 2014
+++ src/sys/kern/kern_rndq.c Mon Apr 7 02:20:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.23.2.1 2014/04/07 02:00:00 tls Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.23.2.2 2014/04/07 02:20:00 tls Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.23.2.1 2014/04/07 02:00:00 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.23.2.2 2014/04/07 02:20:00 tls Exp $);
#include sys/param.h
#include sys/ioctl.h
@@ -156,6 +156,8 @@ static krndsource_t rnd_source_anonymous
.test = NULL
};
+krndsource_t rnd_printf_source, rnd_autoconf_source;
+
void *rnd_process, *rnd_wakeup;
struct callout skew_callout;
@@ -608,6 +610,11 @@ rnd_init(void)
RND_TYPE_UNKNOWN,
RND_FLAG_COLLECT_TIME|RND_FLAG_COLLECT_VALUE|
RND_FLAG_ESTIMATE_TIME);
+ rnd_attach_source(rnd_printf_source, printf, RND_TYPE_UNKNOWN,
+ RND_FLAG_NO_ESTIMATE);
+ rnd_attach_source(rnd_autoconf_source, autoconf,
+ RND_TYPE_UNKNOWN,
+ RND_FLAG_COLLECT_TIME|RND_FLAG_ESTIMATE_TIME);
rnd_ready = 1;
}
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.249 src/sys/kern/kern_sysctl.c:1.249.2.1
--- src/sys/kern/kern_sysctl.c:1.249 Thu Mar 27 21:09:33 2014
+++ src/sys/kern/kern_sysctl.c Mon Apr 7 02:20:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.249.2.1 2014/04/07 02:20:00 tls Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.249.2.1 2014/04/07 02:20:00 tls Exp $);
#include opt_defcorename.h
#include ksyms.h
@@ -84,6 +84,7 @@ __KERNEL_RCSID(0, $NetBSD: kern_sysctl.
#include sys/syscallargs.h
#include sys/kauth.h
#include sys/ktrace.h
+#include sys/rnd.h
#define MAXDESCLEN 1024
MALLOC_DEFINE(M_SYSCTLNODE, sysctlnode, sysctl node structures);
@@ -1610,6 +1611,7 @@ sysctl_lookup(SYSCTLFN_ARGS)
if (newlen != sz)
goto bad_size;
error = sysctl_copyin(l, newp, d, sz);
+ rnd_add_data(NULL, d, sz, 0);
break;
case CTLTYPE_STRING: {
/*
@@ -1653,8 +1655,10 @@ sysctl_lookup(SYSCTLFN_ARGS)
/*
* looks good, so pop it into place and zero the rest.
*/
- if (len 0)
+ if (len 0) {
memcpy(d, newbuf, len);
+ rnd_add_data(NULL, d, len, 0);
+ }
if (sz != len)
memset((char*)d + len, 0, sz - len);
CVS commit: [tls-earlyentropy] src/sys/net
Module Name:src
Committed By: tls
Date: Mon Apr 7 02:24:31 UTC 2014
Modified Files:
src/sys/net [tls-earlyentropy]: if_ethersubr.c
Log Message:
Increase unpredictability of early output: mix in the headers of the
first 100 Ethernet packets received by the system (if we are really
short of entropy, keep mixing them though we don't count any entropy from
them; such systems are particularly likely to have guessable outputs).
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.2.1 src/sys/net/if_ethersubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.196 src/sys/net/if_ethersubr.c:1.196.2.1
--- src/sys/net/if_ethersubr.c:1.196 Tue Feb 25 22:42:06 2014
+++ src/sys/net/if_ethersubr.c Mon Apr 7 02:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.196 2014/02/25 22:42:06 pooka Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.196.2.1 2014/04/07 02:24:31 tls Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.196 2014/02/25 22:42:06 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ethersubr.c,v 1.196.2.1 2014/04/07 02:24:31 tls Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -91,6 +91,7 @@ __KERNEL_RCSID(0, $NetBSD: if_ethersubr
#include sys/cpu.h
#include sys/intr.h
#include sys/device.h
+#include sys/rnd.h
#include net/if.h
#include net/netisr.h
@@ -577,6 +578,7 @@ ether_input(struct ifnet *ifp, struct mb
uint16_t etype;
struct ether_header *eh;
size_t ehlen;
+ static int earlypkts;
#if defined (LLC) || defined(NETATALK)
struct llc *l;
#endif
@@ -593,6 +595,11 @@ ether_input(struct ifnet *ifp, struct mb
etype = ntohs(eh-ether_type);
ehlen = sizeof(*eh);
+ if(__predict_false(earlypkts 100 || !rnd_initial_entropy)) {
+ rnd_add_data(NULL, eh, ehlen, 0);
+ earlypkts++;
+ }
+
/*
* Determine if the packet is within its size limits.
*/
CVS commit: [tls-earlyentropy] src/sbin/rndctl
Module Name:src
Committed By: tls
Date: Mon Apr 7 02:49:52 UTC 2014
Modified Files:
src/sbin/rndctl [tls-earlyentropy]: rndctl.8 rndctl.c
Log Message:
Update rndctl(8) to add the -v option, which gives us more robust information
on entropy collection and estimation.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.16.1 src/sbin/rndctl/rndctl.8
cvs rdiff -u -r1.27 -r1.27.2.1 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/rndctl.8
diff -u src/sbin/rndctl/rndctl.8:1.20 src/sbin/rndctl/rndctl.8:1.20.16.1
--- src/sbin/rndctl/rndctl.8:1.20 Wed Nov 23 12:15:30 2011
+++ src/sbin/rndctl/rndctl.8 Mon Apr 7 02:49:52 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: rndctl.8,v 1.20 2011/11/23 12:15:30 wiz Exp $
+.\ $NetBSD: rndctl.8,v 1.20.16.1 2014/04/07 02:49:52 tls Exp $
.\
.\ Copyright (c) 1997 Michael Graff
.\ All rights reserved.
@@ -39,6 +39,7 @@
.Nm
.Fl ls
.Op Fl d Ar devname | Fl t Ar devtype
+.Op Fl v
.Nm
.Fl L Ar save-file
.Nm
@@ -119,6 +120,8 @@ Terminal, mouse, or other user input dev
.It Ic rng
Random number generators.
.El
+.It Fl v
+Verbose output: show entropy estimation statistics for each source.
.El
.Sh FILES
.Bl -tag -width /dev/urandomx -compact
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.27 src/sbin/rndctl/rndctl.c:1.27.2.1
--- src/sbin/rndctl/rndctl.c:1.27 Wed Jan 15 15:05:27 2014
+++ src/sbin/rndctl/rndctl.c Mon Apr 7 02:49:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.27 2014/01/15 15:05:27 apb Exp $ */
+/* $NetBSD: rndctl.c,v 1.27.2.1 2014/04/07 02:49:52 tls Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -33,7 +33,7 @@
#include sha1.h
#ifndef lint
-__RCSID($NetBSD: rndctl.c,v 1.27 2014/01/15 15:05:27 apb Exp $);
+__RCSID($NetBSD: rndctl.c,v 1.27.2.1 2014/04/07 02:49:52 tls Exp $);
#endif
@@ -78,6 +78,8 @@ static char * strflags(u_int32_t);
static void do_list(int, u_int32_t, char *);
static void do_stats(void);
+static int vflag;
+
static void
usage(void)
{
@@ -254,19 +256,28 @@ strflags(u_int32_t fl)
{
static char str[512];
- str[0] = 0;
+ str[0] = '\0';
if (fl RND_FLAG_NO_ESTIMATE)
;
else
- strlcat(str, estimate, sizeof(str));
+ strlcat(str, estimate, , sizeof(str));
if (fl RND_FLAG_NO_COLLECT)
;
- else {
- if (str[0])
- strlcat(str, , , sizeof(str));
- strlcat(str, collect, sizeof(str));
- }
+ else
+ strlcat(str, collect, , sizeof(str));
+
+ if (fl RND_FLAG_COLLECT_VALUE)
+ strlcat(str, v, , sizeof(str));
+ if (fl RND_FLAG_COLLECT_TIME)
+ strlcat(str, t, , sizeof(str));
+ if (fl RND_FLAG_ESTIMATE_VALUE)
+ strlcat(str, dv, , sizeof(str));
+ if (fl RND_FLAG_ESTIMATE_TIME)
+ strlcat(str, dt, , sizeof(str));
+
+ if (str[strlen(str) - 2] == ',')
+ str[strlen(str) - 2] = '\0';
return (str);
}
@@ -276,8 +287,8 @@ strflags(u_int32_t fl)
static void
do_list(int all, u_int32_t type, char *name)
{
- rndstat_t rstat;
- rndstat_name_t rstat_name;
+ rndstat_est_t rstat;
+ rndstat_est_name_t rstat_name;
int fd;
int res;
uint32_t i;
@@ -289,15 +300,29 @@ do_list(int all, u_int32_t type, char *n
if (all == 0 type == 0xff) {
strncpy(rstat_name.name, name, sizeof(rstat_name.name));
- res = ioctl(fd, RNDGETSRCNAME, rstat_name);
+ res = ioctl(fd, RNDGETESTNAME, rstat_name);
if (res 0)
- err(1, ioctl(RNDGETSRCNAME));
+ err(1, ioctl(RNDGETESTNAME));
printf(HEADER);
printf(%-16s %10u %-4s %s\n,
- rstat_name.source.name,
- rstat_name.source.total,
- find_name(rstat_name.source.type),
- strflags(rstat_name.source.flags));
+ rstat_name.source.rt.name,
+ rstat_name.source.rt.total,
+ find_name(rstat_name.source.rt.type),
+ strflags(rstat_name.source.rt.flags));
+ if (vflag) {
+ printf(\tDt samples = %d\n,
+ rstat_name.source.dt_samples);
+ printf(\tDt bits = %d\n,
+ rstat_name.source.dt_total);
+ printf(\tDv samples = %d\n,
+rstat_name.source.dv_samples);
+ printf(\tDv bits = %d\n,
+ rstat_name.source.dv_total);
+ printf(\tLZ bytes in = %d\n,
+ rstat_name.source.lzv_bytes);
+ printf(\tLZ bits out = %d\n,
+ rstat_name.source.lzv_total);
+ }
close(fd);
return;
}
@@ -311,22 +336,36 @@ do_list(int all, u_int32_t type, char *n
for (;;) {
rstat.count = RND_MAXSTATCOUNT;
rstat.start = start;
- res = ioctl(fd, RNDGETSRCNUM, rstat);
+ res = ioctl(fd, RNDGETESTNUM, rstat);
if (res 0)
- err(1, ioctl(RNDGETSRCNUM));
+ err(1, ioctl(RNDGETESTNUM));
if (rstat.count == 0)
break;
for (i = 0; i rstat.count; i++) {
if (all != 0 ||
- type == rstat.source[i].type)
+ type == rstat.source[i].rt.type)
printf(%-16s %10u %-4s %s\n,
-rstat.source[i].name,
-rstat.source[i].total,
-find_name(rstat.source[i].type),
-strflags(rstat.source[i].flags));
- }
CVS commit: [tls-earlyentropy] src/sys/dev
Module Name:src
Committed By: tls
Date: Mon Apr 7 02:54:53 UTC 2014
Modified Files:
src/sys/dev [tls-earlyentropy]: rndpseudo.c
Log Message:
Whups. It'd help to check in the ioctl changes needed to support that
rndctl change just prior... ;-)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/rndpseudo.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/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.19 src/sys/dev/rndpseudo.c:1.19.2.1
--- src/sys/dev/rndpseudo.c:1.19 Sun Mar 16 05:20:26 2014
+++ src/sys/dev/rndpseudo.c Mon Apr 7 02:54:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.19 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.19.2.1 2014/04/07 02:54:53 tls Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.19 2014/03/16 05:20:26 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.19.2.1 2014/04/07 02:54:53 tls Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -514,12 +514,27 @@ krndsource_to_rndsource(krndsource_t *kr
r-flags = kr-flags;
}
+static void
+krndsource_to_rndsource_est(krndsource_t *kr, rndsource_est_t *re)
+{
+ memset(re, 0, sizeof(*re));
+ krndsource_to_rndsource(kr, re-rt);
+ re-dt_samples = kr-time_delta.insamples;
+ re-dt_total = kr-time_delta.outbits;
+ re-dv_samples = kr-value_delta.insamples;
+ re-dv_total = kr-value_delta.outbits;
+ re-lzv_bytes = kr-lz_v.inbytes;
+ re-lzv_total = kr-lz_v.outbits;
+}
+
int
rnd_ioctl(struct file *fp, u_long cmd, void *addr)
{
krndsource_t *kr;
rndstat_t *rst;
rndstat_name_t *rstnm;
+ rndstat_est_t *rset;
+ rndstat_est_name_t *rsetnm;
rndctl_t *rctl;
rnddata_t *rnddata;
u_int32_t count, start;
@@ -535,6 +550,8 @@ rnd_ioctl(struct file *fp, u_long cmd, v
case RNDGETPOOLSTAT:
case RNDGETSRCNUM:
case RNDGETSRCNAME:
+ case RNDGETESTNUM:
+ case RNDGETESTNAME:
ret = kauth_authorize_device(curlwp-l_cred,
KAUTH_DEVICE_RND_GETPRIV, NULL, NULL, NULL, NULL);
if (ret)
@@ -623,6 +640,41 @@ rnd_ioctl(struct file *fp, u_long cmd, v
mutex_spin_exit(rndpool_mtx);
break;
+ case RNDGETESTNUM:
+ rset = (rndstat_est_t *)addr;
+
+ if (rset-count == 0)
+ break;
+
+ if (rset-count RND_MAXSTATCOUNT)
+ return (EINVAL);
+
+ mutex_spin_enter(rndpool_mtx);
+ /*
+ * Find the starting source by running through the
+ * list of sources.
+ */
+ kr = rnd_sources.lh_first;
+ start = rset-start;
+ while (kr != NULL start 1) {
+ kr = kr-list.le_next;
+ start--;
+ }
+
+ /* Return up to as many structures as the user asked
+ * for. If we run out of sources, a count of zero
+ * will be returned, without an error.
+ */
+ for (count = 0; count rset-count kr != NULL; count++) {
+ krndsource_to_rndsource_est(kr, rset-source[count]);
+ kr = kr-list.le_next;
+ }
+
+ rset-count = count;
+
+ mutex_spin_exit(rndpool_mtx);
+ break;
+
case RNDGETSRCNAME:
/*
* Scan through the list, trying to find the name.
@@ -633,7 +685,7 @@ rnd_ioctl(struct file *fp, u_long cmd, v
while (kr != NULL) {
if (strncmp(kr-name, rstnm-name,
MIN(sizeof(kr-name),
- sizeof(*rstnm))) == 0) {
+ sizeof(rstnm-name))) == 0) {
krndsource_to_rndsource(kr, rstnm-source);
mutex_spin_exit(rndpool_mtx);
return (0);
@@ -646,6 +698,30 @@ rnd_ioctl(struct file *fp, u_long cmd, v
break;
+ case RNDGETESTNAME:
+ /*
+ * Scan through the list, trying to find the name.
+ */
+ mutex_spin_enter(rndpool_mtx);
+ rsetnm = (rndstat_est_name_t *)addr;
+ kr = rnd_sources.lh_first;
+ while (kr != NULL) {
+ if (strncmp(kr-name, rsetnm-name,
+MIN(sizeof(kr-name),
+ sizeof(rsetnm-name))) == 0) {
+krndsource_to_rndsource_est(kr,
+ rsetnm-source);
+mutex_spin_exit(rndpool_mtx);
+return (0);
+ }
+ kr = kr-list.le_next;
+ }
+ mutex_spin_exit(rndpool_mtx);
+
+ ret = ENOENT; /* name not found */
+
+ break;
+
case RNDCTL:
/*
* Set flags to enable/disable entropy counting and/or
@@ -662,9 +738,11 @@ rnd_ioctl(struct file *fp, u_long cmd, v
while (kr != NULL) {
if (kr-type == rctl-type) {
kr-flags = ~rctl-mask;
+
kr-flags |=
(rctl-flags rctl-mask);
}
+
kr = kr-list.le_next;
}
mutex_spin_exit(rndpool_mtx);
@@ -680,7 +758,7 @@ rnd_ioctl(struct file *fp, u_long cmd, v
sizeof(rctl-name))) == 0) {
kr-flags = ~rctl-mask;
kr-flags |= (rctl-flags rctl-mask);
-
+
mutex_spin_exit(rndpool_mtx);
return (0);
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:14:29 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added Logitec LAN-W450ANU2E. To generate a diff of this commit: cvs rdiff -u -r1.665 -r1.666 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:15:42 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.657 -r1.658 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.658 -r1.659 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:26:11 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added some PLANEX wlan devices. To generate a diff of this commit: cvs rdiff -u -r1.666 -r1.667 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Apr 6 09:26:33 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.658 -r1.659 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.659 -r1.660 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sun Apr 6 09:53:59 UTC 2014 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: Remove a comment that became largely redundant with the PMAP_NOCACHE change. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/arm/arm32/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: pettai Date: Sun Apr 6 11:24:25 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal: heimdal2netbsd Log Message: fix small nit + missing step To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/heimdal2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/roken
Module Name:src Committed By: christos Date: Sun Apr 6 14:36:35 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/roken: resolve.c Log Message: PR/48718: Juergen Hannken-Illjes: Heimdal leaks file descriptors Add missing call to free the resolve handle on success. XXX: pullup 6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: martin Date: Sun Apr 6 14:47:46 UTC 2014 Modified Files: src/sys/arch/powerpc/powerpc: procfs_machdep.c Log Message: Make it compilable To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/powerpc/procfs_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sys/arch/amd64/conf
Module Name:src Committed By: tls Date: Sun Apr 6 15:59:42 UTC 2014 Added Files: src/sys/arch/amd64/conf [tls-earlyentropy]: RNDVERBOSE Log Message: RNDVERBOSE kernel for testing. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/amd64/conf/RNDVERBOSE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Apr 6 16:38:34 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: Add missing declaration from last commit. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Apr 6 16:42:00 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: Restore is_console=1 for i915, even if I keep it off for debugging. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: khorben Date: Sun Apr 6 17:13:57 UTC 2014 Modified Files: src/etc/rc.d: dhcpcd Log Message: Allow the extra command reload to dhcpcd's rc script, letting it reload its configuration and rebind directly via the script. LGTM roy@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/dhcpcd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: kardel Date: Sun Apr 6 17:59:39 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi src/doc: CHANGES src/share/man/man4: Makefile src/sys/arch/evbarm/conf: RPI src/sys/dev/spi: files.spi Added Files: src/share/man/man4: mcp23s17gpio.4 src/sys/dev/spi: mcp23s17.c mcp23s17.h Log Message: add Microchip MCP23S17 GPIO driver (via SPI interface) To generate a diff of this commit: cvs rdiff -u -r1.1467 -r1.1468 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1910 -r1.1911 src/doc/CHANGES cvs rdiff -u -r1.611 -r1.612 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/mcp23s17gpio.4 cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spi/files.spi cvs rdiff -u -r0 -r1.1 src/sys/dev/spi/mcp23s17.c src/sys/dev/spi/mcp23s17.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: joerg Date: Sun Apr 6 18:48:06 UTC 2014 Modified Files: src/sys/arch/x86/include: loadfile_machdep.h Log Message: x86_progress takes a format string. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/loadfile_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jakllsch Date: Sun Apr 6 19:11:26 UTC 2014 Modified Files: src/sys/arch/i386/stand/lib: bootmenu.c menuutils.c Log Message: Use __dead. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/bootmenu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/lib/menuutils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jakllsch Date: Sun Apr 6 19:18:00 UTC 2014 Modified Files: src/sys/arch/i386/stand/lib: exec.c Log Message: Misc WARNS=4 fixes. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/stand/lib/exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs
Module Name:src Committed By: jakllsch Date: Sun Apr 6 19:25:22 UTC 2014 Modified Files: src/sys/fs: unicode.h Log Message: Use size_t instead of int for character count to avoid sign compare issues. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/fs/unicode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/ssp
Module Name:src Committed By: christos Date: Sun Apr 6 19:28:59 UTC 2014 Modified Files: src/tests/lib/libc/ssp: Makefile t_ssp.sh Added Files: src/tests/lib/libc/ssp: h_stpcpy.c h_stpncpy.c Log Message: add stp*cpy() tests To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/ssp/Makefile \ src/tests/lib/libc/ssp/t_ssp.sh cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/ssp/h_stpcpy.c \ src/tests/lib/libc/ssp/h_stpncpy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/ssp
Module Name:src Committed By: christos Date: Sun Apr 6 19:29:25 UTC 2014 Modified Files: src/lib/libc/ssp: stpcpy_chk.c Log Message: fix incorrect bounds check To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/ssp/stpcpy_chk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/ssp
Module Name:src Committed By: christos Date: Sun Apr 6 19:29:37 UTC 2014 Modified Files: src/lib/libc/ssp: Makefile.inc Log Message: add __stpncpy_chk To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/ssp/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Sun Apr 6 19:29:58 UTC 2014 Modified Files: src/include/ssp: string.h Log Message: add stpncpy() To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/ssp/string.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sun Apr 6 19:47:20 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: MIRABOX Log Message: Move kernel to load at 16MB since the first 14MB is reserved for use by u-boot. Support direct-mapped memory since the 1GB can fit in the space between KERNEL_BASE and KERNEL_VM_BASE. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/MIRABOX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Apr 6 19:51:40 UTC 2014 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add stp*cpy tests. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.563 -r1.564 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Sun Apr 6 23:29:58 UTC 2014 Modified Files: src/sys/dev/ic: com.c Log Message: PR/48720: John Kelly: com driver does not allow B0 to be set. The code to handle B0 was commented out for no reason given at revision 1.99. POSIX mandates to hangup on B0: http://pubs.opengroup.org/onlinepubs/9699919799/functions/tcsetattr.html To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: pooka Date: Mon Apr 7 00:07:40 UTC 2014 Modified Files: src/sys/net80211: ieee80211_netbsd.c ieee80211_netbsd.h ieee80211_rssadapt.c Log Message: Use module-compatible sysctl init instead of link sets. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/net80211/ieee80211_netbsd.c cvs rdiff -u -r1.18 -r1.19 src/sys/net80211/ieee80211_netbsd.h \ src/sys/net80211/ieee80211_rssadapt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src
Module Name:src Committed By: tls Date: Mon Apr 7 01:10:55 UTC 2014 Modified Files: src/external/bsd/liblzf/dist [tls-earlyentropy]: lzfP.h lzf_c.c lzf_d.c src/sys/lib/libkern [tls-earlyentropy]: Makefile.libkern libkern.h Log Message: LZF in the kernel. As an entropy estimator for now but it's very small, and we could use it for ipcomp, for hibernation, for paging, for core dumps, etc. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/liblzf/dist/lzfP.h cvs rdiff -u -r1.4 -r1.4.8.1 src/external/bsd/liblzf/dist/lzf_c.c cvs rdiff -u -r1.3 -r1.3.22.1 src/external/bsd/liblzf/dist/lzf_d.c cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/lib/libkern/Makefile.libkern cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/lib/libkern/libkern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libpcap/include
Module Name:src Committed By: pooka Date: Mon Apr 7 01:29:12 UTC 2014 Modified Files: src/external/bsd/libpcap/include: config.h Log Message: Re-add cloning bpf definition that got lost in rev 1.4. Needed at least for wpa_supplicant against a rump kernel (which does not create the old-style bpf device nodes). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev
Module Name:src Committed By: pooka Date: Mon Apr 7 01:45:36 UTC 2014 Modified Files: src/sys/rump/dev: Makefile.rumpdevcomp Added Files: src/sys/rump/dev/lib/libpci_if_iwn: Makefile PCI_IF_IWN.ioconf iwn_at_pci.c shlib_version Log Message: Add a rump kernel component for the iwn wireless driver, tested with the one in my laptop: iwn0 at pci0 dev 19 function 0: vendor 0x8086 product 0x4237 (rev. 0x00) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/Makefile.rumpdevcomp cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_iwn/Makefile \ src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf \ src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c \ src/sys/rump/dev/lib/libpci_if_iwn/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sys
Module Name:src Committed By: tls Date: Mon Apr 7 02:00:00 UTC 2014 Modified Files: src/sys/kern [tls-earlyentropy]: kern_rndpool.c kern_rndq.c src/sys/sys [tls-earlyentropy]: rnd.h Log Message: Entropy estimation changes: 1) Avoid wraparound problems with delta estimator by making estimation framework 64-bit. 2) Adjust rnd_counter to always return a 64-bit value, accordingly. 3) Make delta estimator generic and create two instances: delta-time and delta-value. 4) Add LZF estimator -- used mostly to protect us against injection of bulk data we think is random but is really constant. 5) Allow value and time estimation/collection to be controlled separately. 6) Expose estimator performance to userspace. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/kern/kern_rndpool.c cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/kern/kern_rndq.c cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/sys/rnd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sys
Module Name:src Committed By: tls Date: Mon Apr 7 02:20:00 UTC 2014 Modified Files: src/sys/kern [tls-earlyentropy]: init_main.c kern_rndq.c kern_sysctl.c subr_autoconf.c subr_prf.c src/sys/sys [tls-earlyentropy]: kprintf.h Log Message: Get more entropy into the system early: 1) Add device attach timings from autoconf. 2) Accumulate the output of kernel printf (as well as the times when it's called) and add this periodically. To avoid issues with recursion through diagnostic printfs, we use SHA512 to accumulate the printf output, then mix in its output. 3) Add all sysctl settings -- mixes in the hostname and likely a bit more. To generate a diff of this commit: cvs rdiff -u -r1.454 -r1.454.2.1 src/sys/kern/init_main.c cvs rdiff -u -r1.23.2.1 -r1.23.2.2 src/sys/kern/kern_rndq.c cvs rdiff -u -r1.249 -r1.249.2.1 src/sys/kern/kern_sysctl.c cvs rdiff -u -r1.230 -r1.230.2.1 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.153 -r1.153.2.1 src/sys/kern/subr_prf.c cvs rdiff -u -r1.11 -r1.11.26.1 src/sys/sys/kprintf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sys/net
Module Name:src Committed By: tls Date: Mon Apr 7 02:24:31 UTC 2014 Modified Files: src/sys/net [tls-earlyentropy]: if_ethersubr.c Log Message: Increase unpredictability of early output: mix in the headers of the first 100 Ethernet packets received by the system (if we are really short of entropy, keep mixing them though we don't count any entropy from them; such systems are particularly likely to have guessable outputs). To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.196.2.1 src/sys/net/if_ethersubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sbin/rndctl
Module Name:src Committed By: tls Date: Mon Apr 7 02:49:52 UTC 2014 Modified Files: src/sbin/rndctl [tls-earlyentropy]: rndctl.8 rndctl.c Log Message: Update rndctl(8) to add the -v option, which gives us more robust information on entropy collection and estimation. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.16.1 src/sbin/rndctl/rndctl.8 cvs rdiff -u -r1.27 -r1.27.2.1 src/sbin/rndctl/rndctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src/sys/dev
Module Name:src Committed By: tls Date: Mon Apr 7 02:54:53 UTC 2014 Modified Files: src/sys/dev [tls-earlyentropy]: rndpseudo.c Log Message: Whups. It'd help to check in the ioctl changes needed to support that rndctl change just prior... ;-) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/rndpseudo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [tls-earlyentropy] src
Module Name:src Committed By: tls Date: Mon Apr 7 03:37:33 UTC 2014 Modified Files: src/share/man/man9 [tls-earlyentropy]: rnd.9 src/sys/arch/acorn26/ioc [tls-earlyentropy]: arckbd.c src/sys/arch/arm/at91 [tls-earlyentropy]: at91dbgu.c at91usart.c src/sys/arch/arm/broadcom [tls-earlyentropy]: bcm2835_rng.c bcm53xx_rng.c src/sys/arch/arm/clps711x [tls-earlyentropy]: clpscom.c src/sys/arch/arm/ep93xx [tls-earlyentropy]: epcom.c src/sys/arch/arm/imx [tls-earlyentropy]: imxuart.c src/sys/arch/arm/ixp12x0 [tls-earlyentropy]: ixp12x0_com.c src/sys/arch/arm/s3c2xx0 [tls-earlyentropy]: sscom.c src/sys/arch/arm/sa11x0 [tls-earlyentropy]: sa_kbc.c sa11x0_com.c src/sys/arch/arm/xscale [tls-earlyentropy]: ixp425_if_npe.c src/sys/arch/emips/ebus [tls-earlyentropy]: ace_ebus.c flash_ebus.c if_le_ebus.c src/sys/arch/epoc32/windermere [tls-earlyentropy]: wmcom.c src/sys/arch/evbarm/dev [tls-earlyentropy]: plcom.c src/sys/arch/hp300/dev [tls-earlyentropy]: rd.c src/sys/arch/hppa/gsc [tls-earlyentropy]: harmony.c src/sys/arch/i386/pci [tls-earlyentropy]: glxsb.c src/sys/arch/macppc/dev [tls-earlyentropy]: if_gm.c src/sys/arch/mips/alchemy/dev [tls-earlyentropy]: if_aumac.c src/sys/arch/mips/atheros/dev [tls-earlyentropy]: if_ae.c src/sys/arch/mips/sibyte/dev [tls-earlyentropy]: sbscn.c src/sys/arch/next68k/dev [tls-earlyentropy]: mb8795.c src/sys/arch/playstation2/dev [tls-earlyentropy]: if_smap.c src/sys/arch/sgimips/mace [tls-earlyentropy]: if_mec.c src/sys/arch/sun2/dev [tls-earlyentropy]: if_ec.c src/sys/arch/x68k/dev [tls-earlyentropy]: fd.c src/sys/arch/x86/pci [tls-earlyentropy]: fwhrng.c src/sys/arch/x86/x86 [tls-earlyentropy]: ipmi.c via_padlock.c viac7temp.c src/sys/arch/xen/xen [tls-earlyentropy]: if_xennet_xenbus.c xbd_xenbus.c src/sys/dev [tls-earlyentropy]: ld.c src/sys/dev/ata [tls-earlyentropy]: wd.c src/sys/dev/gpib [tls-earlyentropy]: rd.c src/sys/dev/i2c [tls-earlyentropy]: dbcool.c src/sys/dev/ic [tls-earlyentropy]: com.c cs89x0.c dp8390.c elink3.c elinkxl.c gem.c hme.c i82557.c lan9118.c lance.c lemac.c mb86950.c mb86960.c mtd803.c pckbc.c rtl8169.c rtl81x9.c seeq8005.c smc91cxx.c tulip.c src/sys/dev/isa [tls-earlyentropy]: fd.c if_eg.c if_el.c if_iy.c src/sys/dev/marvell [tls-earlyentropy]: if_gfe.c if_mvgbe.c src/sys/dev/mca [tls-earlyentropy]: ed_mca.c src/sys/dev/pci [tls-earlyentropy]: amdpm.c auich.c hifn7751.c if_bce.c if_bge.c if_cas.c if_de.c if_dge.c if_jme.c if_msk.c if_pcn.c if_sip.c if_sk.c if_tl.c if_vr.c if_vte.c if_wm.c ubsec.c viaenv.c src/sys/dev/pcmcia [tls-earlyentropy]: if_xi.c src/sys/dev/scsipi [tls-earlyentropy]: cd.c sd.c st.c src/sys/dev/sysmon [tls-earlyentropy]: sysmon_envsys.c sysmon_power.c src/sys/dev/usb [tls-earlyentropy]: if_aue.c if_axe.c if_axen.c if_cue.c if_kue.c if_smsc.c if_udav.c if_upl.c if_url.c ucom.c uhidev.c src/sys/rump/librump/rumpkern [tls-earlyentropy]: hyperentropy.c src/sys/uvm [tls-earlyentropy]: uvm.h uvm_fault.c uvm_page.c src/usr.bin/fstat [tls-earlyentropy]: misc.c Log Message: Be a little more clear and consistent about harvesting entropy from devices: 1) deprecate RND_FLAG_NO_ESTIMATE 2) define RND_FLAG_COLLECT_TIME, RND_FLAG_COLLECT_VALUE 3) define RND_FLAG_ESTIMATE_TIME, RND_FLAG_ESTIMATE_VALUE 4) define RND_FLAG_DEFAULT: RND_FLAG_COLLECT_TIME| RND_FLAG_COLLECT_VALUE|RND_FLAG_ESTIMATE_TIME 5) Make entropy harvesting from environmental sensors a little more generic and remove it from individual sensor drivers. 6) Remove individual open-coded delta-estimators for values from a few places in the tree (uvm, environmental drivers). 7) 0 - RND_FLAG_DEFAULT, actually gather entropy from various drivers that had stubbed out code, other minor cleanups. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.8.1 src/share/man/man9/rnd.9 cvs rdiff -u -r1.22 -r1.22.20.1 src/sys/arch/acorn26/ioc/arckbd.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/arm/at91/at91dbgu.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/arm/at91/at91usart.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/arm/broadcom/bcm2835_rng.c cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/broadcom/bcm53xx_rng.c cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/arm/clps711x/clpscom.c cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/arm/ep93xx/epcom.c cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/arch/arm/imx/imxuart.c cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/arch/arm/ixp12x0/ixp12x0_com.c cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/arch/arm/s3c2xx0/sscom.c cvs rdiff -u -r1.16 -r1.16.10.1
