CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Sat Jul 14 06:55:19 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: mk.beagle
Log Message:
gcc4.5 does support cortex-a8 so use it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.beagle
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/mk.beagle
diff -u src/sys/arch/evbarm/conf/mk.beagle:1.5 src/sys/arch/evbarm/conf/mk.beagle:1.6
--- src/sys/arch/evbarm/conf/mk.beagle:1.5 Sun Mar 6 02:22:27 2011
+++ src/sys/arch/evbarm/conf/mk.beagle Sat Jul 14 06:55:18 2012
@@ -1,6 +1,5 @@
-# $NetBSD: mk.beagle,v 1.5 2011/03/06 02:22:27 jakllsch Exp $
-# gcc doesn't know about cortex-a8
-CPPFLAGS+= -mcpu=arm1136jf-s
+# $NetBSD: mk.beagle,v 1.6 2012/07/14 06:55:18 matt Exp $
+CPPFLAGS+= -mcpu=cortex-a8
SYSTEM_FIRST_OBJ= beagle_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/beagle/beagle_start.S
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Sat Jul 14 07:32:50 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: mk.tisdp24xx std.imx31
Log Message:
Use -march=armv6k -mtune=arm1136jf-s so that gas will believe there are
{ldr,str}ex{b,h,d} instruction available. This is for the use of
ldrexb/strexb instead of swpb for __cpu_simple_lock_t.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.tisdp24xx
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.imx31
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/mk.tisdp24xx
diff -u src/sys/arch/evbarm/conf/mk.tisdp24xx:1.2 src/sys/arch/evbarm/conf/mk.tisdp24xx:1.3
--- src/sys/arch/evbarm/conf/mk.tisdp24xx:1.2 Sun Apr 27 18:58:46 2008
+++ src/sys/arch/evbarm/conf/mk.tisdp24xx Sat Jul 14 07:32:50 2012
@@ -1,5 +1,5 @@
-# $NetBSD: mk.tisdp24xx,v 1.2 2008/04/27 18:58:46 matt Exp $
-CPPFLAGS+= -mcpu=arm1136jf-s
+# $NetBSD: mk.tisdp24xx,v 1.3 2012/07/14 07:32:50 matt Exp $
+CPPFLAGS+= -march=armv6k -mtune=arm1136jf-s
SYSTEM_FIRST_OBJ= sdp24xx_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/tisdp24xx/sdp24xx_start.S
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.4 src/sys/arch/evbarm/conf/std.imx31:1.5
--- src/sys/arch/evbarm/conf/std.imx31:1.4 Sun Mar 6 02:22:27 2011
+++ src/sys/arch/evbarm/conf/std.imx31 Sat Jul 14 07:32:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx31,v 1.4 2011/03/06 02:22:27 jakllsch Exp $
+# $NetBSD: std.imx31,v 1.5 2012/07/14 07:32:50 matt Exp $
#
# standard NetBSD/evbarm options for FreeScale I.MX31
@@ -11,7 +11,7 @@ include arch/evbarm/conf/files.imx31
options EXEC_ELF32
options EXEC_SCRIPT
options KERNEL_BASE_EXT=0x8000
-makeoptions CPUFLAGS=-mcpu=arm1136j-s
+makeoptions CPUFLAGS=-march=armv6k -mtune=arm1136j-s
# To support easy transit to ../arch/arm/arm32
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: matt Date: Sat Jul 14 07:42:57 UTC 2012 Modified Files: src/sys/arch/arm/omap: omap2430_intr.h omap2_intr.h Log Message: Move omap2430/3530 definitions into their own header file. (so that other omap processor can more easily be supported). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap2430_intr.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/omap2_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/omap/omap2430_intr.h diff -u src/sys/arch/arm/omap/omap2430_intr.h:1.3 src/sys/arch/arm/omap/omap2430_intr.h:1.4 --- src/sys/arch/arm/omap/omap2430_intr.h:1.3 Wed Nov 19 06:26:27 2008 +++ src/sys/arch/arm/omap/omap2430_intr.h Sat Jul 14 07:42:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: omap2430_intr.h,v 1.3 2008/11/19 06:26:27 matt Exp $ */ +/* $NetBSD: omap2430_intr.h,v 1.4 2012/07/14 07:42:57 matt Exp $ */ /* * Define the SDP2430 specific information and then include the generic OMAP @@ -6,164 +6,166 @@ */ /* - * Copyright (c) 2007 Microsoft - * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Microsoft + * 1. Redistributions of source code must retain this list of conditions + *and the following disclaimer. + * 2. Redistributions in binary form must reproduce 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 CONTRIBUTERS 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. + * THIS SOFTWARE IS PROVIDED ``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 ANY + * 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. */ -#ifndef _ARM_OMAP_SDP2430_INTR_H_ -#define _ARM_OMAP_SDP2430_INTR_H_ +#ifndef _ARM_OMAP_OMAP2430_INTR_H_ +#define _ARM_OMAP_OMAP2430_INTR_H_ +#ifdef _LOCORE #define ARM_IRQ_HANDLER _C_LABEL(omap_irq_handler) - -#ifndef _LOCORE - -#define OMAP_INTC_DEVICE omap2430intc - -#include arm/cpu.h -#include arm/armreg.h -#include arm/cpufunc.h +#else uint32_t omap_microtimer_read(void); uint32_t omap_microtimer_interval(uint32_t start, uint32_t end); -#define EMUINT_IRQ 0 /* MPU emulation (1) */ -#define COMMRX_IRQ 1 /* MPU emulation (1) */ -#define COMMTX_IRQ 2 /* MPU emulation (1) */ -#define BENCH_IRQ 3 /* MPU emulation (1) */ -#define XTI_IRQ 4 /* (2430) XTI module (2) (3) */ -#define XTI_WKUP_IRQ 5 /* (2430) XTI module (3) */ -#define SSM_ABORT_IRQ 6 /* (2430) MPU subsystem secure state-machine abort */ -#define SYS_nIRQ0 7 /* External interrupt (active low) */ -#define D2D_FW_STACKED 8 /* (2430) Occurs when modem does a security violation and has been automatically put DEVICE_SECURITY [0] under reset. */ -#define M_IRQ_9 9 /* Reserved */ -#define L3_IRQ 10 /* (2420) L2 interconnect (transaction error) */ -#define SMX_APE_IA_ARM1136 10 /* (2430) Error flag for reporting application and unknown errors from SMX-APE (4) rd_wrSError_o */
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: matt Date: Sat Jul 14 07:43:16 UTC 2012 Added Files: src/sys/arch/arm/omap: omap4430_intr.h Log Message: omap4430 irq definitions To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/omap/omap4430_intr.h 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/arm/omap/omap4430_intr.h diff -u /dev/null src/sys/arch/arm/omap/omap4430_intr.h:1.1 --- /dev/null Sat Jul 14 07:43:16 2012 +++ src/sys/arch/arm/omap/omap4430_intr.h Sat Jul 14 07:43:15 2012 @@ -0,0 +1,145 @@ +/* $NetBSD: omap4430_intr.h,v 1.1 2012/07/14 07:43:15 matt Exp $ */ +/*- + * Copyright (c) 2012 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * 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. + */ + +#ifndef _ARM_OMAP_OMAP4430_INTR_H_ +#define _ARM_OMAP_OMAP4430_INTR_H_ + +#ifndef _LOCORE + +#define IRQ_L2_CACHE 0 // L2 cache controller interrupt +#define IRQ_CTI_0 1 // Cross-trigger module 0 (CTI0) interrupt +#define IRQ_CTI_1 2 // Cross-trigger module 1 (CTI1) interrupt +#define IRQ_ELM 4 // Error location process completion +#define IRQ_SYS_NIRQ1 7 // External interrupt 1 (active low) +#define IRQ_L3_DBG 9 // L3 interconnect debug error +#define IRQ_L3_APP 10 // L3 interconnect application error +#define IRQ_PRCM_MPU 11 // PRCM interrupt +#define IRQ_SDMA_0 12 // sDMA interrupt 0 +#define IRQ_SDMA_1 13 // sDMA interrupt 1 +#define IRQ_SDMA_2 14 // sDMA interrupt 2 +#define IRQ_SDMA_3 15 // sDMA interrupt 3 +#define IRQ_MCBSP4 16 // MCBSP4 interrupt +#define IRQ_MCBSP1 17 // MCBSP1 interrupt +#define IRQ_SR_MPU 18 // SmartReflex MPU interrupt +#define IRQ_SR_CORE 19 // SmartReflex Core interrupt +#define IRQ_GPMC 20 // GPMC interrupt +#define IRQ_SGX 21 // 2D/3D graphics module interrupt +#define IRQ_MCBSP2 22 // MCBSP2 interrupt +#define IRQ_MCBSP3 23 // MCBSP3 interrupt +#define IRQ_ISS5 24 // Imaging subsystem interrupt 5 +#define IRQ_DSS_DISPC 25 // Display controller interrupt +#define IRQ_MAIL_U0_MPU 26 // Mailbox user 0 interrupt +#define IRQ_C2C_SSCM0 27 // C2C status interrupt +#define IRQ_DSP_MMU 28 // DSP MMU interrupt +#define IRQ_GPIO1_MPU 29 // GPIO1 MPU interrupt +#define IRQ_GPIO2_MPU 30 // GPIO2 MPU interrupt +#define IRQ_GPIO3_MPU 31 // GPIO3 MPU interrupt +#define IRQ_GPIO4_MPU 32 // GPIO4 MPU interrupt +#define IRQ_GPIO5_MPU 33 // GPIO5 MPU interrupt +#define IRQ_GPIO6_MPU 34 // GPIO6 MPU interrupt +#define IRQ_WDT3 36 // WDTIMER3 overflow +#define IRQ_GPT1 37 // GPTIMER1 interrupt +#define IRQ_GPT2 38 // GPTIMER2 interrupt +#define IRQ_GPT3 39 // GPTIMER3 interrupt +#define IRQ_GPT4 40 // GPTIMER4 interrupt +#define IRQ_GPT5 41 // GPTIMER5 interrupt +#define IRQ_GPT6 42 // GPTIMER6 interrupt +#define IRQ_GPT7 43 // GPTIMER7 interrupt +#define IRQ_GPT8 44 // GPTIMER8 interrupt +#define IRQ_GPT9 45 // GPTIMER9 interrupt +#define IRQ_GPT10 46 // GPTIMER10 interrupt +#define IRQ_GPT11 47 // GPTIMER11 interrupt +#define IRQ_MCSPI4 48 // MCSPI4 interrupt +#define IRQ_DSS_DSI1 53 // Display Subsystem DSI1 interrupt +#define IRQ_I2C1 56 // I2C1 interrupt +#define IRQ_I2C2 57 // I2C2 interrupt +#define IRQ_HDQ 58 // HDQ/1wire interrupt +#define IRQ_MMC5 59 // MMC5 interrupt +#define IRQ_I2C3 61 // I2C3 interrupt +#define IRQ_I2C4 62 // I2C4 interrupt +#define IRQ_MCSPI1 65 // MCSPI1 interrupt +#define IRQ_MCSPI2 66 // MCSPI2 interrupt +#define IRQ_HSI_P1_MPU 67 // HSI Port 1 interrupt +#define IRQ_HSI_P2_MPU 68 // HSI Port
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: matt
Date: Sat Jul 14 07:52:53 UTC 2012
Modified Files:
src/sys/arch/arm/pic: pic.c pic_splfuncs.c picvar.h
Log Message:
Add hooks for __HAVE_PIC_SET_PRIORITY which allows updating of a hardware
(PIC) priority based on current IPL.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/pic/pic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/pic/pic_splfuncs.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/pic/picvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.10 src/sys/arch/arm/pic/pic.c:1.11
--- src/sys/arch/arm/pic/pic.c:1.10 Sat Jul 7 08:05:48 2012
+++ src/sys/arch/arm/pic/pic.c Sat Jul 14 07:52:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.10 2012/07/07 08:05:48 skrll Exp $ */
+/* $NetBSD: pic.c,v 1.11 2012/07/14 07:52:53 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,24 +28,21 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.10 2012/07/07 08:05:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.11 2012/07/14 07:52:53 matt Exp $);
#define _INTR_PRIVATE
#include sys/param.h
#include sys/evcnt.h
#include sys/atomic.h
-#include sys/malloc.h
-#include sys/mallocvar.h
+#include sys/kmem.h
#include sys/atomic.h
+#include sys/cpu.h
#include arm/armreg.h
-#include arm/cpu.h
#include arm/cpufunc.h
#include arm/pic/picvar.h
-MALLOC_DEFINE(M_INTRSOURCE, intrsource, interrupt source);
-
static uint32_t
pic_find_pending_irqs_by_ipl(struct pic_softc *, size_t, uint32_t, int);
static struct pic_softc *
@@ -73,7 +70,16 @@ static struct evcnt pic_deferral_ev =
EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, deferred, intr);
EVCNT_ATTACH_STATIC(pic_deferral_ev);
-
+#ifdef __HAVE_PIC_SET_PRIORITY
+void
+pic_set_priority(struct cpu_info *ci, int newipl)
+{
+ register_t psw = disable_interrupts(I32_bit);
+ ci-ci_cpl = newipl;
+ (pic_list[0]-pic_set_priority)(newipl);
+ restore_interrupts(psw);
+}
+#endif
int
pic_handle_intr(void *arg)
@@ -371,13 +377,13 @@ pic_do_pending_ints(register_t psw, int
if (ipl = newipl)
break;
- ci-ci_cpl = ipl;
+ pic_set_priority(ci, newipl);
pic_list_deliver_irqs(psw, ipl, frame);
pic_list_unblock_irqs();
}
}
if (ci-ci_cpl != newipl)
- ci-ci_cpl = newipl;
+ pic_set_priority(ci, newipl);
#ifdef __HAVE_FAST_SOFTINTS
cpu_dosoftints();
#endif
@@ -449,7 +455,7 @@ pic_establish_intr(struct pic_softc *pic
return NULL;
}
- is = malloc(sizeof(*is), M_INTRSOURCE, M_NOWAIT|M_ZERO);
+ is = kmem_zalloc(sizeof(*is), KM_SLEEP);
if (is == NULL)
return NULL;
@@ -527,7 +533,7 @@ pic_disestablish_source(struct intrsourc
pic__iplsources[pic_ipl_offset[is-is_ipl] + is-is_iplidx] = NULL;
evcnt_detach(is-is_ev);
- free(is, M_INTRSOURCE);
+ kmem_free(is, sizeof(*is));
}
void *
@@ -535,6 +541,9 @@ intr_establish(int irq, int ipl, int typ
{
int slot;
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
+
for (slot = 0; slot PIC_MAXPICS; slot++) {
struct pic_softc * const pic = pic_list[slot];
if (pic == NULL || pic-pic_irqbase 0)
Index: src/sys/arch/arm/pic/pic_splfuncs.c
diff -u src/sys/arch/arm/pic/pic_splfuncs.c:1.2 src/sys/arch/arm/pic/pic_splfuncs.c:1.3
--- src/sys/arch/arm/pic/pic_splfuncs.c:1.2 Sat May 28 20:56:37 2011
+++ src/sys/arch/arm/pic/pic_splfuncs.c Sat Jul 14 07:52:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch Exp $ */
+/* $NetBSD: pic_splfuncs.c,v 1.3 2012/07/14 07:52:53 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pic_splfuncs.c,v 1.3 2012/07/14 07:52:53 matt Exp $);
#define _INTR_PRIVATE
#include sys/param.h
@@ -51,8 +51,9 @@ _splraise(int newipl)
struct cpu_info * const ci = curcpu();
const int oldipl = ci-ci_cpl;
KASSERT(newipl NIPL);
- if (newipl ci-ci_cpl)
- ci-ci_cpl = newipl;
+ if (newipl ci-ci_cpl) {
+ pic_set_priority(ci, newipl);
+ }
return oldipl;
}
int
Index: src/sys/arch/arm/pic/picvar.h
diff -u src/sys/arch/arm/pic/picvar.h:1.5 src/sys/arch/arm/pic/picvar.h:1.6
--- src/sys/arch/arm/pic/picvar.h:1.5 Mon Nov 15 09:25:58 2010
+++ src/sys/arch/arm/pic/picvar.h Sat Jul 14 07:52:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: picvar.h,v 1.5 2010/11/15 09:25:58 bsh Exp $ */
+/* $NetBSD: picvar.h,v 1.6 2012/07/14 07:52:53 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -100,8 +100,23 @@ struct pic_ops {
void (*pic_establish_irq)(struct pic_softc *, struct intrsource *);
void (*pic_source_name)(struct pic_softc
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Sat Jul 14 07:54:29 UTC 2012 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: Fix CPU_ID_CORTEX_P and add CPU_ID_CORTEX_A8_P To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/armreg.h diff -u src/sys/arch/arm/include/armreg.h:1.52 src/sys/arch/arm/include/armreg.h:1.53 --- src/sys/arch/arm/include/armreg.h:1.52 Fri Jul 13 05:23:30 2012 +++ src/sys/arch/arm/include/armreg.h Sat Jul 14 07:54:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.52 2012/07/13 05:23:30 matt Exp $ */ +/* $NetBSD: armreg.h,v 1.53 2012/07/14 07:54:29 matt Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -210,7 +210,8 @@ #define CPU_ID_CORTEXA9R4 0x413fc090 #define CPU_ID_CORTEXA15R2 0x412fc0f0 #define CPU_ID_CORTEXA15R3 0x413fc0f0 -#define CPU_ID_CORTEX_P(n) ((n 0xff00) == 0x410fc000) +#define CPU_ID_CORTEX_P(n) ((n 0xff0fff00) == 0x410fc000) +#define CPU_ID_CORTEX_A8_P(n) ((n 0xff00) == 0x410fc080) #define CPU_ID_SA110 0x4401a100 #define CPU_ID_SA1100 0x4401a110 #define CPU_ID_TI925T 0x54029250
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Sat Jul 14 07:55:28 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
Refresh cortex cpus
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/arm/arm32/cpu.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/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.81 src/sys/arch/arm/arm32/cpu.c:1.82
--- src/sys/arch/arm/arm32/cpu.c:1.81 Sun May 20 18:08:05 2012
+++ src/sys/arch/arm/arm32/cpu.c Sat Jul 14 07:55:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.81 2012/05/20 18:08:05 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.82 2012/07/14 07:55:28 matt Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.81 2012/05/20 18:08:05 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.82 2012/07/14 07:55:28 matt Exp $);
#include sys/systm.h
#include sys/malloc.h
@@ -420,15 +420,23 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_ARM11MPCORE, CPU_CLASS_ARM11J, ARM11 MPCore,
generic_steppings },
+ { CPU_ID_CORTEXA5R0, CPU_CLASS_CORTEX, Cortex-A5 r0,
+ pN_steppings },
{ CPU_ID_CORTEXA8R1, CPU_CLASS_CORTEX, Cortex-A8 r1,
pN_steppings },
{ CPU_ID_CORTEXA8R2, CPU_CLASS_CORTEX, Cortex-A8 r2,
pN_steppings },
{ CPU_ID_CORTEXA8R3, CPU_CLASS_CORTEX, Cortex-A8 r3,
pN_steppings },
- { CPU_ID_CORTEXA9R1, CPU_CLASS_CORTEX, Cortex-A9 r1,
+ { CPU_ID_CORTEXA9R2, CPU_CLASS_CORTEX, Cortex-A9 r2,
+ pN_steppings },
+ { CPU_ID_CORTEXA9R3, CPU_CLASS_CORTEX, Cortex-A9 r3,
+ pN_steppings },
+ { CPU_ID_CORTEXA9R4, CPU_CLASS_CORTEX, Cortex-A9 r4,
+ pN_steppings },
+ { CPU_ID_CORTEXA15R2, CPU_CLASS_CORTEX, Cortex-A15 r2,
pN_steppings },
- { CPU_ID_CORTEXA8R3, CPU_CLASS_ARM11J, Cortex-A8 r3,
+ { CPU_ID_CORTEXA15R3, CPU_CLASS_CORTEX, Cortex-A15 r3,
pN_steppings },
{ CPU_ID_FA526, CPU_CLASS_ARMV4, FA526,
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Sat Jul 14 07:57:26 UTC 2012
Modified Files:
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/mainbus: mainbus.c mainbus.h
Log Message:
Add intrbase locator to mainbus.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/mainbus/mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/mainbus/mainbus.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.104 src/sys/arch/arm/conf/files.arm:1.105
--- src/sys/arch/arm/conf/files.arm:1.104 Fri Jul 13 05:23:29 2012
+++ src/sys/arch/arm/conf/files.arm Sat Jul 14 07:57:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.104 2012/07/13 05:23:29 matt Exp $
+# $NetBSD: files.arm,v 1.105 2012/07/14 07:57:26 matt Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflagARM32
@@ -78,7 +78,7 @@ file arch/arm/arm/fiq.c
file arch/arm/arm/fiq_subr.S
# mainbus files
-device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1] }
+device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1], [intrbase = -1] }
attach mainbus at root
file arch/arm/mainbus/mainbus.c mainbus arm32
file arch/arm/mainbus/mainbus_io.c mainbus arm32
Index: src/sys/arch/arm/mainbus/mainbus.c
diff -u src/sys/arch/arm/mainbus/mainbus.c:1.18 src/sys/arch/arm/mainbus/mainbus.c:1.19
--- src/sys/arch/arm/mainbus/mainbus.c:1.18 Fri Jul 1 20:31:39 2011
+++ src/sys/arch/arm/mainbus/mainbus.c Sat Jul 14 07:57:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.19 2012/07/14 07:57:26 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.19 2012/07/14 07:57:26 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -142,6 +142,7 @@ mainbussearch(device_t parent, cfdata_t
mb.mb_drq = cf-cf_loc[MAINBUSCF_DACK];
mb.mb_irq = cf-cf_loc[MAINBUSCF_IRQ];
}
+ mb.mb_intrbase = cf-cf_loc[MAINBUSCF_INTRBASE];
mb.mb_iot = mainbus_bs_tag;
tryagain = 0;
Index: src/sys/arch/arm/mainbus/mainbus.h
diff -u src/sys/arch/arm/mainbus/mainbus.h:1.2 src/sys/arch/arm/mainbus/mainbus.h:1.3
--- src/sys/arch/arm/mainbus/mainbus.h:1.2 Fri Jul 1 20:31:39 2011
+++ src/sys/arch/arm/mainbus/mainbus.h Sat Jul 14 07:57:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.2 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: mainbus.h,v 1.3 2012/07/14 07:57:26 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -52,6 +52,7 @@ struct mainbus_attach_args {
int mb_iosize; /* span of ports used */
int mb_irq; /* interrupt request */
int mb_drq; /* DMA request */
+ int mb_intrbase; /* interrupt numbering base */
void *mb_aux; /* driver specific */
bus_space_tag_t mb_iot; /* bus space tag */
};
CVS commit: src/sys/dev
Module Name:src Committed By: matt Date: Sat Jul 14 07:59:48 UTC 2012 Modified Files: src/sys/dev: DEVNAMES Log Message: Add gic for arm To generate a diff of this commit: cvs rdiff -u -r1.275 -r1.276 src/sys/dev/DEVNAMES 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/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.275 src/sys/dev/DEVNAMES:1.276 --- src/sys/dev/DEVNAMES:1.275 Fri Jun 22 20:42:23 2012 +++ src/sys/dev/DEVNAMES Sat Jul 14 07:59:48 2012 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.275 2012/06/22 20:42:23 abs Exp $ +# $NetBSD: DEVNAMES,v 1.276 2012/07/14 07:59:48 matt Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -499,6 +499,7 @@ gem MI gentbi MI geodeide MI gfe MI +gic arm gio sgimips giobus sgimips Attribute glxtphy MI
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Jul 14 09:24:52 UTC 2012 Modified Files: src/share/man/man9: extent.9 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man9/extent.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/extent.9 diff -u src/share/man/man9/extent.9:1.30 src/share/man/man9/extent.9:1.31 --- src/share/man/man9/extent.9:1.30 Sat Jul 14 05:36:56 2012 +++ src/share/man/man9/extent.9 Sat Jul 14 09:24:51 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: extent.9,v 1.30 2012/07/14 05:36:56 rkujawa Exp $ +.\ $NetBSD: extent.9,v 1.31 2012/07/14 09:24:51 wiz Exp $ .\ .\ Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 23, 1996 +.Dd Jukly 14, 2012 .Dt EXTENT 9 .Os .Sh NAME
CVS commit: src/share/man/man9
Module Name:src Committed By: rkujawa Date: Sat Jul 14 10:25:00 UTC 2012 Modified Files: src/share/man/man9: extent.9 Log Message: s/Jukly/July/ To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/share/man/man9/extent.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/extent.9 diff -u src/share/man/man9/extent.9:1.31 src/share/man/man9/extent.9:1.32 --- src/share/man/man9/extent.9:1.31 Sat Jul 14 09:24:51 2012 +++ src/share/man/man9/extent.9 Sat Jul 14 10:24:59 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: extent.9,v 1.31 2012/07/14 09:24:51 wiz Exp $ +.\ $NetBSD: extent.9,v 1.32 2012/07/14 10:24:59 rkujawa Exp $ .\ .\ Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd Jukly 14, 2012 +.Dd July 14, 2012 .Dt EXTENT 9 .Os .Sh NAME
CVS commit: src/distrib/sets/lists/tests
Module Name:src
Committed By: christos
Date: Sat Jul 14 14:13:04 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
Log Message:
no more CRYPTO_{IDEA,MDC2}
To generate a diff of this commit:
cvs rdiff -u -r1.476 -r1.477 src/distrib/sets/lists/tests/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.476 src/distrib/sets/lists/tests/mi:1.477
--- src/distrib/sets/lists/tests/mi:1.476 Wed Jul 11 18:42:40 2012
+++ src/distrib/sets/lists/tests/mi Sat Jul 14 10:13:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.476 2012/07/11 22:42:40 jmmv Exp $
+# $NetBSD: mi,v 1.477 2012/07/14 14:13:03 christos Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -198,13 +198,13 @@
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_evp_test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_exptest.debug tests-crypto-debug debug,crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto_idea,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md5test.debug tests-crypto-debug debug,crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto_mdc2,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_randtest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc4test.debug tests-crypto-debug debug,crypto
@@ -1429,12 +1429,12 @@
./usr/tests/crypto/libcrypto/evptests.txt tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_exptest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_hmactest tests-crypto-tests crypto
-./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto_idea,crypto
+./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_lhashtest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md4test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md5test tests-crypto-tests crypto
-./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto_mdc2,crypto
+./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_randtest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_rc2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_rc4test tests-crypto-tests crypto
CVS commit: src
Module Name:src
Committed By: darrenr
Date: Sat Jul 14 15:06:26 UTC 2012
Modified Files:
src/include: unistd.h
src/lib/libc: shlib_version
src/lib/libc/net: rcmd.c
src/libexec/rshd: rshd.c
Log Message:
bin/46703: BSD r-commands use wrong source address for stderr
http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=46703
Bump libc minor for the addition of rresvport_af_addr()
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/include/unistd.h
cvs rdiff -u -r1.232 -r1.233 src/lib/libc/shlib_version
cvs rdiff -u -r1.67 -r1.68 src/lib/libc/net/rcmd.c
cvs rdiff -u -r1.49 -r1.50 src/libexec/rshd/rshd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.134 src/include/unistd.h:1.135
--- src/include/unistd.h:1.134 Sat Apr 14 01:34:08 2012
+++ src/include/unistd.h Sat Jul 14 15:06:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.134 2012/04/14 01:34:08 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.135 2012/07/14 15:06:26 darrenr Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -385,6 +385,7 @@ int undelete(const char *);
int rcmd_af(char **, int, const char *,
const char *, const char *, int *, int);
int rresvport_af(int *, int);
+int rresvport_af_addr(int *, int, void *);
int iruserok_sa(const void *, int, int, const char *, const char *);
#endif
Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.232 src/lib/libc/shlib_version:1.233
--- src/lib/libc/shlib_version:1.232 Sun Jul 8 01:21:11 2012
+++ src/lib/libc/shlib_version Sat Jul 14 15:06:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.232 2012/07/08 01:21:11 rmind Exp $
+# $NetBSD: shlib_version,v 1.233 2012/07/14 15:06:26 darrenr Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
# things we wish to do on next major version bump:
@@ -31,4 +31,4 @@
# - remove gets(); it is finally dead in c11.
# - make __cerror (spelled CERROR) hidden again
major=12
-minor=184
+minor=185
Index: src/lib/libc/net/rcmd.c
diff -u src/lib/libc/net/rcmd.c:1.67 src/lib/libc/net/rcmd.c:1.68
--- src/lib/libc/net/rcmd.c:1.67 Tue Mar 13 21:13:42 2012
+++ src/lib/libc/net/rcmd.c Sat Jul 14 15:06:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rcmd.c,v 1.67 2012/03/13 21:13:42 christos Exp $ */
+/* $NetBSD: rcmd.c,v 1.68 2012/07/14 15:06:26 darrenr Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)rcmd.c 8.3 (Berkeley) 3/26/94;
#else
-__RCSID($NetBSD: rcmd.c,v 1.67 2012/03/13 21:13:42 christos Exp $);
+__RCSID($NetBSD: rcmd.c,v 1.68 2012/07/14 15:06:26 darrenr Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -506,6 +506,12 @@ rresvport(int *alport)
int
rresvport_af(int *alport, int family)
{
+ return rresvport_af_addr(alport, family, NULL);
+}
+
+int
+rresvport_af_addr(int *alport, int family, void *addr)
+{
struct sockaddr_storage ss;
struct sockaddr *sa;
socklen_t salen;
@@ -522,6 +528,9 @@ rresvport_af(int *alport, int family)
sa-sa_len =
#endif
salen = sizeof(struct sockaddr_in);
+ if (addr)
+ ((struct sockaddr_in *)(void *)sa)-sin_addr =
+ ((struct sockaddr_in *)addr)-sin_addr;
portp = ((struct sockaddr_in *)(void *)sa)-sin_port;
break;
#ifdef INET6
@@ -530,6 +539,9 @@ rresvport_af(int *alport, int family)
sa-sa_len =
#endif
salen = sizeof(struct sockaddr_in6);
+ if (addr)
+ ((struct sockaddr_in6 *)(void *)sa)-sin6_addr =
+ ((struct sockaddr_in6 *)addr)-sin6_addr;
portp = ((struct sockaddr_in6 *)(void *)sa)-sin6_port;
break;
#endif
Index: src/libexec/rshd/rshd.c
diff -u src/libexec/rshd/rshd.c:1.49 src/libexec/rshd/rshd.c:1.50
--- src/libexec/rshd/rshd.c:1.49 Sun Oct 30 16:54:58 2011
+++ src/libexec/rshd/rshd.c Sat Jul 14 15:06:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rshd.c,v 1.49 2011/10/30 16:54:58 christos Exp $ */
+/* $NetBSD: rshd.c,v 1.50 2012/07/14 15:06:26 darrenr Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -69,7 +69,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)rshd.c 8.2 (Berkeley) 4/6/94;
#else
-__RCSID($NetBSD: rshd.c,v 1.49 2011/10/30 16:54:58 christos Exp $);
+__RCSID($NetBSD: rshd.c,v 1.50 2012/07/14 15:06:26 darrenr Exp $);
#endif
#endif /* not lint */
@@ -137,7 +137,7 @@ static int check_all;
static int log_success; /* If TRUE, log all successful accesses */
static int sent_null;
-__dead static void doit(struct sockaddr *);
+__dead static void doit(struct sockaddr *, struct sockaddr *);
__dead static void rshd_errx(int, const char *, ...) __printflike(2, 3);
static void getstr(char *, int, const char *);
static int local_domain(char *);
@@ -155,7 +155,9 @@ main(int argc, char *argv[])
struct linger linger;
int ch, on = 1;
socklen_t fromlen;
+ socklen_t locallen;
struct
CVS commit: src
Module Name:src
Committed By: spz
Date: Sat Jul 14 16:04:06 UTC 2012
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: shl.mi
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/tests/crypto/libcrypto: t_ciphers.sh t_hashes.sh
Log Message:
more MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal (resp, adjustment to IDEA and
MBC2 now always being included)
MKCRYPTO_RC5 now builds shared libs, add the missing files to sets
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/sets.subr
cvs rdiff -u -r1.631 -r1.632 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.59 -r1.60 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.296 -r1.297 src/share/mk/bsd.README
cvs rdiff -u -r1.699 -r1.700 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/t_hashes.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.136 src/distrib/sets/sets.subr:1.137
--- src/distrib/sets/sets.subr:1.136 Fri Feb 17 00:00:39 2012
+++ src/distrib/sets/sets.subr Sat Jul 14 16:04:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.136 2012/02/17 00:00:39 christos Exp $
+# $NetBSD: sets.subr,v 1.137 2012/07/14 16:04:04 spz Exp $
#
#
@@ -172,7 +172,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.136 2012/02/17 00:00:39 christos Exp $
+# # $NetBSD: sets.subr,v 1.137 2012/07/14 16:04:04 spz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -199,8 +199,6 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# catpages ${MKCATPAGES} != no
# compat ${MKCOMPAT} != no
# crypto ${MKCRYPTO} != no
-# crypto_idea ${MKCRYPTO_IDEA} != no
-# crypto_mdc2 ${MKCRYPTO_MDC2} != no
# crypto_rc5 ${MKCRYPTO_RC5} != no
# cvs ${MKCVS} != no
# debug ${MKDEBUG} != no
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.631 src/distrib/sets/lists/base/shl.mi:1.632
--- src/distrib/sets/lists/base/shl.mi:1.631 Wed Jul 11 22:42:39 2012
+++ src/distrib/sets/lists/base/shl.mi Sat Jul 14 16:04:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.631 2012/07/11 22:42:39 jmmv Exp $
+# $NetBSD: shl.mi,v 1.632 2012/07/14 16:04:05 spz Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -194,8 +194,10 @@
./usr/lib/libcrypto_idea.so.7.0 base-obsolete obsolete
./usr/lib/libcrypto_mdc2.so.7 base-obsolete obsolete
./usr/lib/libcrypto_mdc2.so.7.0 base-obsolete obsolete
+./usr/lib/libcrypto_rc5.so base-crypto-shlib crypto,crypto_rc5
./usr/lib/libcrypto_rc5.so.7 base-crypto-shlib crypto,crypto_rc5
./usr/lib/libcrypto_rc5.so.7.0 base-crypto-shlib crypto,crypto_rc5
+./usr/lib/libcrypto_rc5_pic.a base-crypto-shlib crypto,crypto_rc5
./usr/lib/libctf.sobase-sys-shlib dtrace
./usr/lib/libctf.so.2base-sys-shlib dtrace
./usr/lib/libctf.so.2.0base-sys-shlib dtrace
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.59 src/share/man/man5/mk.conf.5:1.60
--- src/share/man/man5/mk.conf.5:1.59 Sun Mar 11 23:42:06 2012
+++ src/share/man/man5/mk.conf.5 Sat Jul 14 16:04:05 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: mk.conf.5,v 1.59 2012/03/11 23:42:06 njoly Exp $
+.\ $NetBSD: mk.conf.5,v 1.60 2012/07/14 16:04:05 spz Exp $
.\
.\ Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -266,18 +266,6 @@ If
acts as
.Sy MKKERBEROS=no .
.
-.It Sy MKCRYPTO_IDEA
-.YorN
-Indicates whether IDEA support will be built into
-.Sy libcrypto_idea.a .
-.DFLTn
-.
-.It Sy MKCRYPTO_MDC2
-.YorN
-Indicates whether MDC2 support will be built into
-.Sy libcrypto_mdc2.a .
-.DFLTn
-.
.It Sy MKCRYPTO_RC5
.YorN
Indicates whether RC5 support will be built into
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.296 src/share/mk/bsd.README:1.297
--- src/share/mk/bsd.README:1.296 Tue Jun 19 06:20:13 2012
+++ src/share/mk/bsd.README Sat Jul 14 16:04:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.296 2012/06/19 06:20:13 plunky Exp $
+# $NetBSD: bsd.README,v 1.297 2012/07/14 16:04:06 spz Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -140,13 +140,7 @@ MKCRYPTO If no, no cryptography suppor
and also acts as MKKERBEROS=no.
Default: yes
-MKCRYPTO_IDEA If not no, IDEA support will be built into libcrypto_idea.a.
- Default: no
-
-MKCRYPTO_MDC2 If not no, MDC2 support will be built into libcrypto_mdc2.a
- Default: no
-
-MKCRYPTO_RC5 If not no, RC5 support will be built into libcrypto_rc5.a.
+MKCRYPTO_RC5 If not no, RC5 support
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Sat Jul 14 17:12:27 UTC 2012 Modified Files: src/share/man/man5: mk.conf.5 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.60 src/share/man/man5/mk.conf.5:1.61 --- src/share/man/man5/mk.conf.5:1.60 Sat Jul 14 16:04:05 2012 +++ src/share/man/man5/mk.conf.5 Sat Jul 14 17:12:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mk.conf.5,v 1.60 2012/07/14 16:04:05 spz Exp $ +.\ $NetBSD: mk.conf.5,v 1.61 2012/07/14 17:12:27 wiz Exp $ .\ .\ Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 6, 2011 +.Dd July 14, 2012 .Dt MK.CONF 5 .Os .\ turn off hyphenation
CVS commit: src/common/lib/libc/gen
Module Name:src
Committed By: matt
Date: Sat Jul 14 18:16:54 UTC 2012
Modified Files:
src/common/lib/libc/gen: ptree.c
Log Message:
Add code to protect the ptree from multiple insertions of the same node.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/gen/ptree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.7 src/common/lib/libc/gen/ptree.c:1.8
--- src/common/lib/libc/gen/ptree.c:1.7 Fri Jul 13 01:15:27 2012
+++ src/common/lib/libc/gen/ptree.c Sat Jul 14 18:16:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $ */
+/* $NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include sys/types.h
#include sys/systm.h
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $);
#else
#include stddef.h
#include stdint.h
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.
#else
#define KASSERT(e) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $);
+__RCSID($NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $);
#endif /* _KERNEL || _STANDALONE */
#ifdef _LIBC
@@ -459,6 +459,12 @@ ptree_insert_node_common(pt_tree_t *pt,
pt_insertdata_t id;
/*
+ * If this node already exists in the tree, return failure.
+ */
+ if (target == PT_NODE(pt-pt_root))
+ return false;
+
+ /*
* We need a leaf so we can match against. Until we get a leaf
* we having nothing to test against.
*/
@@ -480,6 +486,12 @@ ptree_insert_node_common(pt_tree_t *pt,
id.id_node = *id.id_insertp;
/*
+ * If this node already exists in the tree, return failure.
+ */
+ if (target == ptn)
+ return false;
+
+ /*
* If we hit a leaf, try to insert target at leaf. We could
* have inlined ptree_insert_leaf here but that would have
* made this routine much harder to understand. Trust the
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: jmmv Date: Sat Jul 14 18:50:23 UTC 2012 Modified Files: src/sys/arch/macppc/conf: INSTALL Log Message: Add umass to the macppc INSTALL kernel so that it is easier to perform USB-based installations by reading the release files from a USB drive. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/arch/macppc/conf/INSTALL 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/macppc/conf/INSTALL diff -u src/sys/arch/macppc/conf/INSTALL:1.115 src/sys/arch/macppc/conf/INSTALL:1.116 --- src/sys/arch/macppc/conf/INSTALL:1.115 Fri Mar 23 18:37:42 2012 +++ src/sys/arch/macppc/conf/INSTALL Sat Jul 14 18:50:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.115 2012/03/23 18:37:42 he Exp $ +# $NetBSD: INSTALL,v 1.116 2012/07/14 18:50:22 jmmv Exp $ # # config file for INSTALL FLOPPY # @@ -191,6 +191,7 @@ uhub* at usb? uhub* at uhub? port ? uhidev* at uhub? port ? configuration ? interface ? ukbd* at uhidev? reportid ? +umass* at uhub? port ? configuration ? interface ? # USB Mass Storage pseudo-device md # memory disk #pseudo-device fss # file system snapshot device
CVS commit: src/sbin/mbrlabel
Module Name:src Committed By: wiz Date: Sat Jul 14 20:13:31 UTC 2012 Modified Files: src/sbin/mbrlabel: mbrlabel.8 Log Message: From Bug Hunting: - use more common option list header line; - remove superfluous `.Pp' macro (fixes mandoc(1) warning); - bump date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sbin/mbrlabel/mbrlabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mbrlabel/mbrlabel.8 diff -u src/sbin/mbrlabel/mbrlabel.8:1.17 src/sbin/mbrlabel/mbrlabel.8:1.18 --- src/sbin/mbrlabel/mbrlabel.8:1.17 Mon Apr 5 18:08:41 2010 +++ src/sbin/mbrlabel/mbrlabel.8 Sat Jul 14 20:13:30 2012 @@ -27,9 +27,9 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.\ $NetBSD: mbrlabel.8,v 1.17 2010/04/05 18:08:41 wiz Exp $ +.\ $NetBSD: mbrlabel.8,v 1.18 2012/07/14 20:13:30 wiz Exp $ .\ -.Dd April 5, 2010 +.Dd July 13, 2012 .Dt MBRLABEL 8 .Os .Sh NAME @@ -79,8 +79,7 @@ on i386 and some other platforms) is lef By default, the proposed changed disk label will be displayed and no disk label update will occur. .Pp -Available options: -.Pp +The following options are available: .Bl -tag -width sXsectorX .It Fl f Force an update, even if there has been no change.
CVS commit: src/sbin/mbrlabel
Module Name:src
Committed By: wiz
Date: Sat Jul 14 20:14:17 UTC 2012
Modified Files:
src/sbin/mbrlabel: mbrlabel.c
Log Message:
From Bug Hunting:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sbin/mbrlabel/mbrlabel.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/mbrlabel/mbrlabel.c
diff -u src/sbin/mbrlabel/mbrlabel.c:1.27 src/sbin/mbrlabel/mbrlabel.c:1.28
--- src/sbin/mbrlabel/mbrlabel.c:1.27 Sat Aug 27 17:45:30 2011
+++ src/sbin/mbrlabel/mbrlabel.c Sat Jul 14 20:14:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrlabel.c,v 1.27 2011/08/27 17:45:30 joerg Exp $ */
+/* $NetBSD: mbrlabel.c,v 1.28 2012/07/14 20:14:17 wiz Exp $ */
/*
* Copyright (C) 1998 Wolfgang Solfrank.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: mbrlabel.c,v 1.27 2011/08/27 17:45:30 joerg Exp $);
+__RCSID($NetBSD: mbrlabel.c,v 1.28 2012/07/14 20:14:17 wiz Exp $);
#endif /* not lint */
#include stdio.h
@@ -239,7 +239,7 @@ getparts(int sd, u_int32_t off, u_int32_
static void
usage(void)
{
- fprintf(stderr, usage: %s [-fqrw] [-s sector] rawdisk\n,
+ fprintf(stderr, usage: %s [-fqrw] [-s sector] device\n,
getprogname());
exit(1);
}
CVS commit: src/distrib/utils/libhack
Module Name:src
Committed By: abs
Date: Sat Jul 14 20:32:39 UTC 2012
Modified Files:
src/distrib/utils/libhack: syslog.c
Log Message:
Add a check hack to ensure %m causes error message string to be shown
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/libhack/syslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/syslog.c
diff -u src/distrib/utils/libhack/syslog.c:1.6 src/distrib/utils/libhack/syslog.c:1.7
--- src/distrib/utils/libhack/syslog.c:1.6 Sat Feb 3 19:49:21 2007
+++ src/distrib/utils/libhack/syslog.c Sat Jul 14 20:32:39 2012
@@ -1,6 +1,8 @@
#include sys/types.h
#include sys/syslog.h
#include stdio.h
+#include string.h
+#include errno.h
#include stdarg.h
void
@@ -25,10 +27,8 @@ syslog(int fac, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- (void)vfprintf(stderr, fmt, ap);
+ vsyslog(fac, fmt, ap);
va_end(ap);
- (void)fprintf(stderr, \n);
- fflush(stderr);
}
__strong_alias(_vsyslog, vsyslog)
@@ -36,6 +36,9 @@ void
vsyslog(int fac, const char *fmt, va_list ap)
{
(void)vfprintf(stderr, fmt, ap);
+ /* Cheap hack to ensure %m causes error message string to be shown */
+ if (strstr(fmt, %m))
+ (void)fprintf(stderr, (%s), strerror(errno));
(void)fprintf(stderr, \n);
fflush(stderr);
}
CVS commit: src/usr.bin/eject
Module Name:src
Committed By: abs
Date: Sat Jul 14 20:41:27 UTC 2012
Modified Files:
src/usr.bin/eject: eject.c
Log Message:
racd *should* be ejectable. Kernel side to come
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/eject/eject.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/eject/eject.c
diff -u src/usr.bin/eject/eject.c:1.26 src/usr.bin/eject/eject.c:1.27
--- src/usr.bin/eject/eject.c:1.26 Wed Jun 23 18:07:59 2010
+++ src/usr.bin/eject/eject.c Sat Jul 14 20:41:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: eject.c,v 1.26 2010/06/23 18:07:59 yamt Exp $ */
+/* $NetBSD: eject.c,v 1.27 2012/07/14 20:41:27 abs Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@ __COPYRIGHT(@(#) Copyright (c) 1999\
#endif/* not lint */
#ifndef lint
-__RCSID($NetBSD: eject.c,v 1.26 2010/06/23 18:07:59 yamt Exp $);
+__RCSID($NetBSD: eject.c,v 1.27 2012/07/14 20:41:27 abs Exp $);
#endif/* not lint */
#include sys/types.h
@@ -74,23 +74,24 @@ struct nicknames_s {
# define FLOPPY 0x2
# define TYPEMASK ((int)~0x01)
} nicknames[] = {
- { diskette, fd, DISK | FLOPPY | NOTLOADABLE },
- { floppy, fd, DISK | FLOPPY | NOTLOADABLE },
- { fd, fd, DISK | FLOPPY | NOTLOADABLE },
- { sd, sd, DISK | NOTLOADABLE },
- { cdrom,cd, DISK | LOADABLE },
- { cd, cd, DISK | LOADABLE },
- { cdr, cd, DISK | LOADABLE },
- { cdrw, cd, DISK | LOADABLE },
- { dvdrom, cd, DISK | LOADABLE },
- { dvd, cd, DISK | LOADABLE },
- { dvdr, cd, DISK | LOADABLE },
- { dvdrw,cd, DISK | LOADABLE },
- { mcd, mcd, DISK | LOADABLE }, /* XXX Is this true? */
- { tape, st, TAPE | NOTLOADABLE },
- { st, st, TAPE | NOTLOADABLE },
- { dat, st, TAPE | NOTLOADABLE },
- { exabyte, st, TAPE | NOTLOADABLE }
+ { diskette, fd, DISK | FLOPPY | NOTLOADABLE },
+ { floppy, fd, DISK | FLOPPY | NOTLOADABLE },
+ { fd, fd, DISK | FLOPPY | NOTLOADABLE },
+ { sd, sd, DISK | NOTLOADABLE },
+ { cdrom,cd, DISK | LOADABLE },
+ { cd, cd, DISK | LOADABLE },
+ { racd, racd, DISK | LOADABLE },
+ { cdr, cd, DISK | LOADABLE },
+ { cdrw, cd, DISK | LOADABLE },
+ { dvdrom, cd, DISK | LOADABLE },
+ { dvd, cd, DISK | LOADABLE },
+ { dvdr, cd, DISK | LOADABLE },
+ { dvdrw,cd, DISK | LOADABLE },
+ { mcd, mcd, DISK | LOADABLE }, /* XXX Is this true? */
+ { tape, st, TAPE | NOTLOADABLE },
+ { st, st, TAPE | NOTLOADABLE },
+ { dat, st, TAPE | NOTLOADABLE },
+ { exabyte, st, TAPE | NOTLOADABLE }
};
#define MAXNICKLEN 12 /* at least enough room for the longest
* nickname */
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mlelstv Date: Sat Jul 14 22:37:43 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: update lists after version bump of libc. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.161 -r1.162 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.632 -r1.633 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.228 -r1.229 src/distrib/sets/lists/comp/shl.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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.96 src/distrib/sets/lists/base/ad.mips64eb:1.97 --- src/distrib/sets/lists/base/ad.mips64eb:1.96 Wed Jul 11 22:42:38 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Jul 14 22:37:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.96 2012/07/11 22:42:38 jmmv Exp $ +# $NetBSD: ad.mips64eb,v 1.97 2012/07/14 22:37:41 mlelstv Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -72,7 +72,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libc.so.12base-compat-shlib compat,pic -./usr/lib/64/libc.so.12.184 base-compat-shlib compat,pic +./usr/lib/64/libc.so.12.185 base-compat-shlib compat,pic ./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic @@ -380,7 +380,7 @@ ./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic -./usr/lib/o32/libc.so.12.184 base-compat-shlib compat,pic +./usr/lib/o32/libc.so.12.185 base-compat-shlib compat,pic ./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.95 src/distrib/sets/lists/base/ad.mips64el:1.96 --- src/distrib/sets/lists/base/ad.mips64el:1.95 Wed Jul 11 22:42:38 2012 +++ src/distrib/sets/lists/base/ad.mips64el Sat Jul 14 22:37:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.95 2012/07/11 22:42:38 jmmv Exp $ +# $NetBSD: ad.mips64el,v 1.96 2012/07/14 22:37:41 mlelstv Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -70,7 +70,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libc.so.12base-compat-shlib compat,pic -./usr/lib/64/libc.so.12.184 base-compat-shlib compat,pic +./usr/lib/64/libc.so.12.185 base-compat-shlib compat,pic ./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic @@ -380,7 +380,7 @@ ./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic -./usr/lib/o32/libc.so.12.184 base-compat-shlib compat,pic +./usr/lib/o32/libc.so.12.185 base-compat-shlib compat,pic ./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.171 src/distrib/sets/lists/base/md.amd64:1.172 --- src/distrib/sets/lists/base/md.amd64:1.171 Wed Jul 11 22:42:39 2012 +++ src/distrib/sets/lists/base/md.amd64 Sat Jul 14 22:37:42 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.171 2012/07/11 22:42:39 jmmv Exp $ +# $NetBSD: md.amd64,v 1.172 2012/07/14 22:37:42 mlelstv Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -73,7 +73,7 @@
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: abs
Date: Sun Jul 15 00:05:51 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Check for ${HAVE_GCC} and pick the right path to stdc++
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/atf/lib/libatf-c++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.15 src/external/bsd/atf/lib/libatf-c++/Makefile:1.16
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.15 Thu Jul 12 22:15:29 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Jul 15 00:05:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/07/12 22:15:29 christos Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/15 00:05:51 abs Exp $
NOLINT= # defined
@@ -8,7 +8,11 @@ LIB= atf-c++
LIBISCXX= yes
LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
+.if ${HAVE_GCC} == 4
+LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+.else
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
CVS commit: src
Module Name:src
Committed By: rmind
Date: Sun Jul 15 00:16:28 UTC 2012
Modified Files:
src/common/lib/libc/gen: ptree.c
src/sys/sys: ptree.h
Log Message:
ptree_find_filtered_node: make key argument const.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/gen/ptree.c
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/ptree.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.8 src/common/lib/libc/gen/ptree.c:1.9
--- src/common/lib/libc/gen/ptree.c:1.8 Sat Jul 14 18:16:54 2012
+++ src/common/lib/libc/gen/ptree.c Sun Jul 15 00:16:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $ */
+/* $NetBSD: ptree.c,v 1.9 2012/07/15 00:16:28 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include sys/types.h
#include sys/systm.h
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.9 2012/07/15 00:16:28 rmind Exp $);
#else
#include stddef.h
#include stdint.h
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.
#else
#define KASSERT(e) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: ptree.c,v 1.8 2012/07/14 18:16:54 matt Exp $);
+__RCSID($NetBSD: ptree.c,v 1.9 2012/07/15 00:16:28 rmind Exp $);
#endif /* _KERNEL || _STANDALONE */
#ifdef _LIBC
@@ -67,7 +67,7 @@ __RCSID($NetBSD: ptree.c,v 1.8 2012/07/
#endif
/*
- * This is an implementation of a radix / PATRICIA tree. As in a traditional
+ * This is an implementation of a radix / PATRICIA tree. As in a traditional
* patricia tree, all the data is at the leaves of the tree. An N-value
* tree would have N leaves, N-1 branching nodes, and a root pointer. Each
* branching node would have left(0) and right(1) pointers that either point
@@ -76,15 +76,15 @@ __RCSID($NetBSD: ptree.c,v 1.8 2012/07/
* have no need for pointers.
*
* However, allocation for these branching nodes is problematic since the
- * allocation could fail. This would cause insertions to fail for reasons
- * beyond the users control. So to prevent this, in this implementation
+ * allocation could fail. This would cause insertions to fail for reasons
+ * beyond the user's control. So to prevent this, in this implementation
* each node has two identities: its leaf identity and its branch identity.
* Each is separate from the other. Every branch is tagged as to whether
* it points to a leaf or a branch. This is not an attribute of the object
* but of the pointer to the object. The low bit of the pointer is used as
* the tag to determine whether it points to a leaf or branch identity, with
* branch identities having the low bit set.
- *
+ *
* A node's branch identity has one rule: when traversing the tree from the
* root to the node's leaf identity, one of the branches traversed will be via
* the node's branch identity. Of course, that has an exception: since to
@@ -93,7 +93,7 @@ __RCSID($NetBSD: ptree.c,v 1.8 2012/07/
*
* Branching nodes also has a bit offset and a bit length which determines
* which branch slot is used. The bit length can be zero resulting in a
- * one-way branch. This is happens in two special cases: the root and
+ * one-way branch. This happens in two special cases: the root and
* interior mask nodes.
*
* To support longest match first lookups, when a mask node (one that only
@@ -628,7 +628,7 @@ ptree_insert_mask_node(pt_tree_t *pt, vo
#endif /* !PTNOMASH */
void *
-ptree_find_filtered_node(pt_tree_t *pt, void *key, pt_filter_t filter,
+ptree_find_filtered_node(pt_tree_t *pt, const void *key, pt_filter_t filter,
void *filter_arg)
{
#ifndef PTNOMASK
Index: src/sys/sys/ptree.h
diff -u src/sys/sys/ptree.h:1.6 src/sys/sys/ptree.h:1.7
--- src/sys/sys/ptree.h:1.6 Wed Jul 11 00:19:28 2012
+++ src/sys/sys/ptree.h Sun Jul 15 00:16:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.h,v 1.6 2012/07/11 00:19:28 rmind Exp $ */
+/* $NetBSD: ptree.h,v 1.7 2012/07/15 00:16:28 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -184,7 +184,7 @@ typedef bool (*pt_filter_t)(void *, cons
void ptree_init(pt_tree_t *, const pt_tree_ops_t *, void *, size_t, size_t);
bool ptree_insert_node(pt_tree_t *, void *);
bool ptree_insert_mask_node(pt_tree_t *, void *, pt_bitlen_t);
-void * ptree_find_filtered_node(pt_tree_t *, void *, pt_filter_t, void *);
+void * ptree_find_filtered_node(pt_tree_t *, const void *, pt_filter_t, void *);
#define ptree_find_node(pt,key) \
ptree_find_filtered_node((pt), (key), NULL, NULL)
void ptree_remove_node(pt_tree_t *, void *);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Sun Jul 15 01:15:03 UTC 2012 Modified Files: src/sys/dev/ic: mvsata.c Log Message: Fix obvious copy/paste-induced error (my fault) that would clobber the bottom 24-bits of r_lba during a LBA48 command with AT_READREG. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/mvsata.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/mvsata.c diff -u src/sys/dev/ic/mvsata.c:1.18 src/sys/dev/ic/mvsata.c:1.19 --- src/sys/dev/ic/mvsata.c:1.18 Thu Jul 12 14:17:03 2012 +++ src/sys/dev/ic/mvsata.c Sun Jul 15 01:15:03 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $ */ +/* $NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $); #include opt_mvsata.h @@ -1739,7 +1739,7 @@ mvsata_wdc_cmd_done(struct ata_channel * } ata_c-r_count |= MVSATA_WDC_READ_1(mvport, SRB_SC) 8; - ata_c-r_lba = + ata_c-r_lba |= (uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAL) 24; ata_c-r_lba |= (uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAM) 32;
