CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: rtr Date: Sun Apr 5 23:28:10 UTC 2015 Modified Files: src/tests/lib/libc/sys: t_bind.c Log Message: fix typo bindinging - binding To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_bind.c 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/sys
Module Name:src
Committed By: rtr
Date: Sun Apr 5 23:28:10 UTC 2015
Modified Files:
src/tests/lib/libc/sys: t_bind.c
Log Message:
fix typo bindinging - binding
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_bind.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/sys/t_bind.c
diff -u src/tests/lib/libc/sys/t_bind.c:1.2 src/tests/lib/libc/sys/t_bind.c:1.3
--- src/tests/lib/libc/sys/t_bind.c:1.2 Sun Apr 5 23:15:54 2015
+++ src/tests/lib/libc/sys/t_bind.c Sun Apr 5 23:28:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bind.c,v 1.2 2015/04/05 23:15:54 rtr Exp $ */
+/* $NetBSD: t_bind.c,v 1.3 2015/04/05 23:28:10 rtr Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -42,7 +42,7 @@ ATF_TC(bind_foreign_family);
ATF_TC_HEAD(bind_foreign_family, tc)
{
- atf_tc_set_md_var(tc, descr, Checks that bindinging a socket
+ atf_tc_set_md_var(tc, descr, Checks that binding a socket
with a different address family fails);
}
CVS commit: [netbsd-7] src/sys/arch
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:48:25 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic [netbsd-7]: amlogic_genfb.c amlogic_vpureg.h
src/sys/arch/evbarm/amlogic [netbsd-7]: amlogic_machdep.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #661):
sys/arch/arm/amlogic/amlogic_genfb.c: revision 1.5
sys/arch/arm/amlogic/amlogic_vpureg.h: revision 1.3
sys/arch/evbarm/amlogic/amlogic_machdep.c: revision 1.20
Allow for choosing between 16 and 24bpp framebuffers. The default is now
16 instead of 24. Set 'fb.depth=16' or 'fb.depth=24' on kernel command-line
to explicitly select a colour depth.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/arm/amlogic/amlogic_genfb.c \
src/sys/arch/arm/amlogic/amlogic_vpureg.h
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 \
src/sys/arch/evbarm/amlogic/amlogic_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/arm/amlogic/amlogic_genfb.c
diff -u src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.3 src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.4
--- src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.3 Wed Mar 25 17:01:32 2015
+++ src/sys/arch/arm/amlogic/amlogic_genfb.c Mon Apr 6 01:48:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_genfb.c,v 1.1.2.3 2015/03/25 17:01:32 snj Exp $ */
+/* $NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_genfb.c,v 1.1.2.3 2015/03/25 17:01:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, $NetBSD: amlogic_genf
#include dev/wsfb/genfbvar.h
+#define AMLOGIC_GENFB_DEFAULT_DEPTH 16
+
/* Map CEA-861-D video code (VIC) to framebuffer dimensions */
static const struct amlogic_genfb_vic2mode {
u_int vic;
@@ -268,12 +270,13 @@ amlogic_genfb_canvas_config(struct amlog
prop_dictionary_t cfg = device_properties(sc-sc_gen.sc_dev);
const paddr_t pa = sc-sc_dmamap-dm_segs[0].ds_addr;
uint32_t datal, datah, addr;
- u_int width, height;
+ u_int width, height, depth;
prop_dictionary_get_uint32(cfg, width, width);
prop_dictionary_get_uint32(cfg, height, height);
+ prop_dictionary_get_uint32(cfg, depth, depth);
- const uint32_t w = (width * 3) 3;
+ const uint32_t w = (width * (depth/8)) 3;
const uint32_t h = height;
datal = CAV_READ(sc, DC_CAV_LUT_DATAL_REG);
@@ -303,17 +306,56 @@ static void
amlogic_genfb_osd_config(struct amlogic_genfb_softc *sc)
{
prop_dictionary_t cfg = device_properties(sc-sc_gen.sc_dev);
- uint32_t w0, w1, w2, w3, w4;
- u_int width, height;
+ uint32_t cs, tc, w0, w1, w2, w3, w4;
+ u_int width, height, depth;
bool interlace_p;
prop_dictionary_get_uint32(cfg, width, width);
prop_dictionary_get_uint32(cfg, height, height);
+ prop_dictionary_get_uint32(cfg, depth, depth);
prop_dictionary_get_bool(cfg, interlace, interlace_p);
+ cs = VPU_READ(sc, VIU_OSD2_CTRL_STAT_REG);
+ cs |= VIU_OSD_CTRL_STAT_ENABLE;
+ cs = ~VIU_OSD_CTRL_STAT_GLOBAL_ALPHA;
+ cs |= __SHIFTIN(0xff, VIU_OSD_CTRL_STAT_GLOBAL_ALPHA);
+ cs |= VIU_OSD_CTRL_STAT_BLK0_ENABLE;
+ cs = ~VIU_OSD_CTRL_STAT_BLK1_ENABLE;
+ cs = ~VIU_OSD_CTRL_STAT_BLK2_ENABLE;
+ cs = ~VIU_OSD_CTRL_STAT_BLK3_ENABLE;
+ VPU_WRITE(sc, VIU_OSD2_CTRL_STAT_REG, cs);
+
+ tc = __SHIFTIN(0, VIU_OSD_TCOLOR_R) |
+ __SHIFTIN(0, VIU_OSD_TCOLOR_G) |
+ __SHIFTIN(0, VIU_OSD_TCOLOR_B) |
+ __SHIFTIN(255, VIU_OSD_TCOLOR_A);
+ VPU_WRITE(sc, VIU_OSD2_TCOLOR_AG0_REG, tc);
+
w0 = VPU_READ(sc, VIU_OSD2_BLK0_CFG_W0_REG);
+ w0 |= VIU_OSD_BLK_CFG_W0_RGB_EN;
+ w0 = ~VIU_OSD_BLK_CFG_W0_TC_ALPHA_EN;
w0 = ~VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE;
- w0 |= __SHIFTIN(7, VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE);
+ w0 = ~VIU_OSD_BLK_CFG_W0_COLOR_MATRIX;
+ switch (depth) {
+ case 32:
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE_32BPP,
+VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE);
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_COLOR_MATRIX_ARGB,
+VIU_OSD_BLK_CFG_W0_COLOR_MATRIX);
+ break;
+ case 24:
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE_24BPP,
+VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE);
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_COLOR_MATRIX_RGB,
+VIU_OSD_BLK_CFG_W0_COLOR_MATRIX);
+ break;
+ case 16:
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE_16BPP,
+VIU_OSD_BLK_CFG_W0_OSD_BLK_MODE);
+ w0 |= __SHIFTIN(VIU_OSD_BLK_CFG_W0_COLOR_MATRIX_RGB565,
+VIU_OSD_BLK_CFG_W0_COLOR_MATRIX);
+ break;
+ }
w0 |= VIU_OSD_BLK_CFG_W0_LITTLE_ENDIAN;
w0 = ~VIU_OSD_BLK_CFG_W0_RPT_Y;
w0 = ~VIU_OSD_BLK_CFG_W0_INTERP_CTRL;
@@ -322,8 +364,6 @@ amlogic_genfb_osd_config(struct amlogic_
} else {
w0 = ~VIU_OSD_BLK_CFG_W0_INTERLACE_EN;
}
- w0 |= VIU_OSD_BLK_CFG_W0_RGB_EN;
CVS commit: [netbsd-7] src/sys/arch/evbarm/conf
Module Name:src Committed By: snj Date: Mon Apr 6 01:46:34 UTC 2015 Modified Files: src/sys/arch/evbarm/conf [netbsd-7]: ODROID-C1 Log Message: Pull up following revision(s) (requested by jmcneill in ticket #660): sys/arch/evbarm/conf/ODROID-C1: revision 1.15 comment out DDB_COMMANDONENTER To generate a diff of this commit: cvs rdiff -u -r1.12.2.3 -r1.12.2.4 src/sys/arch/evbarm/conf/ODROID-C1 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/ODROID-C1 diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.12.2.3 src/sys/arch/evbarm/conf/ODROID-C1:1.12.2.4 --- src/sys/arch/evbarm/conf/ODROID-C1:1.12.2.3 Wed Mar 25 17:13:26 2015 +++ src/sys/arch/evbarm/conf/ODROID-C1 Mon Apr 6 01:46:34 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ODROID-C1,v 1.12.2.3 2015/03/25 17:13:26 snj Exp $ +# $NetBSD: ODROID-C1,v 1.12.2.4 2015/04/06 01:46:34 snj Exp $ # # Odroid-C1 (Amlogic S805) based SBC (Single Board Computer) # @@ -143,7 +143,7 @@ options DIAGNOSTIC # internal consisten options DDB # in-kernel debugger options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB -options DDB_COMMANDONENTER=bt +#options DDB_COMMANDONENTER=bt #options KGDB makeoptions DEBUG=-g # compile full symbol table makeoptions COPY_SYMTAB=1
CVS commit: [netbsd-7] src/sys/arch/evbarm/conf
Module Name:src Committed By: snj Date: Mon Apr 6 01:46:34 UTC 2015 Modified Files: src/sys/arch/evbarm/conf [netbsd-7]: ODROID-C1 Log Message: Pull up following revision(s) (requested by jmcneill in ticket #660): sys/arch/evbarm/conf/ODROID-C1: revision 1.15 comment out DDB_COMMANDONENTER To generate a diff of this commit: cvs rdiff -u -r1.12.2.3 -r1.12.2.4 src/sys/arch/evbarm/conf/ODROID-C1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/libexec/ld.elf_so
Module Name:src Committed By: snj Date: Mon Apr 6 02:01:39 UTC 2015 Modified Files: src/libexec/ld.elf_so [netbsd-7]: rtld.c Log Message: Pull up following revision(s) (requested by joerg in ticket #665): libexec/ld.elf_so/rtld.c: revision 1.176 lib/49813: Release mutex on error. To generate a diff of this commit: cvs rdiff -u -r1.173.4.1 -r1.173.4.2 src/libexec/ld.elf_so/rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/libexec/ld.elf_so
Module Name:src
Committed By: snj
Date: Mon Apr 6 02:01:39 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-7]: rtld.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #665):
libexec/ld.elf_so/rtld.c: revision 1.176
lib/49813: Release mutex on error.
To generate a diff of this commit:
cvs rdiff -u -r1.173.4.1 -r1.173.4.2 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.173.4.1 src/libexec/ld.elf_so/rtld.c:1.173.4.2
--- src/libexec/ld.elf_so/rtld.c:1.173.4.1 Mon Mar 9 07:56:43 2015
+++ src/libexec/ld.elf_so/rtld.c Mon Apr 6 02:01:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.173.4.1 2015/03/09 07:56:43 snj Exp $ */
+/* $NetBSD: rtld.c,v 1.173.4.2 2015/04/06 02:01:39 snj Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.173.4.1 2015/03/09 07:56:43 snj Exp $);
+__RCSID($NetBSD: rtld.c,v 1.173.4.2 2015/04/06 02:01:39 snj Exp $);
#endif /* not lint */
#include sys/param.h
@@ -1258,7 +1258,7 @@ dladdr(const void *addr, Dl_info *info)
obj = _rtld_obj_from_addr(addr);
if (obj == NULL) {
_rtld_error(No shared object contains address);
- lookup_mutex_enter();
+ lookup_mutex_exit();
return 0;
}
info-dli_fname = obj-path;
CVS commit: [netbsd-7] src/sys/arch/arm/amlogic
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:45:17 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic [netbsd-7]: amlogic_com.c amlogic_comreg.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #659):
sys/arch/arm/amlogic/amlogic_com.c: revision 1.5
sys/arch/arm/amlogic/amlogic_comreg.h: revision 1.4
Fix cnmagic handling, now I can enter ddb from serial console.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/arch/arm/amlogic/amlogic_com.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/amlogic/amlogic_comreg.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/amlogic/amlogic_com.c
diff -u src/sys/arch/arm/amlogic/amlogic_com.c:1.4.2.2 src/sys/arch/arm/amlogic/amlogic_com.c:1.4.2.3
--- src/sys/arch/arm/amlogic/amlogic_com.c:1.4.2.2 Sat Mar 21 08:51:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_com.c Mon Apr 6 01:45:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_com.c,v 1.4.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_com.c,v 1.4.2.3 2015/04/06 01:45:17 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,7 +33,13 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: amlogic_com.c,v 1.4.2.2 2015/03/21 08:51:17 snj Exp $);
+__KERNEL_RCSID(1, $NetBSD: amlogic_com.c,v 1.4.2.3 2015/04/06 01:45:17 snj Exp $);
+
+#define cn_trap() \
+ do {\
+ console_debugger(); \
+ cn_trapped = 1; \
+ } while (/* CONSTCOND */ 0)
#include sys/param.h
#include sys/bus.h
@@ -430,14 +436,23 @@ amlogic_com_intr(void *priv)
uint32_t status, c;
for (;;) {
+ int cn_trapped = 0;
status = bus_space_read_4(sc-sc_bst, sc-sc_bsh,
UART_STATUS_REG);
if (status UART_STATUS_RX_EMPTY) {
break;
}
+ if (status UART_STATUS_BREAK) {
+ cn_check_magic(tp-t_dev, CNC_BREAK,
+ amlogic_com_cnm_state);
+ if (cn_trapped)
+continue;
+ }
c = bus_space_read_4(sc-sc_bst, sc-sc_bsh, UART_RFIFO_REG);
- cn_check_magic(tp-t_dev, c, amlogic_com_cnm_state);
+ cn_check_magic(tp-t_dev, c 0xff, amlogic_com_cnm_state);
+ if (cn_trapped)
+ continue;
tp-t_linesw-l_rint(c 0xff, tp);
}
Index: src/sys/arch/arm/amlogic/amlogic_comreg.h
diff -u src/sys/arch/arm/amlogic/amlogic_comreg.h:1.3.2.2 src/sys/arch/arm/amlogic/amlogic_comreg.h:1.3.2.3
--- src/sys/arch/arm/amlogic/amlogic_comreg.h:1.3.2.2 Sat Mar 21 08:51:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_comreg.h Mon Apr 6 01:45:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_comreg.h,v 1.3.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_comreg.h,v 1.3.2.3 2015/04/06 01:45:17 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -49,6 +49,7 @@
#define UART_STATUS_TX_EMPTY __BIT(22)
#define UART_STATUS_TX_FULL __BIT(21)
#define UART_STATUS_RX_EMPTY __BIT(20)
+#define UART_STATUS_BREAK __BIT(17)
#define UART_MISC_TX_IRQ_CNT __BITS(15,8)
#define UART_MISC_RX_IRQ_CNT __BITS(7,0)
CVS commit: [netbsd-7] src/sys/arch/arm/amlogic
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:43:31 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic [netbsd-7]: amlogic_board.c amlogic_crureg.h
amlogic_rng.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #658):
sys/arch/arm/amlogic/amlogic_board.c: revision 1.11
sys/arch/arm/amlogic/amlogic_crureg.h: revision 1.8
sys/arch/arm/amlogic/amlogic_rng.c: revision 1.2
Use a callback (with ugly lock dance from bcm2835_rng) instead of callout.
Make sure the ring oscillator is enabled as well.
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.2 -r1.9.2.3 src/sys/arch/arm/amlogic/amlogic_board.c
cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/sys/arch/arm/amlogic/amlogic_crureg.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/amlogic/amlogic_rng.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/amlogic/amlogic_board.c
diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.9.2.2 src/sys/arch/arm/amlogic/amlogic_board.c:1.9.2.3
--- src/sys/arch/arm/amlogic/amlogic_board.c:1.9.2.2 Sat Mar 21 08:51:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_board.c Mon Apr 6 01:43:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.9.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.9.2.3 2015/04/06 01:43:31 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_amlogic.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.9.2.2 2015/03/21 08:51:17 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.9.2.3 2015/04/06 01:43:31 snj Exp $);
#define _ARM32_BUS_DMA_PRIVATE
#include sys/param.h
@@ -191,10 +191,10 @@ amlogic_eth_init(void)
void
amlogic_rng_init(void)
{
- CBUS_WRITE(EE_CLK_GATING0_REG,
- CBUS_READ(EE_CLK_GATING0_REG) | EE_CLK_GATING0_RNG);
- CBUS_WRITE(EE_CLK_GATING3_REG,
- CBUS_READ(EE_CLK_GATING3_REG) | EE_CLK_GATING3_RNG);
+ CBUS_SET_CLEAR(EE_CLK_GATING0_REG, EE_CLK_GATING0_RNG, 0);
+ CBUS_SET_CLEAR(EE_CLK_GATING3_REG, EE_CLK_GATING3_RNG, 0);
+ CBUS_SET_CLEAR(AM_RING_OSC_REG,
+ AM_RING_OSC_ENABLE | AM_RING_OSC_HF_MODE, 0);
}
void
Index: src/sys/arch/arm/amlogic/amlogic_crureg.h
diff -u src/sys/arch/arm/amlogic/amlogic_crureg.h:1.7.2.2 src/sys/arch/arm/amlogic/amlogic_crureg.h:1.7.2.3
--- src/sys/arch/arm/amlogic/amlogic_crureg.h:1.7.2.2 Sat Mar 21 08:51:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_crureg.h Mon Apr 6 01:43:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_crureg.h,v 1.7.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_crureg.h,v 1.7.2.3 2015/04/06 01:43:31 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -107,6 +107,11 @@
#define PAD_PULL_UP_EN_5_REG CBUS_REG(0x204d)
#define PAD_PULL_UP_EN_6_REG CBUS_REG(0x204e)
+#define AM_RING_OSC_REG CBUS_REG(0x207f)
+
+#define AM_RING_OSC_ENABLE __BIT(0)
+#define AM_RING_OSC_HF_MODE __BIT(1)
+
#define PREI_USB_PHY_A_CFG_REG CBUS_REG(0x2200)
#define PREI_USB_PHY_A_CTRL_REG CBUS_REG(0x2201)
#define PREI_USB_PHY_A_ADP_BC_REG CBUS_REG(0x2203)
Index: src/sys/arch/arm/amlogic/amlogic_rng.c
diff -u src/sys/arch/arm/amlogic/amlogic_rng.c:1.1.2.2 src/sys/arch/arm/amlogic/amlogic_rng.c:1.1.2.3
--- src/sys/arch/arm/amlogic/amlogic_rng.c:1.1.2.2 Sat Mar 21 08:51:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_rng.c Mon Apr 6 01:43:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_rng.c,v 1.1.2.2 2015/03/21 08:51:17 snj Exp $ */
+/* $NetBSD: amlogic_rng.c,v 1.1.2.3 2015/04/06 01:43:31 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_rng.c,v 1.1.2.2 2015/03/21 08:51:17 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_rng.c,v 1.1.2.3 2015/04/06 01:43:31 snj Exp $);
#include sys/param.h
#include sys/bus.h
@@ -43,10 +43,14 @@ __KERNEL_RCSID(0, $NetBSD: amlogic_rng.
#include arm/amlogic/amlogic_reg.h
#include arm/amlogic/amlogic_var.h
+struct amlogic_rng_softc;
+
static int amlogic_rng_match(device_t, cfdata_t, void *);
static void amlogic_rng_attach(device_t, device_t, void *);
-static void amlogic_rng_callout(void *);
+static void amlogic_rng_get(struct amlogic_rng_softc *);
+static void amlogic_rng_get_intr(void *);
+static void amlogic_rng_get_cb(size_t, void *);
struct amlogic_rng_softc {
device_t sc_dev;
@@ -55,9 +59,11 @@ struct amlogic_rng_softc {
void * sc_sih;
- callout_t sc_tick;
krndsource_t sc_rndsource;
size_t sc_bytes_wanted;
+
+ kmutex_t sc_intr_lock;
+ kmutex_t sc_rnd_lock;
};
CFATTACH_DECL_NEW(amlogic_rng, sizeof(struct amlogic_rng_softc),
@@ -81,31 +87,69 @@ amlogic_rng_attach(device_t parent, devi
bus_space_subregion(aio-aio_core_bst, aio-aio_bsh,
loc-loc_offset, loc-loc_size, sc-sc_bsh);
-
CVS commit: [netbsd-7] src/sys/arch/arm/amlogic
Module Name:src Committed By: snj Date: Mon Apr 6 01:45:17 UTC 2015 Modified Files: src/sys/arch/arm/amlogic [netbsd-7]: amlogic_com.c amlogic_comreg.h Log Message: Pull up following revision(s) (requested by jmcneill in ticket #659): sys/arch/arm/amlogic/amlogic_com.c: revision 1.5 sys/arch/arm/amlogic/amlogic_comreg.h: revision 1.4 Fix cnmagic handling, now I can enter ddb from serial console. To generate a diff of this commit: cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/arch/arm/amlogic/amlogic_com.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/amlogic/amlogic_comreg.h 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/include/linux
Module Name:src Committed By: riastradh Date: Mon Apr 6 01:11:19 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Don't let anyone else allocate the video BIOS either. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/include/linux/pci.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/external/bsd/drm2/include/linux/pci.h diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.15 src/sys/external/bsd/drm2/include/linux/pci.h:1.16 --- src/sys/external/bsd/drm2/include/linux/pci.h:1.15 Fri Mar 6 01:43:07 2015 +++ src/sys/external/bsd/drm2/include/linux/pci.h Mon Apr 6 01:11:19 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.h,v 1.15 2015/03/06 01:43:07 riastradh Exp $ */ +/* $NetBSD: pci.h,v 1.16 2015/04/06 01:11:19 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -331,7 +331,7 @@ pci_clear_master(struct pci_dev *pdev) PCI_COMMAND_STATUS_REG, csr); } -#define PCIBIOS_MIN_MEM 0 /* XXX bogus x86 kludge bollocks */ +#define PCIBIOS_MIN_MEM 0x1 /* XXX bogus x86 kludge bollocks */ static inline bus_addr_t pcibios_align_resource(void *p, const struct resource *resource,
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Mon Apr 6 01:11:19 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Don't let anyone else allocate the video BIOS either. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/include/linux/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: snj Date: Mon Apr 6 01:48:25 UTC 2015 Modified Files: src/sys/arch/arm/amlogic [netbsd-7]: amlogic_genfb.c amlogic_vpureg.h src/sys/arch/evbarm/amlogic [netbsd-7]: amlogic_machdep.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #661): sys/arch/arm/amlogic/amlogic_genfb.c: revision 1.5 sys/arch/arm/amlogic/amlogic_vpureg.h: revision 1.3 sys/arch/evbarm/amlogic/amlogic_machdep.c: revision 1.20 Allow for choosing between 16 and 24bpp framebuffers. The default is now 16 instead of 24. Set 'fb.depth=16' or 'fb.depth=24' on kernel command-line to explicitly select a colour depth. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/arm/amlogic/amlogic_genfb.c \ src/sys/arch/arm/amlogic/amlogic_vpureg.h cvs rdiff -u -r1.17.2.3 -r1.17.2.4 \ src/sys/arch/evbarm/amlogic/amlogic_machdep.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/arch/sh3/gen
Module Name:src Committed By: uwe Date: Mon Apr 6 01:50:47 UTC 2015 Modified Files: src/lib/libc/arch/sh3/gen: swapcontext.S Log Message: On swapcontext(3) preserve r12 too. Properly fixes PR port-sh3/49597. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sh3/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/sh3/gen/swapcontext.S diff -u src/lib/libc/arch/sh3/gen/swapcontext.S:1.11 src/lib/libc/arch/sh3/gen/swapcontext.S:1.12 --- src/lib/libc/arch/sh3/gen/swapcontext.S:1.11 Sun Jan 25 01:32:26 2015 +++ src/lib/libc/arch/sh3/gen/swapcontext.S Mon Apr 6 01:50:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: swapcontext.S,v 1.11 2015/01/25 01:32:26 uwe Exp $ */ +/* $NetBSD: swapcontext.S,v 1.12 2015/04/06 01:50:46 uwe Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include machine/asm.h #if defined(SYSLIBC_SCCS) !defined(lint) - RCSID($NetBSD: swapcontext.S,v 1.11 2015/01/25 01:32:26 uwe Exp $) + RCSID($NetBSD: swapcontext.S,v 1.12 2015/04/06 01:50:46 uwe Exp $) #endif /* SYSLIBC_SCCS and not lint */ /* @@ -40,44 +40,33 @@ */ ENTRY(swapcontext) PIC_PROLOGUE(.L_got) - mov.l r5, @-sp sts.l pr, @-sp mov.l .L__getcontext, r0 -1: CALL r0 /* _getcontext(oucp) */ + mov.l r5, @-sp +1: CALL r0 ! _getcontext(oucp) mov.l r4, @-sp - mov.l @sp+, r1 + !! getcontext captures oucp resuming here with r12 (when PIC), + !! pr, r5 and r4 pushed onto the stack + tst r0, r0 - bf 3f /* return error from getcontext */ + bf.s 3f ! return error from getcontext + mov.l @sp, r1 ! saved oucp - /* Note: getcontext does _UC_MACHINE_INTRV(oucp) = 0 for us */ - mov.l @sp, r0 - mov.l r0, @(36 + 1 * 4, r1) /* _UC_MACHINE_SET_PC(oucp, pr) */ - - /* Adjust stack pointer in oucp */ - mov sp, r2 - mov #(36 + 21 * 4), r0 /* offset to _UC_MACHINE_SP */ -#ifdef __PIC__ - add #12, r2 /* drop r12, r5, pr */ -#else - add #8, r2 /* drop r5, pr */ -#endif - mov.l r2, @(r0, r1) /* set _UC_MACHINE_SP(oucp) */ + !! adjust oucp to resume after setcontext below + mova 3f, r0 + mov.l r0, @(36 + 1 * 4, r1) ! _UC_MACHINE_SET_PC(oucp, pr) mov.l .L_setcontext, r2 -2: CALL r2 /* setcontext(ucp) */ - mov.l @(4, sp), r4 - /* if we get here, return error from setcontext */ -3: +2: CALL r2 ! setcontext(ucp) + mov.l @(4, sp), r4 ! saved ucp + + .align 2 +3: !! we get here on errors and when resuming oucp + add #8, sp ! skip r4 and r5 lds.l @sp+, pr -#ifdef __PIC__ - add #4, sp - rts - PIC_EPILOGUE -#else rts - add #4, sp -#endif + PIC_EPILOGUE_SLOT .align 2 .L_got: PIC_GOT_DATUM
CVS commit: src/lib/libc/arch/sh3/gen
Module Name:src Committed By: uwe Date: Mon Apr 6 01:50:47 UTC 2015 Modified Files: src/lib/libc/arch/sh3/gen: swapcontext.S Log Message: On swapcontext(3) preserve r12 too. Properly fixes PR port-sh3/49597. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sh3/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/utils/embedded
Module Name:src Committed By: snj Date: Mon Apr 6 01:59:37 UTC 2015 Modified Files: src/distrib/utils/embedded [netbsd-7]: mkimage Log Message: Pull up following revision(s) (requested by jmcneill in ticket #664): distrib/utils/embedded/mkimage: revision 1.53 Use FFSv2 instead of FFSv1 for the root file-system. This should fix the resize_ffs takes forever issues with evbarm images -- growing a v2 file-system is much faster than v1. To generate a diff of this commit: cvs rdiff -u -r1.48.4.3 -r1.48.4.4 src/distrib/utils/embedded/mkimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/utils/embedded
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:59:37 UTC 2015
Modified Files:
src/distrib/utils/embedded [netbsd-7]: mkimage
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #664):
distrib/utils/embedded/mkimage: revision 1.53
Use FFSv2 instead of FFSv1 for the root file-system. This should fix the
resize_ffs takes forever issues with evbarm images -- growing a v2
file-system is much faster than v1.
To generate a diff of this commit:
cvs rdiff -u -r1.48.4.3 -r1.48.4.4 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.48.4.3 src/distrib/utils/embedded/mkimage:1.48.4.4
--- src/distrib/utils/embedded/mkimage:1.48.4.3 Thu Jan 29 15:12:48 2015
+++ src/distrib/utils/embedded/mkimage Mon Apr 6 01:59:36 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.48.4.3 2015/01/29 15:12:48 martin Exp $
+# $NetBSD: mkimage,v 1.48.4.4 2015/04/06 01:59:36 snj Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -178,7 +178,7 @@ if [ -z ${bootonly} ]; then
echo ${bar} Populating ffs filesystem ${bar}
${MAKEFS} -r -N ${release}/etc -t ffs -rx \
-O ${ffsoffset} \
- -o d=4096 -b $((${extra}))m \
+ -o v=2,d=4096 -b $((${extra}))m \
-F $tmp/selected_sets ${image} ${release} ${mnt}
fi
CVS commit: [netbsd-7] src/sys/arch/arm/arm32
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:57:57 UTC 2015
Modified Files:
src/sys/arch/arm/arm32 [netbsd-7]: cpu.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #663):
sys/arch/arm/arm32/cpu.c: revision 1.105
Increase the `freqbuf' buffer that holds the result of humanize_number(). Now
it prints 1600 Mhz instead of 1 Ghz.
Pitty enough humanize_number(9) doesn't do 1.6 Ghz type output.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.4.1 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.104 src/sys/arch/arm/arm32/cpu.c:1.104.4.1
--- src/sys/arch/arm/arm32/cpu.c:1.104 Fri Mar 28 21:39:09 2014
+++ src/sys/arch/arm/arm32/cpu.c Mon Apr 6 01:57:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.104 2014/03/28 21:39:09 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.104.4.1 2015/04/06 01:57:57 snj Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.104 2014/03/28 21:39:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.104.4.1 2015/04/06 01:57:57 snj Exp $);
#include sys/systm.h
#include sys/conf.h
@@ -651,7 +651,7 @@ identify_arm_cpu(device_t dv, struct cpu
}
if (ci-ci_data.cpu_cc_freq != 0) {
- char freqbuf[8];
+ char freqbuf[10];
humanize_number(freqbuf, sizeof(freqbuf), ci-ci_data.cpu_cc_freq,
Hz, 1000);
CVS commit: [netbsd-7] src/sys/arch/arm/arm32
Module Name:src Committed By: snj Date: Mon Apr 6 01:57:57 UTC 2015 Modified Files: src/sys/arch/arm/arm32 [netbsd-7]: cpu.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #663): sys/arch/arm/arm32/cpu.c: revision 1.105 Increase the `freqbuf' buffer that holds the result of humanize_number(). Now it prints 1600 Mhz instead of 1 Ghz. Pitty enough humanize_number(9) doesn't do 1.6 Ghz type output. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.104.4.1 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.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: rtr
Date: Sun Apr 5 23:17:41 UTC 2015
Modified Files:
src/tests/lib/libc/sys: t_connect.c
Log Message:
add another test program for connect(2) that checks that connect fails
with EAFNOSUPPORT (similar to the bind test) if the domain of the socket
does not match the address family of the supplied address.
test currently fails as it should
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_connect.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/sys/t_connect.c
diff -u src/tests/lib/libc/sys/t_connect.c:1.1 src/tests/lib/libc/sys/t_connect.c:1.2
--- src/tests/lib/libc/sys/t_connect.c:1.1 Sat Nov 5 18:19:02 2011
+++ src/tests/lib/libc/sys/t_connect.c Sun Apr 5 23:17:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_connect.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $ */
+/* $NetBSD: t_connect.c,v 1.2 2015/04/05 23:17:41 rtr Exp $ */
/*
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -90,10 +90,39 @@ ATF_TC_BODY(connect_low_port, tc)
close(sd);
}
+ATF_TC(connect_foreign_family);
+ATF_TC_HEAD(connect_foreign_family, tc)
+{
+ atf_tc_set_md_var(tc, descr, Checks that connecting a socket
+ with a different address family fails);
+}
+ATF_TC_BODY(connect_foreign_family, tc)
+{
+ struct sockaddr_in addr;
+
+ /* addr.sin_family = AF_UNSPEC = 0 */
+ memset(addr, 0, sizeof(addr));
+
+ /*
+ * it is not necessary to initialize sin_{addr,port} since
+ * those structure members shall not be accessed if connect
+ * fails correctly.
+ */
+
+ int sock = socket(AF_LOCAL, SOCK_STREAM, 0);
+ ATF_REQUIRE(sock != -1);
+
+ ATF_REQUIRE(-1 == connect(sock, (struct sockaddr *)addr, sizeof(addr)));
+ ATF_REQUIRE(EAFNOSUPPORT == errno);
+
+ close(sock);
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, connect_low_port);
+ ATF_TP_ADD_TC(tp, connect_foreign_family);
return atf_no_error();
}
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: rtr Date: Sun Apr 5 23:17:41 UTC 2015 Modified Files: src/tests/lib/libc/sys: t_connect.c Log Message: add another test program for connect(2) that checks that connect fails with EAFNOSUPPORT (similar to the bind test) if the domain of the socket does not match the address family of the supplied address. test currently fails as it should To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_connect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: rtr
Date: Sun Apr 5 23:19:56 UTC 2015
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
change return from EINVAL to EAFNOSUPPORT when the domain of the socket
does not match the family of the address to be bound.
fixes atf test lib/libc/sys/t_bind bind_foreign_family
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/kern/uipc_socket.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/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.237 src/sys/kern/uipc_socket.c:1.238
--- src/sys/kern/uipc_socket.c:1.237 Sun Apr 5 02:26:39 2015
+++ src/sys/kern/uipc_socket.c Sun Apr 5 23:19:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.237 2015/04/05 02:26:39 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.238 2015/04/05 23:19:56 rtr Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.237 2015/04/05 02:26:39 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.238 2015/04/05 23:19:56 rtr Exp $);
#include opt_compat_netbsd.h
#include opt_sock_counters.h
@@ -631,7 +631,7 @@ sobind(struct socket *so, struct sockadd
solock(so);
if (nam-sa_family != so-so_proto-pr_domain-dom_family) {
sounlock(so);
- return EINVAL;
+ return EAFNOSUPPORT;
}
error = (*so-so_proto-pr_usrreqs-pr_bind)(so, nam, l);
sounlock(so);
CVS commit: src/sys/kern
Module Name:src Committed By: rtr Date: Sun Apr 5 23:19:56 UTC 2015 Modified Files: src/sys/kern: uipc_socket.c Log Message: change return from EINVAL to EAFNOSUPPORT when the domain of the socket does not match the family of the address to be bound. fixes atf test lib/libc/sys/t_bind bind_foreign_family To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/arm/cortex
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:55:53 UTC 2015
Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: gtmr.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #662):
sys/arch/arm/cortex/gtmr.c: revision 1.10-1.14
port-arm/49737: armgtmr0 timer broken
Use physical timer instead of virtual timer for timecounter. For platforms
that implement virtualization extensions, the CNTVOFF register defines a
virtual offset between the physical count and virtual count. Unfortunately,
the CNTVOFF register is only accessible in secure mode and the value is
per-CPU, so we may end up in a scenario where virtual count reads from
CPU A - B - A are not monotonic. No offset applied to physical timer,
so physical count reads are guaranteed to be monotonic.
--
Sprinkle some arm_isb() to force execution of the mcrr instructions to get
more accurate values. (Given that the generic timer is usually running at
a 64th or less of the cpu clock, this only settle to a tick or so.)
--
Move isb's to before reading count. Change interrupt to level.
--
Trailing whitespace.
--
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/arch/arm/cortex/gtmr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.8.2.1 src/sys/arch/arm/cortex/gtmr.c:1.8.2.2
--- src/sys/arch/arm/cortex/gtmr.c:1.8.2.1 Wed Mar 11 20:22:55 2015
+++ src/sys/arch/arm/cortex/gtmr.c Mon Apr 6 01:55:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.8.2.1 2015/03/11 20:22:55 snj Exp $ */
+/* $NetBSD: gtmr.c,v 1.8.2.2 2015/04/06 01:55:53 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.8.2.1 2015/03/11 20:22:55 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.8.2.2 2015/04/06 01:55:53 snj Exp $);
#include sys/param.h
#include sys/bus.h
@@ -44,6 +44,8 @@ __KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.8
#include prop/proplib.h
+#include arm/locore.h
+
#include arm/cortex/gtmr_var.h
#include arm/cortex/mpcore_var.h
@@ -94,14 +96,14 @@ static void
gtmr_attach(device_t parent, device_t self, void *aux)
{
struct mpcore_attach_args * const mpcaa = aux;
-struct gtmr_softc *sc = gtmr_sc;
+ struct gtmr_softc *sc = gtmr_sc;
prop_dictionary_t dict = device_properties(self);
char freqbuf[sizeof(X.XXX SHz)];
/*
* This runs at a fixed frequency of 1 to 50MHz.
*/
- prop_dictionary_get_uint32(dict, frequency, sc-sc_freq);
+ prop_dictionary_get_uint32(dict, frequency, sc-sc_freq);
KASSERT(sc-sc_freq != 0);
humanize_number(freqbuf, sizeof(freqbuf), sc-sc_freq, Hz, 1000);
@@ -112,7 +114,8 @@ gtmr_attach(device_t parent, device_t se
/*
* Enable the virtual counter to be accessed from usermode.
*/
- armreg_cntk_ctl_write(armreg_cntk_ctl_read() | ARM_CNTKCTL_PL0VCTEN);
+ armreg_cntk_ctl_write(armreg_cntk_ctl_read() |
+ ARM_CNTKCTL_PL0VCTEN | ARM_CNTKCTL_PL0PCTEN);
self-dv_private = sc;
sc-sc_dev = self;
@@ -125,7 +128,7 @@ gtmr_attach(device_t parent, device_t se
device_xname(self), missing interrupts);
sc-sc_global_ih = intr_establish(mpcaa-mpcaa_irq, IPL_CLOCK,
- IST_EDGE | IST_MPSAFE, gtmr_intr, NULL);
+ IST_LEVEL | IST_MPSAFE, gtmr_intr, NULL);
if (sc-sc_global_ih == NULL)
panic(%s: unable to register timer interrupt, __func__);
aprint_normal_dev(self, interrupting on irq %d\n,
@@ -159,6 +162,7 @@ gtmr_init_cpu_clock(struct cpu_info *ci)
* enable timer and stop masking the timer.
*/
armreg_cntv_ctl_write(ARM_CNTCTL_ENABLE);
+ armreg_cntp_ctl_write(ARM_CNTCTL_ENABLE);
#if 0
printf(%s: cntctl=%#x\n, __func__, armreg_cntv_ctl_read());
#endif
@@ -166,6 +170,7 @@ gtmr_init_cpu_clock(struct cpu_info *ci)
/*
* Get now and update the compare timer.
*/
+ arm_isb();
ci-ci_lastintr = armreg_cntv_ct_read();
armreg_cntv_tval_write(sc-sc_autoinc);
#if 0
@@ -182,21 +187,24 @@ gtmr_init_cpu_clock(struct cpu_info *ci)
s = splsched();
+ arm_isb();
uint64_t now64;
uint64_t start64 = armreg_cntv_ct_read();
do {
+ arm_isb();
now64 = armreg_cntv_ct_read();
} while (start64 == now64);
start64 = now64;
uint64_t end64 = start64 + 64;
uint32_t start32 = armreg_pmccntr_read();
do {
+ arm_isb();
now64 = armreg_cntv_ct_read();
} while (end64 != now64);
uint32_t end32 = armreg_pmccntr_read();
uint32_t diff32 = end64 - start64;
- printf(%s: %s: %u cycles per tick\n,
+ printf(%s: %s: %u cycles per tick\n,
__func__, ci-ci_data.cpu_name, (end32 - start32) / diff32);
printf(%s: %s: status %#x cmp %#PRIx64 now %#PRIx64\n,
@@ -204,7 +212,7 @@ gtmr_init_cpu_clock(struct cpu_info *ci)
armreg_cntv_cval_read(), armreg_cntv_ct_read());
splx(s);
#elif 0
- delay(100 / hz + 1000);
+
CVS commit: [netbsd-7] src/sys/arch/arm/cortex
Module Name:src Committed By: snj Date: Mon Apr 6 01:55:53 UTC 2015 Modified Files: src/sys/arch/arm/cortex [netbsd-7]: gtmr.c Log Message: Pull up following revision(s) (requested by skrll in ticket #662): sys/arch/arm/cortex/gtmr.c: revision 1.10-1.14 port-arm/49737: armgtmr0 timer broken Use physical timer instead of virtual timer for timecounter. For platforms that implement virtualization extensions, the CNTVOFF register defines a virtual offset between the physical count and virtual count. Unfortunately, the CNTVOFF register is only accessible in secure mode and the value is per-CPU, so we may end up in a scenario where virtual count reads from CPU A - B - A are not monotonic. No offset applied to physical timer, so physical count reads are guaranteed to be monotonic. -- Sprinkle some arm_isb() to force execution of the mcrr instructions to get more accurate values. (Given that the generic timer is usually running at a 64th or less of the cpu clock, this only settle to a tick or so.) -- Move isb's to before reading count. Change interrupt to level. -- Trailing whitespace. -- Whitespace To generate a diff of this commit: cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/arch/arm/cortex/gtmr.c 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/dist
Module Name:src
Committed By: christos
Date: Sun Apr 5 22:36:36 UTC 2015
Modified Files:
src/external/bsd/libpcap/dist: scanner.l
Log Message:
don't forget to include config.h otherwise it thinks we don't have vnsnprintf
and fortify compiles fail.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/scanner.l
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/dist/scanner.l
diff -u src/external/bsd/libpcap/dist/scanner.l:1.7 src/external/bsd/libpcap/dist/scanner.l:1.8
--- src/external/bsd/libpcap/dist/scanner.l:1.7 Tue Mar 31 17:39:42 2015
+++ src/external/bsd/libpcap/dist/scanner.l Sun Apr 5 18:36:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scanner.l,v 1.7 2015/03/31 21:39:42 christos Exp $ */
+/* $NetBSD: scanner.l,v 1.8 2015/04/05 22:36:36 christos Exp $ */
%{
/*
@@ -22,8 +22,9 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: scanner.l,v 1.7 2015/03/31 21:39:42 christos Exp $);
+__RCSID($NetBSD: scanner.l,v 1.8 2015/04/05 22:36:36 christos Exp $);
+#include config.h
#ifdef WIN32
#include pcap-stdinc.h
#else /* WIN32 */
CVS commit: src/external/bsd/libpcap/dist
Module Name:src Committed By: christos Date: Sun Apr 5 22:36:36 UTC 2015 Modified Files: src/external/bsd/libpcap/dist: scanner.l Log Message: don't forget to include config.h otherwise it thinks we don't have vnsnprintf and fortify compiles fail. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libpcap/dist/scanner.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/netinet6
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:32:33 UTC 2015
Modified Files:
src/sys/netinet6 [netbsd-7]: in6.c in6_ifattach.c nd6.c nd6.h nd6_nbr.c
nd6_rtr.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #655):
sys/netinet6/in6.c: revision 1.182 via patch
sys/netinet6/in6_ifattach.c: revision 1.95 via patch
sys/netinet6/nd6.c: revision 1.158 via patch
sys/netinet6/nd6.h: revision 1.62 via patch
sys/netinet6/nd6_nbr.c: revision 1.104 via patch
sys/netinet6/nd6_rtr.c: revision 1.96 via patch
Rearange interface detachement slightly: before we free the INET6 specific
per-interface data, make sure to call nd6_purge() with it to remove
routing entries pointing to the going interface.
When we should happen to call this function again later, with the data
already gone, just return.
Fixes PR kern/49682, ok: christos.
To generate a diff of this commit:
cvs rdiff -u -r1.174.2.1 -r1.174.2.2 src/sys/netinet6/in6.c
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.152.2.2 -r1.152.2.3 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.59.2.1 -r1.59.2.2 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.100.2.1 -r1.100.2.2 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.93.2.1 -r1.93.2.2 src/sys/netinet6/nd6_rtr.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/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.174.2.1 src/sys/netinet6/in6.c:1.174.2.2
--- src/sys/netinet6/in6.c:1.174.2.1 Mon Oct 27 13:42:37 2014
+++ src/sys/netinet6/in6.c Mon Apr 6 01:32:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.174.2.1 2014/10/27 13:42:37 martin Exp $ */
+/* $NetBSD: in6.c,v 1.174.2.2 2015/04/06 01:32:33 snj Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.174.2.1 2014/10/27 13:42:37 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.174.2.2 2015/04/06 01:32:33 snj Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -2358,7 +2358,7 @@ in6_domifdetach(struct ifnet *ifp, void
{
struct in6_ifextra *ext = (struct in6_ifextra *)aux;
- nd6_ifdetach(ext-nd_ifinfo);
+ nd6_ifdetach(ifp, ext);
free(ext-in6_ifstat, M_IFADDR);
free(ext-icmp6_ifstat, M_IFADDR);
scope6_ifdetach(ext-scope6_id);
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.91.2.1 src/sys/netinet6/in6_ifattach.c:1.91.2.2
--- src/sys/netinet6/in6_ifattach.c:1.91.2.1 Sat Jan 17 12:10:54 2015
+++ src/sys/netinet6/in6_ifattach.c Mon Apr 6 01:32:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.91.2.1 2015/01/17 12:10:54 martin Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.91.2.2 2015/04/06 01:32:33 snj Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6_ifattach.c,v 1.91.2.1 2015/01/17 12:10:54 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6_ifattach.c,v 1.91.2.2 2015/04/06 01:32:33 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -848,7 +848,7 @@ in6_ifdetach(struct ifnet *ifp)
ip6_mrouter_detach(ifp);
/* remove neighbor management table */
- nd6_purge(ifp);
+ nd6_purge(ifp, NULL);
/* XXX this code is duplicated in in6_purgeif() --dyoung */
/* nuke any of IPv6 addresses we have */
@@ -919,7 +919,7 @@ in6_ifdetach(struct ifnet *ifp)
* prefixes after removing all addresses above.
* (Or can we just delay calling nd6_purge until at this point?)
*/
- nd6_purge(ifp);
+ nd6_purge(ifp, NULL);
}
int
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.152.2.2 src/sys/netinet6/nd6.c:1.152.2.3
--- src/sys/netinet6/nd6.c:1.152.2.2 Wed Dec 17 18:43:47 2014
+++ src/sys/netinet6/nd6.c Mon Apr 6 01:32:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.152.2.2 2014/12/17 18:43:47 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.152.2.3 2015/04/06 01:32:33 snj Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.152.2.2 2014/12/17 18:43:47 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.152.2.3 2015/04/06 01:32:33 snj Exp $);
#include bridge.h
#include carp.h
@@ -205,10 +205,11 @@ nd6_ifattach(struct ifnet *ifp)
}
void
-nd6_ifdetach(struct nd_ifinfo *nd)
+nd6_ifdetach(struct ifnet *ifp, struct in6_ifextra *ext)
{
- free(nd, M_IP6NDP);
+ nd6_purge(ifp, ext);
+ free(ext-nd_ifinfo, M_IP6NDP);
}
void
@@ -556,7 +557,7 @@ nd6_timer(void *ignored_arg)
TAILQ_FOREACH_SAFE(dr, nd_defrouter, dr_entry, next_dr) {
if (dr-expire dr-expire time_second) {
- defrtrlist_del(dr);
+ defrtrlist_del(dr, NULL);
}
}
@@ -746,13 +747,23 @@ nd6_accepts_rtadv(const struct nd_ifinfo
* ifp goes away.
*/
void
-nd6_purge(struct ifnet *ifp)
CVS commit: [netbsd-7] src/sys/netinet6
Module Name:src Committed By: snj Date: Mon Apr 6 01:32:33 UTC 2015 Modified Files: src/sys/netinet6 [netbsd-7]: in6.c in6_ifattach.c nd6.c nd6.h nd6_nbr.c nd6_rtr.c Log Message: Pull up following revision(s) (requested by martin in ticket #655): sys/netinet6/in6.c: revision 1.182 via patch sys/netinet6/in6_ifattach.c: revision 1.95 via patch sys/netinet6/nd6.c: revision 1.158 via patch sys/netinet6/nd6.h: revision 1.62 via patch sys/netinet6/nd6_nbr.c: revision 1.104 via patch sys/netinet6/nd6_rtr.c: revision 1.96 via patch Rearange interface detachement slightly: before we free the INET6 specific per-interface data, make sure to call nd6_purge() with it to remove routing entries pointing to the going interface. When we should happen to call this function again later, with the data already gone, just return. Fixes PR kern/49682, ok: christos. To generate a diff of this commit: cvs rdiff -u -r1.174.2.1 -r1.174.2.2 src/sys/netinet6/in6.c cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/netinet6/in6_ifattach.c cvs rdiff -u -r1.152.2.2 -r1.152.2.3 src/sys/netinet6/nd6.c cvs rdiff -u -r1.59.2.1 -r1.59.2.2 src/sys/netinet6/nd6.h cvs rdiff -u -r1.100.2.1 -r1.100.2.2 src/sys/netinet6/nd6_nbr.c cvs rdiff -u -r1.93.2.1 -r1.93.2.2 src/sys/netinet6/nd6_rtr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libc/sys
somehow i knew this was coming :) On 4/5/2015 4:41 PM, Thomas Klausner wrote: Module Name:src Committed By: wiz Date: Sun Apr 5 20:41:06 UTC 2015 Modified Files: src/lib/libc/sys: bind.2 Log Message: Sort errors. Bump date for previous. thanks i'll try to catch those things next time. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/sys/bind.2 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/sys
Module Name:src Committed By: rtr Date: Sun Apr 5 23:15:54 UTC 2015 Modified Files: src/tests/lib/libc/sys: t_bind.c Log Message: - ATF_REQUIRE(EINVAL == errno); + ATF_REQUIRE(EAFNOSUPPORT == errno); as per http://pubs.opengroup.org/onlinepubs/009695399/functions/bind.html while here remove some unnecessary initialization of port and addr members and replace with a comment explaining why. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_bind.c 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/sys
Module Name:src
Committed By: rtr
Date: Sun Apr 5 23:15:54 UTC 2015
Modified Files:
src/tests/lib/libc/sys: t_bind.c
Log Message:
- ATF_REQUIRE(EINVAL == errno);
+ ATF_REQUIRE(EAFNOSUPPORT == errno);
as per http://pubs.opengroup.org/onlinepubs/009695399/functions/bind.html
while here remove some unnecessary initialization of port and addr members
and replace with a comment explaining why.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_bind.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/sys/t_bind.c
diff -u src/tests/lib/libc/sys/t_bind.c:1.1 src/tests/lib/libc/sys/t_bind.c:1.2
--- src/tests/lib/libc/sys/t_bind.c:1.1 Sun Apr 5 06:36:52 2015
+++ src/tests/lib/libc/sys/t_bind.c Sun Apr 5 23:15:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bind.c,v 1.1 2015/04/05 06:36:52 martin Exp $ */
+/* $NetBSD: t_bind.c,v 1.2 2015/04/05 23:15:54 rtr Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -50,17 +50,21 @@ ATF_TC_BODY(bind_foreign_family, tc)
{
struct sockaddr_in addr;
+ /* addr.sin_family = AF_UNSPEC = 0 */
memset(addr, 0, sizeof(addr));
- /* use a sin_family != the socket type */
- addr.sin_port = htons(8000);
- addr.sin_addr.s_addr = INADDR_ANY;
+
+ /*
+ * it is not necessary to initialize sin_{addr,port} since
+ * those structure members shall not be accessed if bind
+ * fails correctly.
+ */
int sock = socket(AF_LOCAL, SOCK_STREAM, 0);
ATF_REQUIRE(sock != -1);
/* should fail but currently doesn't */
ATF_REQUIRE(-1 == bind(sock, (struct sockaddr *)addr, sizeof(addr)));
- ATF_REQUIRE(EINVAL == errno);
+ ATF_REQUIRE(EAFNOSUPPORT == errno);
close(sock);
}
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:37:29 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: subr_tftproot.c
src/sys/nfs [netbsd-7]: krpc_subr.c nfs_boot.c nfs_bootdhcp.c
nfsdiskless.h
Log Message:
Pull up following revision(s) (requested by hikaru in ticket #656):
sys/kern/subr_tftproot.c: revision 1.14
sys/nfs/krpc_subr.c: revision 1.39
sys/nfs/nfs_boot.c: revision 1.82
sys/nfs/nfs_bootdhcp.c: revision 1.53
sys/nfs/nfsdiskless.h: revision 1.31
m_pullup() is called in rcvproc callback functions,
so nfs_boot_sendrecv() should keep track of the head of mbuf chain.
fixes kern/48746
To generate a diff of this commit:
cvs rdiff -u -r1.12.12.1 -r1.12.12.2 src/sys/kern/subr_tftproot.c
cvs rdiff -u -r1.37 -r1.37.38.1 src/sys/nfs/krpc_subr.c
cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/nfs/nfs_boot.c
cvs rdiff -u -r1.52 -r1.52.34.1 src/sys/nfs/nfs_bootdhcp.c
cvs rdiff -u -r1.30 -r1.30.34.1 src/sys/nfs/nfsdiskless.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/subr_tftproot.c
diff -u src/sys/kern/subr_tftproot.c:1.12.12.1 src/sys/kern/subr_tftproot.c:1.12.12.2
--- src/sys/kern/subr_tftproot.c:1.12.12.1 Sat Aug 30 14:09:53 2014
+++ src/sys/kern/subr_tftproot.c Mon Apr 6 01:37:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.12.12.1 2014/08/30 14:09:53 martin Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $ */
/*-
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
#include opt_md.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_tftproot.c,v 1.12.12.1 2014/08/30 14:09:53 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $);
#include sys/param.h
#include sys/types.h
@@ -118,7 +118,7 @@ struct tftproot_handle {
int tftproot_dhcpboot(device_t);
static int tftproot_getfile(struct tftproot_handle *, struct lwp *);
-static int tftproot_recv(struct mbuf *, void *);
+static int tftproot_recv(struct mbuf **, void *);
int
tftproot_dhcpboot(device_t bootdv)
@@ -350,10 +350,11 @@ out:
}
static int
-tftproot_recv(struct mbuf *m, void *ctx)
+tftproot_recv(struct mbuf **mp, void *ctx)
{
struct tftproot_handle *trh = ctx;
struct tftphdr *tftp;
+ struct mbuf *m = *mp;
size_t newlen;
size_t hdrlen = sizeof(*tftp) - sizeof(tftp-th_data);
@@ -380,7 +381,7 @@ tftproot_recv(struct mbuf *m, void *ctx)
* Examine the TFTP header
*/
if (m-m_len sizeof(*tftp)) {
- if ((m = m_pullup(m, sizeof(*tftp))) == NULL) {
+ if ((m = *mp = m_pullup(m, sizeof(*tftp))) == NULL) {
DPRINTF((%s():%d m_pullup failed\n,
__func__, __LINE__));
return -1;
Index: src/sys/nfs/krpc_subr.c
diff -u src/sys/nfs/krpc_subr.c:1.37 src/sys/nfs/krpc_subr.c:1.37.38.1
--- src/sys/nfs/krpc_subr.c:1.37 Sun Mar 15 17:20:09 2009
+++ src/sys/nfs/krpc_subr.c Mon Apr 6 01:37:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: krpc_subr.c,v 1.37 2009/03/15 17:20:09 cegger Exp $ */
+/* $NetBSD: krpc_subr.c,v 1.37.38.1 2015/04/06 01:37:29 snj Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -43,7 +43,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: krpc_subr.c,v 1.37 2009/03/15 17:20:09 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: krpc_subr.c,v 1.37.38.1 2015/04/06 01:37:29 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -124,7 +124,7 @@ struct rpc_reply {
#define MIN_REPLY_HDR 16 /* xid, dir, astat, errno */
-static int krpccheck(struct mbuf*, void*);
+static int krpccheck(struct mbuf**, void*);
/*
* Call portmap to lookup a port number for a particular rpc program
@@ -183,15 +183,16 @@ krpc_portmap(struct sockaddr_in *sin, u_
return 0;
}
-static int krpccheck(struct mbuf *m, void *context)
+static int krpccheck(struct mbuf **mp, void *context)
{
struct rpc_reply *reply;
+ struct mbuf *m = *mp;
/* Does the reply contain at least a header? */
if (m-m_pkthdr.len MIN_REPLY_HDR)
return(-1);
if (m-m_len sizeof(struct rpc_reply)) {
- m = m_pullup(m, sizeof(struct rpc_reply));
+ m = *mp = m_pullup(m, sizeof(struct rpc_reply));
if (m == NULL)
return(-1);
}
Index: src/sys/nfs/nfs_boot.c
diff -u src/sys/nfs/nfs_boot.c:1.81 src/sys/nfs/nfs_boot.c:1.81.4.1
--- src/sys/nfs/nfs_boot.c:1.81 Fri Oct 25 20:46:29 2013
+++ src/sys/nfs/nfs_boot.c Mon Apr 6 01:37:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_boot.c,v 1.81 2013/10/25 20:46:29 martin Exp $ */
+/* $NetBSD: nfs_boot.c,v 1.81.4.1 2015/04/06 01:37:29 snj Exp $ */
/*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_boot.c,v 1.81 2013/10/25 20:46:29 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_boot.c,v 1.81.4.1 2015/04/06 01:37:29 snj Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -432,7 +432,7 @@ int
CVS commit: [netbsd-7] src/sys
Module Name:src Committed By: snj Date: Mon Apr 6 01:37:29 UTC 2015 Modified Files: src/sys/kern [netbsd-7]: subr_tftproot.c src/sys/nfs [netbsd-7]: krpc_subr.c nfs_boot.c nfs_bootdhcp.c nfsdiskless.h Log Message: Pull up following revision(s) (requested by hikaru in ticket #656): sys/kern/subr_tftproot.c: revision 1.14 sys/nfs/krpc_subr.c: revision 1.39 sys/nfs/nfs_boot.c: revision 1.82 sys/nfs/nfs_bootdhcp.c: revision 1.53 sys/nfs/nfsdiskless.h: revision 1.31 m_pullup() is called in rcvproc callback functions, so nfs_boot_sendrecv() should keep track of the head of mbuf chain. fixes kern/48746 To generate a diff of this commit: cvs rdiff -u -r1.12.12.1 -r1.12.12.2 src/sys/kern/subr_tftproot.c cvs rdiff -u -r1.37 -r1.37.38.1 src/sys/nfs/krpc_subr.c cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/nfs/nfs_boot.c cvs rdiff -u -r1.52 -r1.52.34.1 src/sys/nfs/nfs_bootdhcp.c cvs rdiff -u -r1.30 -r1.30.34.1 src/sys/nfs/nfsdiskless.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Mon Apr 6 02:03:16 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: tickets 655-665 To generate a diff of this commit: cvs rdiff -u -r1.1.2.248 -r1.1.2.249 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.248 src/doc/CHANGES-7.0:1.1.2.249 --- src/doc/CHANGES-7.0:1.1.2.248 Sat Apr 4 19:05:31 2015 +++ src/doc/CHANGES-7.0 Mon Apr 6 02:03:15 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.248 2015/04/04 19:05:31 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.249 2015/04/06 02:03:15 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -19428,3 +19428,91 @@ sys/net/if_vlan.c1.80 Correct frame padding length. [ozaki-r, ticket #653] +sys/netinet6/in6.c1.182 via patch +sys/netinet6/in6_ifattach.c 1.95 via patch +sys/netinet6/nd6.c1.158 via patch +sys/netinet6/nd6.h1.62 via patch +sys/netinet6/nd6_nbr.c1.104 via patch +sys/netinet6/nd6_rtr.c1.96 via patch + + Rearange interface detachement slightly: before we free the + INET6 specific per-interface data, make sure to call nd6_purge + with it to remove routing entries pointing to the going interface. + When we should happen to call this function again later, with the + data already gone, just return. + Fixes PR kern/49682. + [martin, ticket #655] + +sys/kern/subr_tftproot.c 1.14 +sys/nfs/krpc_subr.c1.39 +sys/nfs/nfs_boot.c1.82 +sys/nfs/nfs_bootdhcp.c1.53 +sys/nfs/nfsdiskless.h1.31 + + m_pullup() is called in rcvproc callback functions, so + nfs_boot_sendrecv() should keep track of the head of mbuf chain. + PR kern/48746. + [hikaru, ticket #656] + +usr.sbin/sysinst/msg.mi.en 1.7 +usr.sbin/sysinst/msg.mi.pl 1.7 + + IPv4 number - IPv4 address + [mbalmer, ticket #657] + +sys/arch/arm/amlogic/amlogic_board.c 1.11 +sys/arch/arm/amlogic/amlogic_crureg.h 1.8 +sys/arch/arm/amlogic/amlogic_rng.c 1.2 + + Use a callback (with ugly lock dance from bcm2835_rng) instead of + callout. Make sure the ring oscillator is enabled as well. + [jmcneill, ticket #658] + +sys/arch/arm/amlogic/amlogic_com.c 1.5 +sys/arch/arm/amlogic/amlogic_comreg.h 1.4 + + Fix cnmagic handling, now I can enter ddb from serial console. + [jmcneill, ticket #659] + +sys/arch/evbarm/conf/ODROID-C1 1.15 + + Comment out DDB_COMMANDONENTER. + [jmcneill, ticket #660] + +sys/arch/arm/amlogic/amlogic_genfb.c 1.5 +sys/arch/arm/amlogic/amlogic_vpureg.h 1.3 +sys/arch/evbarm/amlogic/amlogic_machdep.c 1.20 + + Allow for choosing between 16 and 24bpp framebuffers. The default + is now 16 instead of 24. Set 'fb.depth=16' or 'fb.depth=24' on + kernel command-line to explicitly select a colour depth. + [jmcneill, ticket #661] + +sys/arch/arm/cortex/gtmr.c 1.10-1.14 + + PR port-arm/49737: armgtmr0 timer broken + Use physical timer instead of virtual timer for timecounter. + -- + Sprinkle some arm_isb() to force execution of the mcrr + instructions to get more accurate values. + -- + Move isb's to before reading count. Change interrupt to level. + [skrll, ticket #662] + +sys/arch/arm/arm32/cpu.c 1.105 + + Increase the `freqbuf' buffer that holds the result of + humanize_number(). Now it prints 1600 Mhz instead of 1 Ghz. + [jmcneill, ticket #663] + +distrib/utils/embedded/mkimage 1.53 + + Use FFSv2 instead of FFSv1 for the root file-system to speed up + the process of growing it with resize_ffs. + [jmcneill, ticket #664] + +libexec/ld.elf_so/rtld.c 1.176 + + PR lib/49813: Release mutex on error, avoiding a deadlock. + [joerg, ticket #665] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Mon Apr 6 02:03:16 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: tickets 655-665 To generate a diff of this commit: cvs rdiff -u -r1.1.2.248 -r1.1.2.249 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Mon Apr 6 01:41:50 UTC 2015
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: msg.mi.en msg.mi.pl
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #657):
usr.sbin/sysinst/msg.mi.en: revision 1.7
usr.sbin/sysinst/msg.mi.pl: revision 1.7
IPv4 number - IPv4 address
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/msg.mi.en \
src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.2.4.2 src/usr.sbin/sysinst/msg.mi.en:1.2.4.3
--- src/usr.sbin/sysinst/msg.mi.en:1.2.4.2 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.en Mon Apr 6 01:41:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.2.4.2 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.2.4.3 2015/04/06 01:41:50 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -521,10 +521,10 @@ message net_host
{Your host name}
message net_ip
-{Your IPv4 number}
+{Your IPv4 address}
message net_srv_ip
-{Server IPv4 number}
+{Server IPv4 address}
message net_mask
{IPv4 Netmask}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.2.4.2 src/usr.sbin/sysinst/msg.mi.pl:1.2.4.3
--- src/usr.sbin/sysinst/msg.mi.pl:1.2.4.2 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.pl Mon Apr 6 01:41:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.2.4.2 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.2.4.3 2015/04/06 01:41:50 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -518,7 +518,7 @@ message net_ip
{Twoj adres IPv4}
message net_srv_ip
-{Server IPv4 number}
+{Server IPv4 address}
message net_mask
{Maska podsieci IPv4}
CVS commit: [netbsd-7] src/sys/arch/arm/amlogic
Module Name:src Committed By: snj Date: Mon Apr 6 01:43:31 UTC 2015 Modified Files: src/sys/arch/arm/amlogic [netbsd-7]: amlogic_board.c amlogic_crureg.h amlogic_rng.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #658): sys/arch/arm/amlogic/amlogic_board.c: revision 1.11 sys/arch/arm/amlogic/amlogic_crureg.h: revision 1.8 sys/arch/arm/amlogic/amlogic_rng.c: revision 1.2 Use a callback (with ugly lock dance from bcm2835_rng) instead of callout. Make sure the ring oscillator is enabled as well. To generate a diff of this commit: cvs rdiff -u -r1.9.2.2 -r1.9.2.3 src/sys/arch/arm/amlogic/amlogic_board.c cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/sys/arch/arm/amlogic/amlogic_crureg.h cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/amlogic/amlogic_rng.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Mon Apr 6 01:41:50 UTC 2015 Modified Files: src/usr.sbin/sysinst [netbsd-7]: msg.mi.en msg.mi.pl Log Message: Pull up following revision(s) (requested by mbalmer in ticket #657): usr.sbin/sysinst/msg.mi.en: revision 1.7 usr.sbin/sysinst/msg.mi.pl: revision 1.7 IPv4 number - IPv4 address To generate a diff of this commit: cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/msg.mi.en \ src/usr.sbin/sysinst/msg.mi.pl 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/include/linux
Module Name:src Committed By: riastradh Date: Mon Apr 6 02:29:18 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Missed a zero: it's 0x10, not 0x1. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/pci.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/external/bsd/drm2/include/linux/pci.h diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.16 src/sys/external/bsd/drm2/include/linux/pci.h:1.17 --- src/sys/external/bsd/drm2/include/linux/pci.h:1.16 Mon Apr 6 01:11:19 2015 +++ src/sys/external/bsd/drm2/include/linux/pci.h Mon Apr 6 02:29:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.h,v 1.16 2015/04/06 01:11:19 riastradh Exp $ */ +/* $NetBSD: pci.h,v 1.17 2015/04/06 02:29:18 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -331,7 +331,7 @@ pci_clear_master(struct pci_dev *pdev) PCI_COMMAND_STATUS_REG, csr); } -#define PCIBIOS_MIN_MEM 0x1 /* XXX bogus x86 kludge bollocks */ +#define PCIBIOS_MIN_MEM 0x10 /* XXX bogus x86 kludge bollocks */ static inline bus_addr_t pcibios_align_resource(void *p, const struct resource *resource,
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Mon Apr 6 02:29:18 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Missed a zero: it's 0x10, not 0x1. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sat, Apr 04, 2015 at 03:36:46PM -0400, Christos Zoulas wrote: I found out what's wrong (building ops.h at the same time as deps) and I fixed it. Great!
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Sun Apr 5 06:37:25 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Add new bind(2) test program To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.614 -r1.615 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.108 src/distrib/sets/lists/debug/mi:1.109 --- src/distrib/sets/lists/debug/mi:1.108 Tue Mar 3 11:06:47 2015 +++ src/distrib/sets/lists/debug/mi Sun Apr 5 06:37:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.108 2015/03/03 11:06:47 martin Exp $ +# $NetBSD: mi,v 1.109 2015/04/05 06:37:25 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1968,6 +1968,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/string/t_strspn.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/string/t_swab.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/sys/t_access.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/sys/t_bind.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/sys/t_bitops.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/sys/t_cerror.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/sys/t_chroot.debug tests-lib-debug debug,atf Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.614 src/distrib/sets/lists/tests/mi:1.615 --- src/distrib/sets/lists/tests/mi:1.614 Fri Apr 3 21:38:47 2015 +++ src/distrib/sets/lists/tests/mi Sun Apr 5 06:37:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.614 2015/04/03 21:38:47 christos Exp $ +# $NetBSD: mi,v 1.615 2015/04/05 06:37:25 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2638,6 +2638,7 @@ ./usr/tests/lib/libc/sys/Atffile tests-lib-tests atf ./usr/tests/lib/libc/sys/Kyuafile tests-lib-tests atf,kyua ./usr/tests/lib/libc/sys/t_access tests-lib-tests atf +./usr/tests/lib/libc/sys/t_bind tests-lib-tests atf ./usr/tests/lib/libc/sys/t_bitops tests-obsolete obsolete ./usr/tests/lib/libc/sys/t_cerror tests-obsolete obsolete ./usr/tests/lib/libc/sys/t_chroot tests-lib-tests atf
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Sun Apr 5 06:37:25 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Add new bind(2) test program To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.614 -r1.615 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/tests/lib/libc/sys
Module Name:src
Committed By: martin
Date: Sun Apr 5 06:36:52 UTC 2015
Modified Files:
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_bind.c
Log Message:
New test program for bind(2), with a single (currently eroneously failing)
test case from Tyler Retzlaff.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_bind.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/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.37 src/tests/lib/libc/sys/Makefile:1.38
--- src/tests/lib/libc/sys/Makefile:1.37 Sat Jan 31 23:06:57 2015
+++ src/tests/lib/libc/sys/Makefile Sun Apr 5 06:36:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/01/31 23:06:57 christos Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/05 06:36:52 martin Exp $
MKMAN= no
@@ -9,6 +9,7 @@ MKMAN= no
TESTSDIR= ${TESTSBASE}/lib/libc/sys
TESTS_C+= t_access
+TESTS_C+= t_bind
TESTS_C+= t_chroot
TESTS_C+= t_clock_gettime
TESTS_C+= t_clone
Added files:
Index: src/tests/lib/libc/sys/t_bind.c
diff -u /dev/null src/tests/lib/libc/sys/t_bind.c:1.1
--- /dev/null Sun Apr 5 06:36:52 2015
+++ src/tests/lib/libc/sys/t_bind.c Sun Apr 5 06:36:52 2015
@@ -0,0 +1,74 @@
+/* $NetBSD: t_bind.c,v 1.1 2015/04/05 06:36:52 martin Exp $ */
+/*
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include errno.h
+#include stdlib.h
+#include string.h
+
+#include unistd.h
+
+#include sys/socket.h
+#include arpa/inet.h
+#include netinet/in.h
+
+#include atf-c.h
+
+ATF_TC(bind_foreign_family);
+
+ATF_TC_HEAD(bind_foreign_family, tc)
+{
+ atf_tc_set_md_var(tc, descr, Checks that bindinging a socket
+ with a different address family fails);
+}
+
+ATF_TC_BODY(bind_foreign_family, tc)
+{
+ struct sockaddr_in addr;
+
+ memset(addr, 0, sizeof(addr));
+ /* use a sin_family != the socket type */
+ addr.sin_port = htons(8000);
+ addr.sin_addr.s_addr = INADDR_ANY;
+
+ int sock = socket(AF_LOCAL, SOCK_STREAM, 0);
+ ATF_REQUIRE(sock != -1);
+
+ /* should fail but currently doesn't */
+ ATF_REQUIRE(-1 == bind(sock, (struct sockaddr *)addr, sizeof(addr)));
+ ATF_REQUIRE(EINVAL == errno);
+
+ close(sock);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, bind_foreign_family);
+
+ return atf_no_error();
+}
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: martin Date: Sun Apr 5 06:36:52 UTC 2015 Modified Files: src/tests/lib/libc/sys: Makefile Added Files: src/tests/lib/libc/sys: t_bind.c Log Message: New test program for bind(2), with a single (currently eroneously failing) test case from Tyler Retzlaff. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/tests/lib/libc/sys/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_bind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/service
Module Name:src
Committed By: apb
Date: Sun Apr 5 11:33:15 UTC 2015
Modified Files:
src/usr.sbin/service: service
Log Message:
More shell quoting. /etc/rc.d/* file names with embedded spaces are
not expected to work, but let's quote them anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/service/service
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/service/service
diff -u src/usr.sbin/service/service:1.6 src/usr.sbin/service/service:1.7
--- src/usr.sbin/service/service:1.6 Thu Apr 2 18:41:22 2015
+++ src/usr.sbin/service/service Sun Apr 5 11:33:15 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-#$NetBSD: service,v 1.6 2015/04/02 18:41:22 ast Exp $
+#$NetBSD: service,v 1.7 2015/04/05 11:33:15 apb Exp $
#service -- run or list system services
#
# Taken from FreeBSD: releng/10.1/usr.sbin/service/service.sh 268098
@@ -33,7 +33,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bi
usage ()
{
-local me=${0##*/}
+local me=${0##*/}
echo usage: ${me} [-elv]
echo${me} [-ev] rc_script_name [rc_script_name2 [...]]
echo${me} [-v] rc_script_name action
@@ -60,7 +60,7 @@ _rc_files()
}
while getopts elv o; do
-case $o in
+case $o in
e) ENABLED=1 ;;
l) LIST=1 ;;
v) VERBOSE=1 ;;
@@ -83,9 +83,9 @@ if [ -n ${ENABLED} ]; then
fi
_rc_files | $flt | while read file
do
-if grep -q ^rcvar $file; then
-eval $( grep ^name= $file )
-eval $( grep ^rcvar $file )
+if grep -q ^rcvar $file; then
+eval $( grep ^name= $file )
+eval $( grep ^rcvar $file )
if [ -n ${rcvar} ]; then
load_rc_config ${rcvar}
checkyesno ${rcvar} 2/dev/null echo ${file}
@@ -116,7 +116,7 @@ for dir in ${rc_directories}; do
umask 022
exec env -i \
HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin \
-${dir}/${script} ${arg}
+${dir}/${script} ${arg}
echo Failed to exec ${dir}/${script} ${arg} 2
exit 255
fi
CVS commit: src/usr.sbin/service
Module Name:src Committed By: apb Date: Sun Apr 5 11:33:15 UTC 2015 Modified Files: src/usr.sbin/service: service Log Message: More shell quoting. /etc/rc.d/* file names with embedded spaces are not expected to work, but let's quote them anyway. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/service/service Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Sun Apr 5 12:55:20 UTC 2015
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
Don't use the video BIOS memory as an i915 flush page!
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/pci/agp_i810.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.117 src/sys/dev/pci/agp_i810.c:1.118
--- src/sys/dev/pci/agp_i810.c:1.117 Fri Mar 6 22:03:06 2015
+++ src/sys/dev/pci/agp_i810.c Sun Apr 5 12:55:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.117 2015/03/06 22:03:06 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.118 2015/04/05 12:55:20 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.117 2015/03/06 22:03:06 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.118 2015/04/05 12:55:20 riastradh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -602,6 +602,16 @@ fail0: agp_generic_detach(sc);
return error;
}
+/*
+ * Skip pages reserved by the BIOS. Notably, skip 0xa-0xf,
+ * which includes the video BIOS at 0xc-0xd which the display
+ * drivers need for video mode detection.
+ *
+ * XXX Is there an MI name for this, or a conventional x86 name? Or
+ * should we really use bus_dma instead?
+ */
+#define PCIBIOS_MIN_MEM 0x10
+
static int
agp_i810_setup_chipset_flush_page(struct agp_softc *sc)
{
@@ -621,7 +631,7 @@ agp_i810_setup_chipset_flush_page(struct
/* Read the PCI config register: 4-byte on gen3, 8-byte on gen=4. */
if (isc-chiptype == CHIP_I915) {
addr = pci_conf_read(pc, tag, AGP_I915_IFPADDR);
- minaddr = PAGE_SIZE; /* XXX PCIBIOS_MIN_MEM? */
+ minaddr = PCIBIOS_MIN_MEM;
maxaddr = UINT32_MAX;
} else {
hi = pci_conf_read(pc, tag, AGP_I965_IFPADDR+4);
@@ -643,7 +653,7 @@ agp_i810_setup_chipset_flush_page(struct
return EIO;
#endif
}
- minaddr = PAGE_SIZE; /* XXX PCIBIOS_MIN_MEM? */
+ minaddr = PCIBIOS_MIN_MEM;
maxaddr = MIN(UINT64_MAX, ~(bus_addr_t)0);
}
@@ -695,8 +705,7 @@ agp_i810_teardown_chipset_flush_page(str
AGP_I965_IFPADDR + 4, 0);
}
isc-flush_addr = 0;
- bus_space_free(isc-flush_bst, isc-flush_bsh,
- PAGE_SIZE);
+ bus_space_free(isc-flush_bst, isc-flush_bsh, PAGE_SIZE);
} else {
/* Otherwise, just unmap the pre-allocated page. */
bus_space_unmap(isc-flush_bst, isc-flush_bsh, PAGE_SIZE);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Sun Apr 5 12:55:20 UTC 2015 Modified Files: src/sys/dev/pci: agp_i810.c Log Message: Don't use the video BIOS memory as an i915 flush page! To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Apr 5, 9:09am, mar...@duskware.de (Martin Husemann) wrote: -- Subject: Re: CVS commit: src | Unfortunately (now on a different machine) it fails for me like below. | | Martin Hmm, it is building things twice... I am trying to figure out why but I can't reproduce it. christos
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 07:26:31 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: uhci.c Log Message: Fix inverted logic. Spotted by Takahiro HAYASHI. Thanks. To generate a diff of this commit: cvs rdiff -u -r1.264.4.31 -r1.264.4.32 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/uhci.c diff -u src/sys/dev/usb/uhci.c:1.264.4.31 src/sys/dev/usb/uhci.c:1.264.4.32 --- src/sys/dev/usb/uhci.c:1.264.4.31 Fri Apr 3 21:33:23 2015 +++ src/sys/dev/usb/uhci.c Sun Apr 5 07:26:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.264.4.31 2015/04/03 21:33:23 skrll Exp $ */ +/* $NetBSD: uhci.c,v 1.264.4.32 2015/04/05 07:26:31 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.264.4.31 2015/04/03 21:33:23 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.264.4.32 2015/04/05 07:26:31 skrll Exp $); #include opt_usb.h @@ -3106,7 +3106,7 @@ uhci_device_ctrl_done(struct usbd_xfer * UHCIHIST_FUNC(); UHCIHIST_CALLED(); - KASSERT(!(xfer-ux_rqflags URQ_REQUEST)); + KASSERT(xfer-ux_rqflags URQ_REQUEST); if (!uhci_active_intr_info(ii)) return;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 07:26:31 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: uhci.c Log Message: Fix inverted logic. Spotted by Takahiro HAYASHI. Thanks. To generate a diff of this commit: cvs rdiff -u -r1.264.4.31 -r1.264.4.32 src/sys/dev/usb/uhci.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/time
Module Name:src Committed By: pgoyette Date: Sun Apr 5 08:36:38 UTC 2015 Modified Files: src/lib/libc/time: tzset.3 Log Message: Remove dangling cross-ref to localtime(3). There's another cross-ref in the next sentence that actually makes sense. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/tzset.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/tzset.3 diff -u src/lib/libc/time/tzset.3:1.31 src/lib/libc/time/tzset.3:1.32 --- src/lib/libc/time/tzset.3:1.31 Thu Oct 23 18:45:58 2014 +++ src/lib/libc/time/tzset.3 Sun Apr 5 08:36:38 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: tzset.3,v 1.31 2014/10/23 18:45:58 christos Exp $ +.\ $NetBSD: tzset.3,v 1.32 2015/04/05 08:36:38 pgoyette Exp $ .Dd October 23, 2014 .Dt TZSET 3 .Os @@ -103,7 +103,6 @@ If the implied call to fails, .Fn tzset falls back on UTC. -.Xr localtime 3 . If .Ev TZ is
CVS commit: src/lib/libc/time
Module Name:src Committed By: pgoyette Date: Sun Apr 5 08:36:38 UTC 2015 Modified Files: src/lib/libc/time: tzset.3 Log Message: Remove dangling cross-ref to localtime(3). There's another cross-ref in the next sentence that actually makes sense. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/tzset.3 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: skrll Date: Sun Apr 5 08:39:10 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: Conexant USB Modem from Ryo ONODERA on current-users. To generate a diff of this commit: cvs rdiff -u -r1.693 -r1.694 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.693 src/sys/dev/usb/usbdevs:1.694 --- src/sys/dev/usb/usbdevs:1.693 Tue Mar 17 08:14:30 2015 +++ src/sys/dev/usb/usbdevs Sun Apr 5 08:39:10 2015 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.693 2015/03/17 08:14:30 macallan Exp $ +$NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3343,6 +3343,7 @@ product XIRLINK IMAGING 0x800d IMAGING product XIRLINK PCCAM 0x8080 IBM PC Camera /* Conexant */ +product CONEXANT MODEM_1 0x1329 USB Modem product CONEXANT PRISM_GT_1 0x2000 PrismGT USB 2.0 WLAN product CONEXANT PRISM_GT_2 0x2002 PrismGT USB 2.0 WLAN
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 08:39:10 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: Conexant USB Modem from Ryo ONODERA on current-users. To generate a diff of this commit: cvs rdiff -u -r1.693 -r1.694 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: skrll Date: Sun Apr 5 09:18:13 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: More Texas Instruments (not Texas Intel) products. Part of PR/49814 To generate a diff of this commit: cvs rdiff -u -r1.694 -r1.695 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: skrll Date: Sun Apr 5 09:18:13 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: More Texas Instruments (not Texas Intel) products. Part of PR/49814 To generate a diff of this commit: cvs rdiff -u -r1.694 -r1.695 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.694 src/sys/dev/usb/usbdevs:1.695 --- src/sys/dev/usb/usbdevs:1.694 Sun Apr 5 08:39:10 2015 +++ src/sys/dev/usb/usbdevs Sun Apr 5 09:18:13 2015 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp $ +$NetBSD: usbdevs,v 1.695 2015/04/05 09:18:13 skrll Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3172,10 +3172,13 @@ product TELEX MIC1 0x0001 Enhanced USB product TENX MISSILE 0x0202 Missile Launcher product TENX TEMPER 0x660c TEMPer sensor -/* Texas Intel products */ +/* Texas Instruments products */ product TI UTUSB41 0x1446 UT-USB41 hub product TI TUSB2046 0x2046 TUSB2046 hub +product TI TUSB3410 0x3410 TUSB3410 product TI NEXII 0x5409 Nex II Digital +product TI MSP430_JTAG 0xf430 MSP-FET430UIF JTAG +product TI MSP430 0xf432 MSP-FET430UIF /* Thrustmaster products */ product THRUST FUSION_PAD 0xa0a3 Fusion Digital Gamepad
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Apr 5 09:22:13 UTC 2015
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.686 -r1.687 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.687 -r1.688 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.686 src/sys/dev/usb/usbdevs.h:1.687
--- src/sys/dev/usb/usbdevs.h:1.686 Sun Apr 5 08:41:05 2015
+++ src/sys/dev/usb/usbdevs.h Sun Apr 5 09:22:13 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.686 2015/04/05 08:41:05 skrll Exp $ */
+/* $NetBSD: usbdevs.h,v 1.687 2015/04/05 09:22:13 skrll Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp
+ * NetBSD: usbdevs,v 1.695 2015/04/05 09:18:13 skrll Exp
*/
/*
@@ -3179,10 +3179,13 @@
#define USB_PRODUCT_TENX_MISSILE 0x0202 /* Missile Launcher */
#define USB_PRODUCT_TENX_TEMPER 0x660c /* TEMPer sensor */
-/* Texas Intel products */
+/* Texas Instruments products */
#define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 hub */
#define USB_PRODUCT_TI_TUSB2046 0x2046 /* TUSB2046 hub */
+#define USB_PRODUCT_TI_TUSB3410 0x3410 /* TUSB3410 */
#define USB_PRODUCT_TI_NEXII 0x5409 /* Nex II Digital */
+#define USB_PRODUCT_TI_MSP430_JTAG 0xf430 /* MSP-FET430UIF JTAG */
+#define USB_PRODUCT_TI_MSP430 0xf432 /* MSP-FET430UIF */
/* Thrustmaster products */
#define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.687 src/sys/dev/usb/usbdevs_data.h:1.688
--- src/sys/dev/usb/usbdevs_data.h:1.687 Sun Apr 5 08:41:05 2015
+++ src/sys/dev/usb/usbdevs_data.h Sun Apr 5 09:22:13 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.687 2015/04/05 08:41:05 skrll Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.688 2015/04/05 09:22:13 skrll Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp
+ * NetBSD: usbdevs,v 1.695 2015/04/05 09:18:13 skrll Exp
*/
/*
@@ -4322,18 +4322,24 @@ static const uint16_t usb_products[] = {
18106, 6719, 0,
USB_VENDOR_TI, USB_PRODUCT_TI_TUSB2046,
18115, 6719, 0,
+ USB_VENDOR_TI, USB_PRODUCT_TI_TUSB3410,
+ 18124, 0,
USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
- 18124, 7059, 2209, 0,
+ 18133, 7059, 2209, 0,
+ USB_VENDOR_TI, USB_PRODUCT_TI_MSP430_JTAG,
+ 18137, 18151, 0,
+ USB_VENDOR_TI, USB_PRODUCT_TI_MSP430,
+ 18137, 0,
USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
- 14536, 2209, 18128, 0,
+ 14536, 2209, 18156, 0,
USB_VENDOR_TOD, USB_PRODUCT_TOD_DOOGI_SLIM,
- 18136, 18142, 4710, 5701, 0,
+ 18164, 18170, 4710, 5701, 0,
USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI,
- 18147, 6535, 18153, 9922, 0,
+ 18175, 6535, 18181, 9922, 0,
USB_VENDOR_TOPFIELD, USB_PRODUCT_TOPFIELD_TF5000PVR,
- 18163, 2209, 18173, 18179, 0,
+ 18191, 2209, 18201, 18207, 0,
USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740,
- 7749, 18188, 0,
+ 7749, 18216, 0,
USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_RT3070,
4943, 0,
USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_AX88179,
@@ -4343,59 +4349,59 @@ static const uint16_t usb_products[] = {
USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8192CU,
5057, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
- 18193, 0,
+ 18221, 0,
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
- 18193, 18204, 0,
+ 18221, 18232, 0,
USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8192CU,
5057, 0,
USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8188CU,
5067, 0,
USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
- 18208, 6614, 4749, 0,
+ 18236, 6614, 4749, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
3052, 3058, 438, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD,
- 18213, 438, 0,
+ 18241, 438, 0,
USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U,
- 3052, 3058, 18222, 0,
+ 3052, 3058, 18250, 0,
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
- 18230, 18238, 0,
+ 18258, 18266, 0,
USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_XXX1100,
- 14844, 18246, 0,
+ 14844, 18274, 0,
USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000,
- 18251, 0,
+ 18279, 0,
USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240,
- 18259, 0,
+ 18287, 0,
USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
10580, 13788, 10470, 6915, 0,
USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_T14BR,
- 18264, 18270, 6540, 0,
+ 18292, 18298, 6540, 0,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 09:22:13 UTC 2015 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.686 -r1.687 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.687 -r1.688 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: skrll
Date: Sun Apr 5 09:24:21 UTC 2015
Modified Files:
src/sys/dev/usb: usb_quirks.c
Log Message:
PR/49814: USB Quirk for Texas Instrument MSP430 FET programmer
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/usb_quirks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.82 src/sys/dev/usb/usb_quirks.c:1.83
--- src/sys/dev/usb/usb_quirks.c:1.82 Mon Jan 26 11:05:20 2015
+++ src/sys/dev/usb/usb_quirks.c Sun Apr 5 09:24:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.82 2015/01/26 11:05:20 gson Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.83 2015/04/05 09:24:21 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.82 2015/01/26 11:05:20 gson Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.83 2015/04/05 09:24:21 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_usb.h
@@ -68,6 +68,7 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_WELTREND, USB_PRODUCT_WELTREND_HID, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EC3, ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_TI, USB_PRODUCT_TI_MSP430,ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0x100, { UQ_NO_SET_PROTO}},
{ USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 09:24:21 UTC 2015 Modified Files: src/sys/dev/usb: usb_quirks.c Log Message: PR/49814: USB Quirk for Texas Instrument MSP430 FET programmer To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/usb_quirks.c 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: skrll Date: Sun Apr 5 08:41:05 UTC 2015 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.685 -r1.686 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.686 -r1.687 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: skrll
Date: Sun Apr 5 08:41:05 UTC 2015
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.685 -r1.686 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.686 -r1.687 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.685 src/sys/dev/usb/usbdevs.h:1.686
--- src/sys/dev/usb/usbdevs.h:1.685 Tue Mar 17 08:15:48 2015
+++ src/sys/dev/usb/usbdevs.h Sun Apr 5 08:41:05 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.685 2015/03/17 08:15:48 macallan Exp $ */
+/* $NetBSD: usbdevs.h,v 1.686 2015/04/05 08:41:05 skrll Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.692 2015/03/15 01:37:47 nonaka Exp
+ * NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp
*/
/*
@@ -3350,6 +3350,7 @@
#define USB_PRODUCT_XIRLINK_PCCAM 0x8080 /* IBM PC Camera */
/* Conexant */
+#define USB_PRODUCT_CONEXANT_MODEM_1 0x1329 /* USB Modem */
#define USB_PRODUCT_CONEXANT_PRISM_GT_1 0x2000 /* PrismGT USB 2.0 WLAN */
#define USB_PRODUCT_CONEXANT_PRISM_GT_2 0x2002 /* PrismGT USB 2.0 WLAN */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.686 src/sys/dev/usb/usbdevs_data.h:1.687
--- src/sys/dev/usb/usbdevs_data.h:1.686 Tue Mar 17 08:15:48 2015
+++ src/sys/dev/usb/usbdevs_data.h Sun Apr 5 08:41:05 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.686 2015/03/17 08:15:48 macallan Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.687 2015/04/05 08:41:05 skrll Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.692 2015/03/15 01:37:47 nonaka Exp
+ * NetBSD: usbdevs,v 1.694 2015/04/05 08:39:10 skrll Exp
*/
/*
@@ -4506,6 +4506,8 @@ static const uint16_t usb_products[] = {
18751, 18759, 0,
USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
672, 5609, 2882, 0,
+ USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_MODEM_1,
+ 4710, 4845, 0,
USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_1,
5167, 4710, 5175, 5140, 0,
USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_2,
@@ -5280,7 +5282,7 @@ static const char usb_words[] = { .
GNU\0 /* 1 refs @ 4689 */
USRP\0 /* 2 refs @ 4693 */
HomeConnect\0 /* 4 refs @ 4698 */
- USB\0 /* 188 refs @ 4710 */
+ USB\0 /* 189 refs @ 4710 */
Bluetooth\0 /* 17 refs @ 4714 */
Adapter\0 /* 71 refs @ 4724 */
3C19250\0 /* 1 refs @ 4732 */
@@ -5296,7 +5298,7 @@ static const char usb_words[] = { .
3C460B\0 /* 1 refs @ 4812 */
3CRUSB10075\0 /* 1 refs @ 4819 */
OfficeConnect\0 /* 1 refs @ 4831 */
- Modem\0 /* 14 refs @ 4845 */
+ Modem\0 /* 15 refs @ 4845 */
ISDN\0 /* 3 refs @ 4851 */
TA\0 /* 2 refs @ 4856 */
camera\0 /* 5 refs @ 4859 */
Re: CVS commit: src
Unfortunately (now on a different machine) it fails for me like below.
Martin
dependall === tools/lint1
--- ./cgram.c ---
--- cgram.c ---
--- ./cgram.c ---
# yacc lint1/./cgram.c
/usr/tools/bin/nbyacc -d -o ./cgram.c
/usr/src/tools/lint1/../../usr.bin/xlint/lint1/cgram.y
--- cgram.c ---
# yacc lint1/cgram.c
/usr/tools/bin/nbyacc -d -o cgram.c
/usr/src/tools/lint1/../../usr.bin/xlint/lint1/cgram.y
--- ./cgram.c ---
/usr/tools/bin/nbyacc: 78 shift/reduce conflicts.
--- cgram.c ---
/usr/tools/bin/nbyacc: 78 shift/reduce conflicts.
--- ./cgram.c ---
echo '#if HAVE_NBTOOL_CONFIG_H' ./cgram.c.1
echo '#include nbtool_config.h' ./cgram.c.1
echo '#endif' ./cgram.c.1
cat ./cgram.c ./cgram.c.1
--- cgram.c ---
echo '#if HAVE_NBTOOL_CONFIG_H' cgram.c.1
echo '#include nbtool_config.h' cgram.c.1
echo '#endif' cgram.c.1
cat cgram.c cgram.c.1
--- ./cgram.c ---
mv ./cgram.c.1 ./cgram.c
--- cgram.c ---
mv cgram.c.1 cgram.c
mv: rename cgram.c.1 to cgram.c: No such file or directory
*** [cgram.c] Error code 1
nbmake[4]: stopped in /usr/src/tools/lint1
1 error
nbmake[4]: stopped in /usr/src/tools/lint1
*** Failed target: dependall-lint1
*** Failed command: _makedirtarget() { dir=$1; shift; target=$1; shift;
case ${dir} in /*) this=${dir}/; real=${dir} ;; .) this=tools/;
real=/usr/src/tools ;; *) this=tools/${dir}/; real=/usr/src/tools/${dir}
;; esac; show=${this:-.}; echo ${target} === ${show%/}${1:+ (with: $@)}; cd
${real} /usr/tools/bin/nbmake _THISDIR_=${this} $@ ${target}; };
_makedirtarget lint1 dependall
*** Error code 2
Stop.
nbmake[3]: stopped in /usr/src/tools
*** [build_install] Error code 1
nbmake[2]: stopped in /usr/src/tools
1 error
nbmake[2]: stopped in /usr/src/tools
*** [do-tools] Error code 2
nbmake[1]: stopped in /usr/src
1 error
nbmake[1]: stopped in /usr/src
*** [build] Error code 2
nbmake: stopped in /usr/src
1 error
nbmake: stopped in /usr/src
ERROR: Failed to make build
*** BUILD ABORTED ***
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Apr 5 09:12:06 UTC 2015
Modified Files:
src/sys/dev/usb: usb_subr.c
Log Message:
More debug.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.199 src/sys/dev/usb/usb_subr.c:1.200
--- src/sys/dev/usb/usb_subr.c:1.199 Fri Mar 27 07:28:56 2015
+++ src/sys/dev/usb/usb_subr.c Sun Apr 5 09:12:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.199 2015/03/27 07:28:56 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.200 2015/04/05 09:12:06 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.199 2015/03/27 07:28:56 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.200 2015/04/05 09:12:06 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -847,9 +847,12 @@ usbd_attachinterfaces(device_t parent, u
ifaces = malloc(nifaces * sizeof(*ifaces), M_USB, M_NOWAIT|M_ZERO);
if (!ifaces)
return (USBD_NOMEM);
- for (i = 0; i nifaces; i++)
- if (!dev-subdevs[i])
+ for (i = 0; i nifaces; i++) {
+ if (!dev-subdevs[i]) {
ifaces[i] = dev-ifaces[i];
+ }
+ DPRINTF((%s: interface %d %p\n, __func__, i, ifaces[i]));
+ }
uiaa.device = dev;
uiaa.port = port;
@@ -866,13 +869,19 @@ usbd_attachinterfaces(device_t parent, u
ilocs[USBIFIFCF_CONFIGURATION] = uiaa.configno;
for (i = 0; i nifaces; i++) {
- if (!ifaces[i])
+ if (!ifaces[i]) {
+ DPRINTF((%s: interface %d claimed\n, __func__, i));
continue; /* interface already claimed */
+ }
uiaa.iface = ifaces[i];
uiaa.class = ifaces[i]-idesc-bInterfaceClass;
uiaa.subclass = ifaces[i]-idesc-bInterfaceSubClass;
uiaa.proto = ifaces[i]-idesc-bInterfaceProtocol;
uiaa.ifaceno = ifaces[i]-idesc-bInterfaceNumber;
+
+ DPRINTF((%s: searching for interface %d
+ class %x subclass %x proto %x ifaceno %d\n, __func__, i,
+ uiaa.class, uiaa.subclass, uiaa.proto, uiaa.ifaceno));
ilocs[USBIFIFCF_INTERFACE] = uiaa.ifaceno;
if (locators != NULL) {
loc = locators[USBIFIFCF_CONFIGURATION];
@@ -891,6 +900,8 @@ usbd_attachinterfaces(device_t parent, u
/* account for ifaces claimed by the driver behind our back */
for (j = 0; j nifaces; j++) {
if (!ifaces[j] !dev-subdevs[j]) {
+DPRINTF((%s: interface %d claimed
+behind our back, __func__, j));
dev-subdevs[j] = dv;
dev-nifaces_claimed++;
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 5 09:12:06 UTC 2015 Modified Files: src/sys/dev/usb: usb_subr.c Log Message: More debug. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/dev/usb/usb_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded
Module Name:src Committed By: jmcneill Date: Sun Apr 5 17:05:45 UTC 2015 Modified Files: src/distrib/utils/embedded: mkimage Log Message: Use FFSv2 instead of FFSv1 for the root file-system. This should fix the resize_ffs takes forever issues with evbarm images -- growing a v2 file-system is much faster than v1. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/embedded/mkimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: jmcneill
Date: Sun Apr 5 17:05:45 UTC 2015
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
Use FFSv2 instead of FFSv1 for the root file-system. This should fix the
resize_ffs takes forever issues with evbarm images -- growing a v2
file-system is much faster than v1.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.52 src/distrib/utils/embedded/mkimage:1.53
--- src/distrib/utils/embedded/mkimage:1.52 Thu Jan 29 14:54:06 2015
+++ src/distrib/utils/embedded/mkimage Sun Apr 5 17:05:45 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.52 2015/01/29 14:54:06 skrll Exp $
+# $NetBSD: mkimage,v 1.53 2015/04/05 17:05:45 jmcneill Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -178,7 +178,7 @@ if [ -z ${bootonly} ]; then
echo ${bar} Populating ffs filesystem ${bar}
${MAKEFS} -r -N ${release}/etc -t ffs -rx \
-O ${ffsoffset} \
- -o d=4096 -b $((${extra}))m \
+ -o v=2,d=4096 -b $((${extra}))m \
-F $tmp/selected_sets ${image} ${release} ${mnt}
fi
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Apr 5 20:26:47 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: pmap.c Log Message: sun4v: Ensure that the W (Write) bit is not present in the TTEs unless for the data mapping. This way the permanent mappings for the primary cpu done by ofwboot are the same as the permanent mappings for the secondary cpus done by the kernel. This should fix an issue when booting the kernel on a T2 based system (T5120). To generate a diff of this commit: cvs rdiff -u -r1.292 -r1.293 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Apr 5 20:26:47 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: pmap.c Log Message: sun4v: Ensure that the W (Write) bit is not present in the TTEs unless for the data mapping. This way the permanent mappings for the primary cpu done by ofwboot are the same as the permanent mappings for the secondary cpus done by the kernel. This should fix an issue when booting the kernel on a T2 based system (T5120). To generate a diff of this commit: cvs rdiff -u -r1.292 -r1.293 src/sys/arch/sparc64/sparc64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.292 src/sys/arch/sparc64/sparc64/pmap.c:1.293 --- src/sys/arch/sparc64/sparc64/pmap.c:1.292 Tue Nov 4 18:11:42 2014 +++ src/sys/arch/sparc64/sparc64/pmap.c Sun Apr 5 20:26:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.292 2014/11/04 18:11:42 palle Exp $ */ +/* $NetBSD: pmap.c,v 1.293 2015/04/05 20:26:47 palle Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.292 2014/11/04 18:11:42 palle Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.293 2015/04/05 20:26:47 palle Exp $); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -535,14 +535,25 @@ pmap_mp_init(void) PGSZ_4M, /* sz */ kernel_tlbs[i].te_pa, /* pa */ 1, /* priv */ -1, /* write */ +0, /* write */ 1, /* cache */ 1, /* aliased */ 1, /* valid */ 0 /* ie */); tp[i].data |= TLB_L | TLB_CV; - if (CPU_ISSUN4V) - tp[i].data |= SUN4V_TLB_X; + + /* + * Assuming that the last tlb slot entry is the only data slot. + * + * If more than one data slot is required on day, perhaps + * the bootinfo structure shared between ofwboot and the kernel + * should be expanded to include the number of data slots. + */ + if (i == kernel_tlb_slots-1) + tp[i].data |= TLB_W; + else + if (CPU_ISSUN4V) +tp[i].data |= SUN4V_TLB_X; DPRINTF(PDB_BOOT1, (xtlb[%d]: Tag: % PRIx64 Data: % PRIx64 \n, i, tp[i].tag, tp[i].data));
CVS commit: src/lib/libc/sys
Module Name:src Committed By: rtr Date: Sun Apr 5 20:33:45 UTC 2015 Modified Files: src/lib/libc/sys: bind.2 Log Message: Note that bind(2) can fail with EAFNOSUPPORT. The description of why is taken from the connect(2) manpage. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/sys/bind.2 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/sys/bind.2 diff -u src/lib/libc/sys/bind.2:1.27 src/lib/libc/sys/bind.2:1.28 --- src/lib/libc/sys/bind.2:1.27 Mon May 31 12:16:20 2010 +++ src/lib/libc/sys/bind.2 Sun Apr 5 20:33:45 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: bind.2,v 1.27 2010/05/31 12:16:20 njoly Exp $ +.\ $NetBSD: bind.2,v 1.28 2015/04/05 20:33:45 rtr Exp $ .\ .\ Copyright (c) 1983, 1993 .\ The Regents of the University of California. All rights reserved. @@ -85,6 +85,8 @@ is not a valid descriptor. is not a socket. .It Bq Er EADDRNOTAVAIL The specified address is not available from the local machine. +.It Bq Er EAFNOSUPPORT +Addresses in the specified address family cannot be used with this socket. .It Bq Er EADDRINUSE The specified address is already in use. .It Bq Er EINVAL
CVS commit: src/lib/libc/sys
Module Name:src Committed By: rtr Date: Sun Apr 5 20:33:45 UTC 2015 Modified Files: src/lib/libc/sys: bind.2 Log Message: Note that bind(2) can fail with EAFNOSUPPORT. The description of why is taken from the connect(2) manpage. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/sys/bind.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Apr 5 20:34:00 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: Ensure that the TTEs CP and CV bits are the same (both set) for the primary cpu and secondary cpus INTSTACK mappings To generate a diff of this commit: cvs rdiff -u -r1.383 -r1.384 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.383 src/sys/arch/sparc64/sparc64/locore.s:1.384 --- src/sys/arch/sparc64/sparc64/locore.s:1.383 Wed Apr 1 18:38:30 2015 +++ src/sys/arch/sparc64/sparc64/locore.s Sun Apr 5 20:34:00 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.383 2015/04/01 18:38:30 palle Exp $ */ +/* $NetBSD: locore.s,v 1.384 2015/04/05 20:34:00 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -4739,7 +4739,7 @@ ENTRY(cpu_mp_startup) or %l4, 0xfff, %l4 ! We can just load this in 12 (of 13) bits andn %l1, %l4, %l1 ! Mask the phys page number into RA or %l2, %l1, %l1 ! Now take care of the 8 high bits V|NFO|SW - or %l1, 0x0141, %l2 ! And low 13 bits IE=0|E=0|CP=0|CV=0|P=1| + or %l1, 0x0741, %l2 ! And low 13 bits IE=0|E=0|CP=1|CV=1|P=1| ! X=0|W=1|SW=00|SZ=0001 /*
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Apr 5 20:34:00 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: Ensure that the TTEs CP and CV bits are the same (both set) for the primary cpu and secondary cpus INTSTACK mappings To generate a diff of this commit: cvs rdiff -u -r1.383 -r1.384 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Sun Apr 5 20:41:06 UTC 2015 Modified Files: src/lib/libc/sys: bind.2 Log Message: Sort errors. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/sys/bind.2 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/sys/bind.2 diff -u src/lib/libc/sys/bind.2:1.28 src/lib/libc/sys/bind.2:1.29 --- src/lib/libc/sys/bind.2:1.28 Sun Apr 5 20:33:45 2015 +++ src/lib/libc/sys/bind.2 Sun Apr 5 20:41:05 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: bind.2,v 1.28 2015/04/05 20:33:45 rtr Exp $ +.\ $NetBSD: bind.2,v 1.29 2015/04/05 20:41:05 wiz Exp $ .\ .\ Copyright (c) 1983, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)bind.2 8.1 (Berkeley) 6/4/93 .\ -.Dd August 30, 2005 +.Dd April 5, 2015 .Dt BIND 2 .Os .Sh NAME @@ -77,40 +77,43 @@ The .Fn bind call will fail if: .Bl -tag -width Er -.It Bq Er EBADF -.Fa s -is not a valid descriptor. -.It Bq Er ENOTSOCK -.Fa s -is not a socket. +.It Bq Er EACCES +The requested address is protected, and the current user +has inadequate permission to access it. +.It Bq Er EADDRINUSE +The specified address is already in use. .It Bq Er EADDRNOTAVAIL The specified address is not available from the local machine. .It Bq Er EAFNOSUPPORT Addresses in the specified address family cannot be used with this socket. -.It Bq Er EADDRINUSE -The specified address is already in use. -.It Bq Er EINVAL -The socket is already bound to an address. -.It Bq Er EINVAL -The family of the socket and that requested in -.Fa name-\*[Gt]sa_family -are not equivalent. -.It Bq Er EACCES -The requested address is protected, and the current user -has inadequate permission to access it. +.It Bq Er EBADF +.Fa s +is not a valid descriptor. .It Bq Er EFAULT The .Fa name parameter is not in a valid part of the user address space. +.It Bq Er EINVAL +The socket is already bound to an address; or +the family of the socket and that requested in +.Fa name-\*[Gt]sa_family +are not equivalent. +.It Bq Er ENOTSOCK +.Fa s +is not a socket. .El .Pp The following errors are specific to binding names in the .Ux domain. .Bl -tag -width Er -.It Bq Er ENOTDIR -A component of the path prefix is not a directory. +.It Bq Er EIO +An I/O error occurred while making the directory entry or allocating the inode. +.It Bq Er EISDIR +An empty pathname was specified. +.It Bq Er ELOOP +Too many symbolic links were encountered in translating the pathname. .It Bq Er ENAMETOOLONG A component of a pathname exceeded .Brq Dv NAME_MAX @@ -119,14 +122,10 @@ characters, or an entire path name excee characters. .It Bq Er ENOENT A prefix component of the path name does not exist. -.It Bq Er ELOOP -Too many symbolic links were encountered in translating the pathname. -.It Bq Er EIO -An I/O error occurred while making the directory entry or allocating the inode. +.It Bq Er ENOTDIR +A component of the path prefix is not a directory. .It Bq Er EROFS The name would reside on a read-only file system. -.It Bq Er EISDIR -An empty pathname was specified. .El .Sh SEE ALSO .Xr connect 2 ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Sun Apr 5 20:41:06 UTC 2015 Modified Files: src/lib/libc/sys: bind.2 Log Message: Sort errors. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/sys/bind.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
