CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: uebayasi Date: Sun Jan 4 07:34:14 UTC 2015 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: Include files.sljit as i386/amd64 do. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/xen/conf/files.xen 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/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.136 src/sys/arch/xen/conf/files.xen:1.137 --- src/sys/arch/xen/conf/files.xen:1.136 Mon Dec 15 13:48:51 2014 +++ src/sys/arch/xen/conf/files.xen Sun Jan 4 07:34:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.136 2014/12/15 13:48:51 christos Exp $ +# $NetBSD: files.xen,v 1.137 2015/01/04 07:34:14 uebayasi Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -109,6 +109,12 @@ file dev/cons.c # +# Stack-less Just-In-Time compiler +# + +include "external/bsd/sljit/conf/files.sljit" + +# # Machine-independent SCSI drivers #
CVS commit: src/sys/conf
Module Name:src Committed By: uebayasi Date: Sun Jan 4 07:32:32 UTC 2015 Modified Files: src/sys/conf: files Log Message: Set BPFJIT flag in opt_bpf.h which is included by bpf.c. To generate a diff of this commit: cvs rdiff -u -r1.1122 -r1.1123 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1122 src/sys/conf/files:1.1123 --- src/sys/conf/files:1.1122 Sat Dec 27 01:18:48 2014 +++ src/sys/conf/files Sun Jan 4 07:32:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1122 2014/12/27 01:18:48 jmcneill Exp $ +# $NetBSD: files,v 1.1123 2015/01/04 07:32:32 uebayasi Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20141030 @@ -198,7 +198,7 @@ include "dev/sysmon/files.sysmon" define bpf_filter defparam opt_bpf.h BPF_BUFSIZE -defflag opt_bpfjit.h BPFJIT +defflag opt_bpf.h BPFJIT file net/bpfjit.c sljit & bpfjit
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sun Jan 4 03:55:11 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
set LDO5 to 3.3V and enable for emac
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/rockchip/rockchip_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.16 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.17
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.16 Sat Jan 3 16:15:25 2015
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Sun Jan 4 03:55:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.16 2015/01/03 16:15:25 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.17 2015/01/04 03:55:11 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.16 2015/01/03 16:15:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.17 2015/01/04 03:55:11 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -765,6 +765,20 @@ rockchip_device_register(device_t self,
return;
}
+ if (device_is_a(self, "rkemac")) {
+#if NACT8846PM > 0
+ device_t pmic = device_find_by_driver_unit("act8846pm", 0);
+ if (pmic == NULL)
+ return;
+ struct act8846_ctrl *ctrl = act8846_lookup(pmic, "LDO5");
+ if (ctrl == NULL)
+ return;
+ act8846_set_voltage(ctrl, 3300, 3300);
+ act8846_enable(ctrl);
+#endif
+ return;
+ }
+
if (device_is_a(self, "ithdmi")) {
#if NACT8846PM > 0
device_t pmic = device_find_by_driver_unit("act8846pm", 0);
@@ -775,5 +789,6 @@ rockchip_device_register(device_t self,
return;
act8846_enable(ctrl);
#endif
+ return;
}
}
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Sun Jan 4 03:55:44 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: obio.c Log Message: RK3188 iomux/gpio setup for emac To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/rockchip/obio.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/rockchip/obio.c diff -u src/sys/arch/arm/rockchip/obio.c:1.11 src/sys/arch/arm/rockchip/obio.c:1.12 --- src/sys/arch/arm/rockchip/obio.c:1.11 Sat Jan 3 13:26:31 2015 +++ src/sys/arch/arm/rockchip/obio.c Sun Jan 4 03:55:44 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.11 2015/01/03 13:26:31 jmcneill Exp $ */ +/* $NetBSD: obio.c,v 1.12 2015/01/04 03:55:44 jmcneill Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -38,7 +38,7 @@ #include "opt_rockchip.h" #include -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2015/01/03 13:26:31 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12 2015/01/04 03:55:44 jmcneill Exp $"); #include #include @@ -198,6 +198,8 @@ obio_search(device_t parent, cfdata_t cf #define RK3188_GRF_SOC_CON2_OFFSET 0x00A8 #define RK3188_GRF_SOC_STATUS_OFFSET 0x00AC +#define RK3188_GRF_IO_CON3_OFFSET 0x0100 + #define GRF_GPIO0A_IOMUX_OFFSET 0x00a8 #define GRF_GPIO3A_IOMUX_OFFSET 0x00d8 #define GRF_GPIO3B_IOMUX_OFFSET 0x00dc @@ -212,6 +214,12 @@ void obio_init_grf(void) obio_iomux(RK3188_GRF_GPIO1D_IOMUX_OFFSET, 0x); /* I2C[0124] */ obio_iomux(RK3188_GRF_GPIO3B_IOMUX_OFFSET, 0xa000a000); /* I2C3 */ obio_iomux(RK3188_GRF_SOC_CON1_OFFSET, 0xf800f800); /* I2C[01234] */ + + obio_iomux(RK3188_GRF_GPIO0C_IOMUX_OFFSET, 0x0003); /* PHY */ + obio_iomux(RK3188_GRF_GPIO3C_IOMUX_OFFSET, 0x); /* PHY */ + obio_iomux(RK3188_GRF_GPIO3D_IOMUX_OFFSET, 0x003f000a); /* PHY */ + obio_iomux(RK3188_GRF_SOC_CON1_OFFSET, 0x00030002); /* VMAC */ + obio_iomux(RK3188_GRF_IO_CON3_OFFSET, 0x000f000f); /* VMAC */ #else /* ChipSPARK Rayeager PX2 */ obio_iomux(GRF_GPIO0A_IOMUX_OFFSET, 0x1400); /* VBUS */ @@ -248,6 +256,10 @@ void obio_init_gpio(void) obio_swporta(ROCKCHIP_GPIO2_OFFSET, GPIO_SWPORTA_DR_OFFSET, __BIT(31)); obio_swporta(ROCKCHIP_GPIO2_OFFSET, GPIO_SWPORTA_DD_OFFSET, __BIT(31)); + /* PHY */ + obio_swporta(ROCKCHIP_GPIO3_OFFSET, GPIO_SWPORTA_DR_OFFSET, __BIT(26)); + obio_swporta(ROCKCHIP_GPIO3_OFFSET, GPIO_SWPORTA_DD_OFFSET, __BIT(26)); + /* IT66121 HDMI */ obio_swporta(ROCKCHIP_GPIO3_OFFSET, GPIO_SWPORTA_DR_OFFSET, __BIT(10)); obio_swporta(ROCKCHIP_GPIO3_OFFSET, GPIO_SWPORTA_DD_OFFSET, __BIT(10));
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Jan 4 03:53:34 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ROCKCHIP Log Message: add rkemac, rgephy, ukphy To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/ROCKCHIP 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/ROCKCHIP diff -u src/sys/arch/evbarm/conf/ROCKCHIP:1.12 src/sys/arch/evbarm/conf/ROCKCHIP:1.13 --- src/sys/arch/evbarm/conf/ROCKCHIP:1.12 Sat Jan 3 13:27:11 2015 +++ src/sys/arch/evbarm/conf/ROCKCHIP Sun Jan 4 03:53:34 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ROCKCHIP,v 1.12 2015/01/03 13:27:11 jmcneill Exp $ +# $NetBSD: ROCKCHIP,v 1.13 2015/01/04 03:53:34 jmcneill Exp $ # # Rockchip RK3066/RK3188 based SBC (Single Board Computer) # @@ -200,6 +200,11 @@ dwcmmc0 at obio0 addr 0x10214000 size 0 sdmmc* at dwcmmc? ld* at sdmmc? +# Ethernet +rkemac0 at obio0 addr 0x10204000 size 0x4000 intr 51 +rgephy* at mii? phy ? +ukphy* at mii? phy ? + #options DWC_MMC_DEBUG #options SDMMC_DEBUG #options SDMMCCISDEBUG
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sun Jan 4 03:53:02 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: files.rockchip
Added Files:
src/sys/arch/arm/rockchip: rockchip_emac.c rockchip_emacreg.h
Log Message:
Add Rockchip ethernet driver, untested.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/files.rockchip
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/rockchip/rockchip_emac.c \
src/sys/arch/arm/rockchip/rockchip_emacreg.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/rockchip/files.rockchip
diff -u src/sys/arch/arm/rockchip/files.rockchip:1.8 src/sys/arch/arm/rockchip/files.rockchip:1.9
--- src/sys/arch/arm/rockchip/files.rockchip:1.8 Sat Jan 3 13:26:31 2015
+++ src/sys/arch/arm/rockchip/files.rockchip Sun Jan 4 03:53:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.rockchip,v 1.8 2015/01/03 13:26:31 jmcneill Exp $
+# $NetBSD: files.rockchip,v 1.9 2015/01/04 03:53:02 jmcneill Exp $
#
# Configuration info for Rockchip ARM Peripherals
#
@@ -45,6 +45,11 @@ file arch/arm/rockchip/rockchip_dwcmmc.c
attach dwctwo at obio with rkdwctwo
filearch/arm/rockchip/rockchip_dwctwo.c rkdwctwo needs-flag
+# VMAC Ethernet Controller
+device rkemac: arp, ether, ifnet, mii
+attach rkemac at obio
+file arch/arm/rockchip/rockchip_emac.c rkemac
+
# Console parameters
defparam opt_rockchip.h CONADDR
defparam opt_rockchip.h CONSPEED
@@ -56,3 +61,4 @@ defparam opt_rockchip.h MEMSIZE
# Debugging parameters
defflag opt_rockchip.h ROCKCHIP_CLOCK_DEBUG
defflag opt_rkiic.h RKIIC_DEBUG
+defflag opt_rkemac.h RKEMAC_DEBUG
Added files:
Index: src/sys/arch/arm/rockchip/rockchip_emac.c
diff -u /dev/null src/sys/arch/arm/rockchip/rockchip_emac.c:1.1
--- /dev/null Sun Jan 4 03:53:02 2015
+++ src/sys/arch/arm/rockchip/rockchip_emac.c Sun Jan 4 03:53:02 2015
@@ -0,0 +1,849 @@
+/* $NetBSD: rockchip_emac.c,v 1.1 2015/01/04 03:53:02 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR 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 "opt_rkemac.h"
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: rockchip_emac.c,v 1.1 2015/01/04 03:53:02 jmcneill Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+
+#define RKEMAC_ENABLE_INTR \
+ (EMAC_ENABLE_TXINT|EMAC_ENABLE_RXINT|EMAC_ENABLE_ERR)
+
+#define RKEMAC_RX_RING_COUNT 128
+#define RKEMAC_TX_RING_COUNT 128
+
+#define RKEMAC_MAX_PACKET 1536
+#define RKEMAC_POLLRATE 200
+
+#define RX_DESC_OFFSET(n) \
+ ((n) * sizeof(struct rkemac_rxdesc))
+#define RX_NEXT(n) (((n) + 1) & (RKEMAC_RX_RING_COUNT - 1))
+
+#define TX_DESC_OFFSET(n) \
+ ((RKEMAC_RX_RING_COUNT+(n)) * sizeof(struct rkemac_txdesc))
+#define TX_NEXT(n) (((n) + 1) & (RKEMAC_TX_RING_COUNT - 1))
+
+struct rkemac_rxdata {
+ bus_dmamap_t rd_map;
+ struct mbuf *rd_m;
+};
+
+struct rkemac_txdata {
+ bus_dmamap_t td_map;
+ bus_dmamap_t td_active;
+ struct mbuf *td_m;
+};
+
+struct rkemac_txring {
+ bus_addr_t t_physaddr;
+ struct rkemac_txdesc *t_desc;
+ struct rkemac_txdata t_data[RKEMAC_TX_RING_COUNT];
+ int t_cur, t_next, t_queued;
+};
+
+struct rkemac_rxring {
+ bus_addr_t r_physaddr;
+ struct rkemac_rxdesc *r_desc;
+ struct rkemac_rxdata r_data[RKEMAC_RX_RING_COUNT];
+ int r_cur, r_next;
+};
+
+struct rkemac_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ bus_dma_tag_t sc_dmat;
+ void *sc_ih;
+
+ struct ethercom sc_ec;
+ struct mii_data sc_mii;
+ callout_t sc_mii_tick;
+ kmutex_t sc_lock;
+
+ b
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Jan 4 01:52:24 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new yacc To generate a diff of this commit: cvs rdiff -u -r1.1188 -r1.1189 src/doc/3RDPARTY cvs rdiff -u -r1.2031 -r1.2032 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1188 src/doc/3RDPARTY:1.1189 --- src/doc/3RDPARTY:1.1188 Fri Jan 2 16:16:41 2015 +++ src/doc/3RDPARTY Sat Jan 3 20:52:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1188 2015/01/02 21:16:41 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1189 2015/01/04 01:52:24 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -196,8 +196,8 @@ is a FreeBSD committer who has been help in the past. Package: byacc -Version: 20130304 -Current Vers: 20130925 +Version: 20141128 +Current Vers: 20141128 Maintainer: Thomas Dickey Archive Site: http://www.invisible-island.net/byacc/byacc.html Home Page: http://www.invisible-island.net/byacc/byacc.html @@ -785,7 +785,7 @@ License: BSD 3-clause like (dns-sd) Responsible: christos Location: usr.bin/m4 Notes: -Uses libc's ohash, and strtonum +Uses libc's ohash Package: mDNSResponder Version: 320.16 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2031 src/doc/CHANGES:1.2032 --- src/doc/CHANGES:1.2031 Fri Jan 2 16:16:41 2015 +++ src/doc/CHANGES Sat Jan 3 20:52:24 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2031 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2032 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -117,3 +117,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: ntp: Import ntp 4.2.8. [christos 20141219] midirecord(1): Add program to record MIDI files. [mrg 20141229] file: update to 5.22 security limits [christos 20150102] + byacc: update to 20141128 for more bison compat [christos 20150103]
CVS commit: src/external/bsd/byacc
Module Name:src
Committed By: christos
Date: Sun Jan 4 01:34:20 UTC 2015
Modified Files:
src/external/bsd/byacc/dist: btyaccpar.c defs.h error.c main.c
mstring.c output.c reader.c yaccpar.c
src/external/bsd/byacc/include: config.h
Log Message:
Implement some more bison features (incomplete!!!)
This handles the mesa/gallium parser but the %error-verbose part needs a
little more work.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/byacc/dist/btyaccpar.c \
src/external/bsd/byacc/dist/yaccpar.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/main.c \
src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/btyaccpar.c
diff -u src/external/bsd/byacc/dist/btyaccpar.c:1.1.1.1 src/external/bsd/byacc/dist/btyaccpar.c:1.2
--- src/external/bsd/byacc/dist/btyaccpar.c:1.1.1.1 Sat Jan 3 17:58:23 2015
+++ src/external/bsd/byacc/dist/btyaccpar.c Sat Jan 3 20:34:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btyaccpar.c,v 1.1.1.1 2015/01/03 22:58:23 christos Exp $ */
+/* $NetBSD: btyaccpar.c,v 1.2 2015/01/04 01:34:20 christos Exp $ */
/* This file generated automatically using
* @Id: skel2c,v 1.3 2014/04/06 19:48:04 tom Exp @
@@ -451,6 +451,10 @@ const char *const body_2[] =
"fprintf(stderr, \"%sdebug[<# of symbols on state stack>]\\n\", YYPREFIX);",
"#endif",
"",
+0
+};
+
+const char *const body_3[] = {
#if defined(YYBTYACC)
"#if YYBTYACC",
"yyps = yyNewState(0); if (yyps == 0) goto yyenomem;",
Index: src/external/bsd/byacc/dist/yaccpar.c
diff -u src/external/bsd/byacc/dist/yaccpar.c:1.1.1.1 src/external/bsd/byacc/dist/yaccpar.c:1.2
--- src/external/bsd/byacc/dist/yaccpar.c:1.1.1.1 Sat Jan 3 17:58:23 2015
+++ src/external/bsd/byacc/dist/yaccpar.c Sat Jan 3 20:34:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yaccpar.c,v 1.1.1.1 2015/01/03 22:58:23 christos Exp $ */
+/* $NetBSD: yaccpar.c,v 1.2 2015/01/04 01:34:20 christos Exp $ */
/* This file generated automatically using
* @Id: skel2c,v 1.3 2014/04/06 19:48:04 tom Exp @
@@ -211,6 +211,11 @@ const char *const body_2[] =
"}",
"#endif",
"",
+0,
+};
+
+const char *const body_3[] =
+{
"yynerrs = 0;",
"yyerrflag = 0;",
"yychar = YYEMPTY;",
Index: src/external/bsd/byacc/dist/defs.h
diff -u src/external/bsd/byacc/dist/defs.h:1.8 src/external/bsd/byacc/dist/defs.h:1.9
--- src/external/bsd/byacc/dist/defs.h:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/defs.h Sat Jan 3 20:34:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: defs.h,v 1.9 2015/01/04 01:34:20 christos Exp $ */
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
@@ -123,10 +123,13 @@
#define LEX_PARAM 14
#define POSIX_YACC 15
#define TOKEN_TABLE 16
+#define ERROR_VERBOSE 17
+#define XXXDEBUG 18
#if defined(YYBTYACC)
-#define LOCATIONS 17
-#define DESTRUCTOR 18
+#define LOCATIONS 19
+#define DESTRUCTOR 20
+#define INITIAL_ACTION 21
#endif
/* symbol classes */
@@ -292,10 +295,12 @@ extern int outline;
extern int exit_code;
extern int pure_parser;
extern int token_table;
+extern int error_verbose;
#if defined(YYBTYACC)
extern int locations;
extern int backtrack;
extern int destructor;
+extern char *initial_action;
#endif
extern const char *const banner[];
@@ -308,6 +313,7 @@ extern const char *const hdr_vars[];
extern const char *const body_1[];
extern const char *const body_vars[];
extern const char *const body_2[];
+extern const char *const body_3[];
extern const char *const trailer[];
extern char *code_file_name;
@@ -432,7 +438,12 @@ extern void at_error(int a_lineno, char
extern void at_warning(int a_lineno, int i);
extern void bad_formals(void) GCC_NORETURN;
extern void default_action_warning(void);
-extern void destructor_redeclared_warning(int a_lineno, char *a_line, char *a_cptr);
+struct ainfo {
+ int a_lineno;
+ char *a_line;
+ char *a_cptr;
+};
+extern void destructor_redeclared_warning(const struct ainfo *);
extern void dollar_error(int a_lineno, char *a_line, char *a_cptr) GCC_NORETURN;
extern void dollar_warning(int a_lineno, int i);
extern void fatal(const char *msg) GCC_NORETURN;
@@ -459,16 +470,16 @@ extern void unexpected_EOF(void) GCC_NOR
extern void unknown_arg_warning(int d_lineno, const char *dlr_opt, const char *d_arg, const char *d_line, const char *d_cptr);
extern void unknown_rhs(int i) GCC_NORETURN;
extern void unsupported_flag_warning(const char *flag,
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sun Jan 4 01:26:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
don't regenerate y->
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.2 src/external/mit/xorg/lib/gallium/Makefile:1.3
--- src/external/mit/xorg/lib/gallium/Makefile:1.2 Tue Dec 23 12:49:59 2014
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Jan 3 20:26:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/12/23 17:49:59 christos Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/04 01:26:31 christos Exp $
# Link the gallium mega driver.
@@ -475,3 +475,5 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
.endfor
.include
+# Don't regenerate c files
+.y.c:
CVS commit: src/external/bsd/byacc
Module Name:src Committed By: christos Date: Sat Jan 3 23:22:53 UTC 2015 Modified Files: src/external/bsd/byacc/bin: Makefile src/external/bsd/byacc/dist: closure.c config_h.in defs.h error.c graph.c lalr.c lr0.c main.c mkpar.c mstring.c output.c reader.c symtab.c verbose.c yacc.1 Removed Files: src/external/bsd/byacc/dist: skeleton.c src/external/bsd/byacc/dist/test: calc.output calc.tab.c calc.tab.h calc1.output calc1.tab.c calc1.tab.h calc2.output calc2.tab.c calc2.tab.h calc3.output calc3.tab.c calc3.tab.h code_calc.code.c code_calc.output code_calc.tab.c code_calc.tab.h code_error.code.c code_error.output code_error.tab.c code_error.tab.h error.output error.tab.c error.tab.h ftp.output ftp.tab.c ftp.tab.h ftp.y grammar.output grammar.tab.c grammar.tab.h pure_calc.output pure_calc.tab.c pure_calc.tab.h pure_error.output pure_error.tab.c pure_error.tab.h quote_calc-s.output quote_calc-s.tab.c quote_calc-s.tab.h quote_calc.output quote_calc.tab.c quote_calc.tab.h quote_calc2-s.output quote_calc2-s.tab.c quote_calc2-s.tab.h quote_calc2.output quote_calc2.tab.c quote_calc2.tab.h quote_calc3-s.output quote_calc3-s.tab.c quote_calc3-s.tab.h quote_calc3.output quote_calc3.tab.c quote_calc3.tab.h quote_calc4-s.output quote_calc4-s.tab.c quote_calc4-s.tab.h quote_calc4.output quote_calc4.tab.c quote_calc4.tab.h Log Message: merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/bin/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/closure.c \ src/external/bsd/byacc/dist/defs.h src/external/bsd/byacc/dist/lr0.c \ src/external/bsd/byacc/dist/mkpar.c src/external/bsd/byacc/dist/symtab.c \ src/external/bsd/byacc/dist/verbose.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/config_h.in \ src/external/bsd/byacc/dist/graph.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/error.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/lalr.c \ src/external/bsd/byacc/dist/yacc.1 cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/main.c \ src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/byacc/dist/mstring.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.14 -r0 src/external/bsd/byacc/dist/skeleton.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/byacc/dist/test/calc.output \ src/external/bsd/byacc/dist/test/calc1.output \ src/external/bsd/byacc/dist/test/calc2.output \ src/external/bsd/byacc/dist/test/calc3.output \ src/external/bsd/byacc/dist/test/code_calc.output \ src/external/bsd/byacc/dist/test/code_error.output \ src/external/bsd/byacc/dist/test/error.output \ src/external/bsd/byacc/dist/test/grammar.output \ src/external/bsd/byacc/dist/test/pure_calc.output \ src/external/bsd/byacc/dist/test/pure_error.output \ src/external/bsd/byacc/dist/test/quote_calc-s.output \ src/external/bsd/byacc/dist/test/quote_calc-s.tab.c \ src/external/bsd/byacc/dist/test/quote_calc-s.tab.h \ src/external/bsd/byacc/dist/test/quote_calc.output \ src/external/bsd/byacc/dist/test/quote_calc.tab.c \ src/external/bsd/byacc/dist/test/quote_calc.tab.h \ src/external/bsd/byacc/dist/test/quote_calc2-s.output \ src/external/bsd/byacc/dist/test/quote_calc2-s.tab.c \ src/external/bsd/byacc/dist/test/quote_calc2-s.tab.h \ src/external/bsd/byacc/dist/test/quote_calc2.output \ src/external/bsd/byacc/dist/test/quote_calc2.tab.c \ src/external/bsd/byacc/dist/test/quote_calc2.tab.h \ src/external/bsd/byacc/dist/test/quote_calc3-s.output \ src/external/bsd/byacc/dist/test/quote_calc3-s.tab.c \ src/external/bsd/byacc/dist/test/quote_calc3-s.tab.h \ src/external/bsd/byacc/dist/test/quote_calc3.output \ src/external/bsd/byacc/dist/test/quote_calc3.tab.c \ src/external/bsd/byacc/dist/test/quote_calc3.tab.h \ src/external/bsd/byacc/dist/test/quote_calc4-s.output \ src/external/bsd/byacc/dist/test/quote_calc4-s.tab.c \ src/external/bsd/byacc/dist/test/quote_calc4-s.tab.h \ src/external/bsd/byacc/dist/test/quote_calc4.output \ src/external/bsd/byacc/dist/test/quote_calc4.tab.c \ src/external/bsd/byacc/dist/test/quote_calc4.tab.h cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/byacc/dist/test/calc.tab.c \ src/external/bsd/byacc/dist/test/grammar.tab.c cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/byacc/dist/test/calc.tab.h \ src/external/bsd/byacc/dist/test/calc1.tab.h \ src/external/bsd/byacc/dist/test/calc2.tab.h \ src/external/bsd/byacc/dist/test/calc3.tab.h \ src/external/bsd/byacc/dist/test/code_calc.tab.c \ src/external/bsd/byacc/dist/test/code_calc.tab.h \ src/external/bsd/byacc/dist/te
CVS import: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Jan 3 22:58:26 UTC 2015 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28061 Log Message: Import byacc 20141128 Status: Vendor Tag: DICKEY Release Tags: byacc-20141128 U src/external/bsd/byacc/dist/install-sh U src/external/bsd/byacc/dist/ACKNOWLEDGEMENTS U src/external/bsd/byacc/dist/AUTHORS U src/external/bsd/byacc/dist/CHANGES N src/external/bsd/byacc/dist/MANIFEST U src/external/bsd/byacc/dist/NEW_FEATURES U src/external/bsd/byacc/dist/NOTES U src/external/bsd/byacc/dist/NO_WARRANTY U src/external/bsd/byacc/dist/README N src/external/bsd/byacc/dist/README.BTYACC U src/external/bsd/byacc/dist/VERSION U src/external/bsd/byacc/dist/aclocal.m4 N src/external/bsd/byacc/dist/btyaccpar.c N src/external/bsd/byacc/dist/btyaccpar.skel C src/external/bsd/byacc/dist/closure.c U src/external/bsd/byacc/dist/config.guess U src/external/bsd/byacc/dist/config.sub C src/external/bsd/byacc/dist/config_h.in U src/external/bsd/byacc/dist/configure U src/external/bsd/byacc/dist/configure.in C src/external/bsd/byacc/dist/defs.h U src/external/bsd/byacc/dist/descrip.mms C src/external/bsd/byacc/dist/error.c C src/external/bsd/byacc/dist/graph.c U src/external/bsd/byacc/dist/makefile.in C src/external/bsd/byacc/dist/lalr.c C src/external/bsd/byacc/dist/lr0.c C src/external/bsd/byacc/dist/main.c N src/external/bsd/byacc/dist/mstring.c C src/external/bsd/byacc/dist/mkpar.c C src/external/bsd/byacc/dist/output.c C src/external/bsd/byacc/dist/reader.c N src/external/bsd/byacc/dist/skel2c C src/external/bsd/byacc/dist/symtab.c C src/external/bsd/byacc/dist/verbose.c U src/external/bsd/byacc/dist/vmsbuild.com U src/external/bsd/byacc/dist/warshall.c C src/external/bsd/byacc/dist/yacc.1 N src/external/bsd/byacc/dist/yaccpar.skel N src/external/bsd/byacc/dist/yaccpar.c N src/external/bsd/byacc/dist/package/mingw-byacc.spec U src/external/bsd/byacc/dist/package/byacc.spec U src/external/bsd/byacc/dist/package/debian/changelog U src/external/bsd/byacc/dist/package/debian/prerm U src/external/bsd/byacc/dist/package/debian/copyright U src/external/bsd/byacc/dist/package/debian/control U src/external/bsd/byacc/dist/package/debian/docs U src/external/bsd/byacc/dist/package/debian/watch U src/external/bsd/byacc/dist/package/debian/postinst U src/external/bsd/byacc/dist/package/debian/compat U src/external/bsd/byacc/dist/package/debian/rules U src/external/bsd/byacc/dist/package/debian/source/format U src/external/bsd/byacc/dist/package/pkgsrc/Makefile U src/external/bsd/byacc/dist/package/pkgsrc/distinfo U src/external/bsd/byacc/dist/package/pkgsrc/PLIST U src/external/bsd/byacc/dist/package/pkgsrc/DESCR U src/external/bsd/byacc/dist/test/calc.y U src/external/bsd/byacc/dist/test/quote_calc3.y U src/external/bsd/byacc/dist/test/pure_calc.y N src/external/bsd/byacc/dist/test/err_syntax7b.y N src/external/bsd/byacc/dist/test/inherit2.y N src/external/bsd/byacc/dist/test/btyacc_destroy2.y N src/external/bsd/byacc/dist/test/err_syntax18.y N src/external/bsd/byacc/dist/test/err_syntax8a.y U src/external/bsd/byacc/dist/test/code_calc.y N src/external/bsd/byacc/dist/test/btyacc_demo.y N src/external/bsd/byacc/dist/test/ok_syntax1.y N src/external/bsd/byacc/dist/test/err_inherit3.y N src/external/bsd/byacc/dist/test/err_syntax20.y U src/external/bsd/byacc/dist/test/README U src/external/bsd/byacc/dist/test/grammar.y U src/external/bsd/byacc/dist/test/calc1.y U src/external/bsd/byacc/dist/test/calc2.y N src/external/bsd/byacc/dist/test/err_syntax24.y U src/external/bsd/byacc/dist/test/pure_error.y U src/external/bsd/byacc/dist/test/run_lint.sh U src/external/bsd/byacc/dist/test/error.y N src/external/bsd/byacc/dist/test/err_syntax7a.y N src/external/bsd/byacc/dist/test/err_syntax15.y N src/external/bsd/byacc/dist/test/err_inherit2.y N src/external/bsd/byacc/dist/test/err_syntax12.y N src/external/bsd/byacc/dist/test/err_syntax4.y N src/external/bsd/byacc/dist/test/err_inherit1.y N src/external/bsd/byacc/dist/test/err_syntax8.y N src/external/bsd/byacc/dist/test/err_syntax7.y N src/external/bsd/byacc/dist/test/err_syntax14.y N src/external/bsd/byacc/dist/test/err_syntax25.y N src/external/bsd/byacc/dist/test/btyacc_calc1.y N src/external/bsd/byacc/dist/test/empty.y N src/external/bsd/byacc/dist/test/err_syntax6.y N src/external/bsd/byacc/dist/test/err_syntax13.y N src/external/bsd/byacc/dist/test/err_syntax19.y N src/external/bsd/byacc/dist/test/err_syntax3.y U src/external/bsd/byacc/dist/test/calc3.y U src/external/bsd/byacc/dist/test/quote_calc2.y N src/external/bsd/byacc/dist/test/err_syntax22.y U src/external/bsd/byacc/dist/test/run_test.sh N src/external/bsd/byacc/dist/test/err_syntax17.y N src/external/bsd/byacc/dist/test/err_syntax11.y N src/external/bsd/byacc/dist/test/inherit0.y N src/external/bsd/byacc/dist/test/varsyntax_calc1.y N src/external/bsd/byacc/dist/test/btyacc_destroy3.y N src/external/bsd/byacc
CVS commit: src/usr.bin/midirecord
Module Name:src
Committed By: joerg
Date: Sat Jan 3 22:57:54 UTC 2015
Modified Files:
src/usr.bin/midirecord: midirecord.c
Log Message:
Mark debug_log as printf-like.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/midirecord/midirecord.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/midirecord/midirecord.c
diff -u src/usr.bin/midirecord/midirecord.c:1.5 src/usr.bin/midirecord/midirecord.c:1.6
--- src/usr.bin/midirecord/midirecord.c:1.5 Thu Jan 1 04:57:01 2015
+++ src/usr.bin/midirecord/midirecord.c Sat Jan 3 22:57:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: midirecord.c,v 1.5 2015/01/01 04:57:01 christos Exp $ */
+/* $NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $ */
/*
* Copyright (c) 2014 Matthew R. Green
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: midirecord.c,v 1.5 2015/01/01 04:57:01 christos Exp $");
+__RCSID("$NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $");
#endif
#include
@@ -75,7 +75,8 @@ static int tempo = 120;
static unsigned notes_per_beat = 24;
static bool ignore_timer_fail = false;
-static void debug_log(const char *, size_t, const char *, ...);
+static void debug_log(const char *, size_t, const char *, ...)
+__printflike(3, 4);
static size_t midi_event_local_to_output(seq_event_t, u_char *, size_t);
static size_t midi_event_timer_wait_abs_to_output(seq_event_t, u_char *,
size_t);
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: martin
Date: Sat Jan 3 18:12:12 UTC 2015
Modified Files:
src/sys/arch/sparc/include: ieeefp.h
Log Message:
Avoid defining macros from the namespace here (especially with
different values).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/include/ieeefp.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/sparc/include/ieeefp.h
diff -u src/sys/arch/sparc/include/ieeefp.h:1.8 src/sys/arch/sparc/include/ieeefp.h:1.9
--- src/sys/arch/sparc/include/ieeefp.h:1.8 Tue Mar 20 23:57:57 2012
+++ src/sys/arch/sparc/include/ieeefp.h Sat Jan 3 18:12:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieeefp.h,v 1.8 2012/03/20 23:57:57 christos Exp $ */
+/* $NetBSD: ieeefp.h,v 1.9 2015/01/03 18:12:12 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 6, 1995
@@ -12,14 +12,6 @@
#if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE)
-#define FE_INEXACT 0x01 /* imprecise (loss of precision) */
-#define FE_DIVBYZERO 0x02 /* divide-by-zero exception */
-#define FE_UNDERFLOW 0x04 /* overflow exception */
-#define FE_OVERFLOW 0x08 /* underflow exception */
-#define FE_INVALID 0x10 /* invalid operation exception */
-
-#define FE_ALL_EXCEPT 0x1f
-
#define FE_TONEAREST 0 /* round to nearest representable number */
#define FE_TOWARDZERO 1 /* round to zero (truncate) */
#define FE_UPWARD 2 /* round toward positive infinity */
@@ -28,17 +20,17 @@
#if !defined(_ISOC99_SOURCE)
typedef unsigned int fp_except;
-#define FP_X_IMP FE_INEXACT /* imprecise (loss of precision) */
-#define FP_X_DZ FE_DIVBYZERO /* divide-by-zero exception */
-#define FP_X_UFL FE_UNDERFLOW /* underflow exception */
-#define FP_X_OFL FE_OVERFLOW /* overflow exception */
-#define FP_X_INV FE_INVALID /* invalid operation exception */
+#define FP_X_IMP 0x01 /* imprecise (loss of precision) */
+#define FP_X_DZ 0x02 /* divide-by-zero exception */
+#define FP_X_UFL 0x04 /* underflow exception */
+#define FP_X_OFL 0x08 /* overflow exception */
+#define FP_X_INV 0x10 /* invalid operation exception */
typedef enum {
-FP_RN=FE_TONEAREST, /* round to nearest representable number */
-FP_RZ=FE_TOWARDZERO, /* round to zero (truncate) */
-FP_RP=FE_UPWARD, /* round toward positive infinity */
-FP_RM=FE_DOWNWARD /* round toward negative infinity */
+FP_RN=0, /* round to nearest representable number */
+FP_RZ=1, /* round to zero (truncate) */
+FP_RP=2, /* round toward positive infinity */
+FP_RM=3 /* round toward negative infinity */
} fp_rnd;
#endif /* !_ISOC99_SOURCE */
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Sat Jan 3 17:24:20 UTC 2015 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: limit visibility of sysproxy calls to where they are needed To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/rump/include/rump/rumpuser.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/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.113 src/sys/rump/include/rump/rumpuser.h:1.114 --- src/sys/rump/include/rump/rumpuser.h:1.113 Wed Jun 18 19:50:32 2014 +++ src/sys/rump/include/rump/rumpuser.h Sat Jan 3 17:24:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.113 2014/06/18 19:50:32 alnsn Exp $ */ +/* $NetBSD: rumpuser.h,v 1.114 2015/01/03 17:24:20 pooka Exp $ */ /* * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved. @@ -235,6 +235,7 @@ void rumpuser_dl_bootstrap(rump_modinit_ int rumpuser_daemonize_begin(void); int rumpuser_daemonize_done(int); +#if defined(_RUMP_SYSPROXY) || defined(LIBRUMPUSER) /* * syscall proxy */ @@ -248,5 +249,6 @@ int rumpuser_sp_copyoutstr(void *, const int rumpuser_sp_anonmmap(void *, size_t, void **); int rumpuser_sp_raise(void *, int); void rumpuser_sp_fini(void *); +#endif /* _RUMP_SYSPROXY || LIBRUMPUSER */ #endif /* _RUMP_RUMPUSER_H_ */
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sat Jan 3 17:23:51 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c rump.c
rump_private.h rumpcopy.c signals.c vm.c
Added Files:
src/sys/rump/librump/rumpkern: sysproxy.c
Log Message:
Put all sysproxy routines to their own C module, sysproxy.c
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.168 -r1.169 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.312 -r1.313 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.85 -r1.86 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/librump/rumpkern/rumpcopy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/signals.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/sysproxy.c
cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/vm.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/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.151 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.152
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.151 Tue Dec 2 01:59:15 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sat Jan 3 17:23:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.151 2014/12/02 01:59:15 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.152 2015/01/03 17:23:51 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -28,7 +28,7 @@ MAN= rump.3 rump_lwproc.3
SRCS+= rump.c rumpcopy.c cons.c emul.c etfs_wrap.c intr.c \
lwproc.c klock.c kobj_rename.c ltsleep.c scheduler.c \
signals.c sleepq.c threads.c vm.c hyperentropy.c \
- accessors.c
+ accessors.c sysproxy.c
SRCS+= rumpkern_syscalls.c
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.168 src/sys/rump/librump/rumpkern/emul.c:1.169
--- src/sys/rump/librump/rumpkern/emul.c:1.168 Tue Nov 18 16:57:52 2014
+++ src/sys/rump/librump/rumpkern/emul.c Sat Jan 3 17:23:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.168 2014/11/18 16:57:52 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.169 2015/01/03 17:23:51 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.168 2014/11/18 16:57:52 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.169 2015/01/03 17:23:51 pooka Exp $");
#include
#include
@@ -382,7 +382,7 @@ cpu_reboot(int howto, char *bootstr)
/* your wish is my command */
if (howto & RB_HALT) {
printf("rump kernel halted\n");
- rumpuser_sp_fini(finiarg);
+ rump_sysproxy_fini(finiarg);
for (;;) {
rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, 10, 0);
}
@@ -391,6 +391,6 @@ cpu_reboot(int howto, char *bootstr)
/* this function is __dead, we must exit */
out:
printf("halted\n");
- rumpuser_sp_fini(finiarg);
+ rump_sysproxy_fini(finiarg);
rumpuser_exit(ruhow);
}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.312 src/sys/rump/librump/rumpkern/rump.c:1.313
--- src/sys/rump/librump/rumpkern/rump.c:1.312 Mon Aug 25 18:44:02 2014
+++ src/sys/rump/librump/rumpkern/rump.c Sat Jan 3 17:23:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.312 2014/08/25 18:44:02 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.313 2015/01/03 17:23:51 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.312 2014/08/25 18:44:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.313 2015/01/03 17:23:51 pooka Exp $");
#include
#define ELFSIZE ARCH_ELFSIZE
@@ -101,11 +101,6 @@ int rump_threads = 0;
int rump_threads = 1;
#endif
-static int rump_hyp_syscall(int, void *, long *);
-static int rump_hyp_rfork(void *, int, const char *);
-static void rump_hyp_lwpexit(void);
-static void rump_hyp_execnotify(const char *);
-
static void rump_component_addlocal(void);
static struct lwp *bootlwp;
@@ -154,14 +149,6 @@ mksysctls(void)
CTL_HW, HW_PAGESIZE, CTL_EOL);
}
-/* there's no convenient kernel entry point for this, so just craft out own */
-static pid_t
-spgetpid(void)
-{
-
- return curproc->p_pid;
-}
-
static const struct rumpuser_hyperup hyp = {
.hyp_schedule = rump_schedule,
.hyp_unschedule = rump_unschedule,
@@ -169,13 +156,13 @@ static const struct rumpuser_hyperup hyp
.hyp_backend_schedule = rump_user_schedule,
.hyp_lwproc_switch = rump_lwproc_switch,
.hyp_lwproc_release = rump_lwproc_releaselwp,
- .hyp_lwproc_rfork = rump_hyp_rfork,
+ .hyp_lwproc_rfork = rump_sysproxy_hyp_rfork,
.hyp_lwproc_newlwp = rump_lwproc_newlwp,
.hyp_lwproc_curlwp = rump_lwproc_curlwp,
- .hyp_lwpexit = rump_hyp_lwpexit,
- .hyp_syscall = rump_hyp_syscall,
- .hyp_execnotify = rump_hyp_execnotif
CVS commit: src/sys/arch/mac68k/obio
Module Name:src Committed By: christos Date: Sat Jan 3 16:44:15 UTC 2015 Modified Files: src/sys/arch/mac68k/obio: iwm_fd.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mac68k/obio/iwm_fd.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/mac68k/obio/iwm_fd.c diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.54 src/sys/arch/mac68k/obio/iwm_fd.c:1.55 --- src/sys/arch/mac68k/obio/iwm_fd.c:1.54 Fri Jan 2 14:42:05 2015 +++ src/sys/arch/mac68k/obio/iwm_fd.c Sat Jan 3 11:44:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: iwm_fd.c,v 1.54 2015/01/02 19:42:05 christos Exp $ */ +/* $NetBSD: iwm_fd.c,v 1.55 2015/01/03 16:44:14 christos Exp $ */ /* * Copyright (c) 1997, 1998 Hauke Fath. All rights reserved. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.54 2015/01/02 19:42:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.55 2015/01/03 16:44:14 christos Exp $"); #include "locators.h" @@ -721,7 +721,7 @@ fdioctl(dev_t dev, u_long cmd, void *dat fd = iwm->fd[fdUnit]; result = 0; - error = disk_ioctl(&fd->diskIndfo, fdType, cmd, data, flag, l); + error = disk_ioctl(&fd->diskInfo, fdType, cmd, data, flag, l); if (error != EPASSTHROUGH) return error;
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: hannken Date: Sat Jan 3 16:30:32 UTC 2015 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: Always use (struct rumpfs_node **) as key to vcache operations. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.131 src/sys/rump/librump/rumpvfs/rumpfs.c:1.132 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.131 Thu Jan 1 16:02:50 2015 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Sat Jan 3 16:30:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.131 2015/01/01 16:02:50 hannken Exp $ */ +/* $NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.131 2015/01/01 16:02:50 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken Exp $"); #include #include @@ -486,7 +486,7 @@ etfsremove(const char *key) mp = NULL; } mutex_exit(&reclock); - if (mp && vcache_get(mp, rn, sizeof(rn), &vp) == 0) + if (mp && vcache_get(mp, &rn, sizeof(rn), &vp) == 0) vgone(vp); } @@ -1588,7 +1588,7 @@ rump_vop_reclaim(void *v) struct vnode *vp = ap->a_vp; struct rumpfs_node *rn = vp->v_data; - vcache_remove(vp->v_mount, &vp->v_data, sizeof(vp->v_data)); + vcache_remove(vp->v_mount, &rn, sizeof(rn)); mutex_enter(&reclock); rn->rn_vp = NULL; mutex_exit(&reclock);
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src Committed By: jmcneill Date: Sat Jan 3 16:15:25 UTC 2015 Modified Files: src/sys/arch/evbarm/rockchip: rockchip_machdep.c Log Message: build fix To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/rockchip/rockchip_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.15 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.16 --- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.15 Sat Jan 3 13:28:00 2015 +++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Sat Jan 3 16:15:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rockchip_machdep.c,v 1.15 2015/01/03 13:28:00 jmcneill Exp $ */ +/* $NetBSD: rockchip_machdep.c,v 1.16 2015/01/03 16:15:25 jmcneill Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.15 2015/01/03 13:28:00 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.16 2015/01/03 16:15:25 jmcneill Exp $"); #include "opt_machdep.h" #include "opt_ddb.h" @@ -760,7 +760,7 @@ rockchip_device_register(device_t self, struct act8846_ctrl *ctrl = act8846_lookup(pmic, "DCDC4"); if (ctrl == NULL) return; - int error = act8846_set_voltage(ctrl, 3300, 3300); + act8846_set_voltage(ctrl, 3300, 3300); #endif return; }
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: gson
Date: Sat Jan 3 14:23:53 UTC 2015
Modified Files:
src/tests/lib/libm: Makefile t_fmod.c
Log Message:
Mark the lib/libm/t_fmod test as an expected failure under QEMU,
with a reference to PR misc/44767.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/tests/lib/libm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libm/t_fmod.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/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.30 src/tests/lib/libm/Makefile:1.31
--- src/tests/lib/libm/Makefile:1.30 Sat Dec 27 17:55:05 2014
+++ src/tests/lib/libm/Makefile Sat Jan 3 14:23:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/12/27 17:55:05 martin Exp $
+# $NetBSD: Makefile,v 1.31 2015/01/03 14:23:53 gson Exp $
.include
@@ -16,6 +16,8 @@ CPPFLAGS+= -DHAVE_FENV_H
COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.endif
+CPPFLAGS.t_fmod.c+= -I${.CURDIR}/../libc/gen
+
TESTS_C+= t_acos
TESTS_C+= t_asin
TESTS_C+= t_atan
Index: src/tests/lib/libm/t_fmod.c
diff -u src/tests/lib/libm/t_fmod.c:1.2 src/tests/lib/libm/t_fmod.c:1.3
--- src/tests/lib/libm/t_fmod.c:1.2 Thu Feb 27 17:26:02 2014
+++ src/tests/lib/libm/t_fmod.c Sat Jan 3 14:23:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fmod.c,v 1.2 2014/02/27 17:26:02 joerg Exp $ */
+/* $NetBSD: t_fmod.c,v 1.3 2015/01/03 14:23:53 gson Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
#include
#include
+#include "isqemu.h"
+
ATF_TC(fmod);
ATF_TC_HEAD(fmod, tc)
{
@@ -41,6 +43,9 @@ ATF_TC_HEAD(fmod, tc)
ATF_TC_BODY(fmod, tc)
{
+ if (isQEMU())
+ atf_tc_expect_fail("PR misc/44767");
+
ATF_CHECK(fmodf(2.0, 1.0) == 0);
ATF_CHECK(fmod(2.0, 1.0) == 0);
ATF_CHECK(fmodl(2.0, 1.0) == 0);
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: gson Date: Sat Jan 3 14:21:05 UTC 2015 Modified Files: src/tests/lib/libc/gen: isqemu.h Log Message: Need stdlib.h for EXIT_FAILURE To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/isqemu.h 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/gen/isqemu.h diff -u src/tests/lib/libc/gen/isqemu.h:1.3 src/tests/lib/libc/gen/isqemu.h:1.4 --- src/tests/lib/libc/gen/isqemu.h:1.3 Sun Apr 14 12:46:29 2013 +++ src/tests/lib/libc/gen/isqemu.h Sat Jan 3 14:21:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: isqemu.h,v 1.3 2013/04/14 12:46:29 martin Exp $ */ +/* $NetBSD: isqemu.h,v 1.4 2015/01/03 14:21:05 gson Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Sat Jan 3 13:29:02 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_dwcmmc.c Log Message: with 3.3V we can run this at 48MHz To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rockchip_dwcmmc.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/rockchip/rockchip_dwcmmc.c diff -u src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.4 src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.5 --- src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.4 Mon Dec 29 23:59:52 2014 +++ src/sys/arch/arm/rockchip/rockchip_dwcmmc.c Sat Jan 3 13:29:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rockchip_dwcmmc.c,v 1.4 2014/12/29 23:59:52 jmcneill Exp $ */ +/* $NetBSD: rockchip_dwcmmc.c,v 1.5 2015/01/03 13:29:02 jmcneill Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rockchip_dwcmmc.c,v 1.4 2014/12/29 23:59:52 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rockchip_dwcmmc.c,v 1.5 2015/01/03 13:29:02 jmcneill Exp $"); #include #include @@ -71,7 +71,9 @@ rk_dwcmmc_attach(device_t parent, device sc->sc_flags = DWC_MMC_F_USE_HOLD_REG | DWC_MMC_F_PWREN_CLEAR | DWC_MMC_F_FORCE_CLK; sc->sc_clock_freq = rockchip_mmc0_get_rate(); +#if 0 sc->sc_clock_max = 24000; +#endif sc->sc_fifo_depth = 32; bus_space_subregion(obio->obio_bst, obio->obio_bsh, obio->obio_offset,
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sat Jan 3 13:28:00 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
set DCDC4 to 3.3V for mmc0
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/rockchip/rockchip_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.14 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.15
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.14 Fri Jan 2 22:00:02 2015
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Sat Jan 3 13:28:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.14 2015/01/02 22:00:02 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.15 2015/01/03 13:28:00 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.14 2015/01/02 22:00:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.15 2015/01/03 13:28:00 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -752,6 +752,19 @@ rockchip_device_register(device_t self,
}
#endif
+ if (device_is_a(self, "dwcmmc") && device_unit(self) == 0) {
+#if NACT8846PM > 0
+ device_t pmic = device_find_by_driver_unit("act8846pm", 0);
+ if (pmic == NULL)
+ return;
+ struct act8846_ctrl *ctrl = act8846_lookup(pmic, "DCDC4");
+ if (ctrl == NULL)
+ return;
+ int error = act8846_set_voltage(ctrl, 3300, 3300);
+#endif
+ return;
+ }
+
if (device_is_a(self, "ithdmi")) {
#if NACT8846PM > 0
device_t pmic = device_find_by_driver_unit("act8846pm", 0);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Jan 3 13:27:11 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ROCKCHIP Log Message: attach rktimer and rkiic early To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/ROCKCHIP 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/ROCKCHIP diff -u src/sys/arch/evbarm/conf/ROCKCHIP:1.11 src/sys/arch/evbarm/conf/ROCKCHIP:1.12 --- src/sys/arch/evbarm/conf/ROCKCHIP:1.11 Fri Jan 2 23:20:49 2015 +++ src/sys/arch/evbarm/conf/ROCKCHIP Sat Jan 3 13:27:11 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ROCKCHIP,v 1.11 2015/01/02 23:20:49 jmcneill Exp $ +# $NetBSD: ROCKCHIP,v 1.12 2015/01/03 13:27:11 jmcneill Exp $ # # Rockchip RK3066/RK3188 based SBC (Single Board Computer) # @@ -179,19 +179,19 @@ com0 at obio0 addr 0x20064000 size 0x40 options CONSADDR=0x20064000, CONSPEED=115200 # Timer -rktimer0 at obio0 addr 0x20038000 size 0x2000 +rktimer0 at obio0 addr 0x20038000 size 0x2000 crit 1 # I2C controllers -rkiic0 at obio0 addr 0x2002d000 size 0x1000 intr 72 port 0 +rkiic0 at obio0 addr 0x2002d000 size 0x1000 intr 72 port 0 crit 1 iic0 at rkiic0 -rkiic1 at obio0 addr 0x2002f000 size 0x1000 intr 73 port 1 +rkiic1 at obio0 addr 0x2002f000 size 0x1000 intr 73 port 1 crit 1 iic1 at rkiic1 act8846pm0 at iic1 addr 0x5a -rkiic2 at obio0 addr 0x20056000 size 0x2000 intr 74 port 2 +rkiic2 at obio0 addr 0x20056000 size 0x2000 intr 74 port 2 crit 1 iic2 at rkiic2 -rkiic3 at obio0 addr 0x2005a000 size 0x2000 intr 75 port 3 +rkiic3 at obio0 addr 0x2005a000 size 0x2000 intr 75 port 3 crit 1 iic3 at rkiic3 -rkiic4 at obio0 addr 0x2005e000 size 0x2000 intr 84 port 4 +rkiic4 at obio0 addr 0x2005e000 size 0x2000 intr 84 port 4 crit 1 iic4 at rkiic4 # SD/MMC
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sat Jan 3 13:26:31 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: files.rockchip obio.c
Log Message:
attach devices marked "crit 1" first
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/files.rockchip
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/obio.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/rockchip/files.rockchip
diff -u src/sys/arch/arm/rockchip/files.rockchip:1.7 src/sys/arch/arm/rockchip/files.rockchip:1.8
--- src/sys/arch/arm/rockchip/files.rockchip:1.7 Fri Jan 2 23:20:18 2015
+++ src/sys/arch/arm/rockchip/files.rockchip Sat Jan 3 13:26:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.rockchip,v 1.7 2015/01/02 23:20:18 jmcneill Exp $
+# $NetBSD: files.rockchip,v 1.8 2015/01/03 13:26:31 jmcneill Exp $
#
# Configuration info for Rockchip ARM Peripherals
#
@@ -19,7 +19,7 @@ file arch/arm/rockchip/rockchip_dma.c
file arch/arm/arm/bus_space_a4x.S obio
# On-board I/O
-device obio {[addr = -1], [size = -1], [width = -1], [intr = -1], [mult = 1], [port = -1]}: bus_space_generic
+device obio {[addr = -1], [size = -1], [width = -1], [intr = -1], [mult = 1], [port = -1], [crit = 0]}: bus_space_generic
attach obio at mainbus
file arch/arm/rockchip/obio.c obio
Index: src/sys/arch/arm/rockchip/obio.c
diff -u src/sys/arch/arm/rockchip/obio.c:1.10 src/sys/arch/arm/rockchip/obio.c:1.11
--- src/sys/arch/arm/rockchip/obio.c:1.10 Fri Jan 2 23:23:17 2015
+++ src/sys/arch/arm/rockchip/obio.c Sat Jan 3 13:26:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.10 2015/01/02 23:23:17 jmcneill Exp $ */
+/* $NetBSD: obio.c,v 1.11 2015/01/03 13:26:31 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_rockchip.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2015/01/02 23:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2015/01/03 13:26:31 jmcneill Exp $");
#include
#include
@@ -101,9 +101,11 @@ obio_attach(device_t parent, device_t se
/*
* Attach all on-board devices as described in the kernel
- * configuration file.
+ * configuration file. Attach devices marked "crit 1" first.
*/
- config_search_ia(obio_search, self, "obio", NULL);
+ for (int crit = 1; crit >= 0; crit--) {
+ config_search_ia(obio_search, self, "obio", &crit);
+ }
}
int
@@ -131,6 +133,10 @@ obio_search(device_t parent, cfdata_t cf
{
struct obio_attach_args obio;
bus_addr_t addr = cf->cf_loc[OBIOCF_ADDR];
+ int crit = *(int *)aux;
+
+ if (cf->cf_loc[OBIOCF_CRIT] != crit)
+ return 0;
if (addr >= ROCKCHIP_CORE0_BASE &&
addr < ROCKCHIP_CORE0_BASE + ROCKCHIP_CORE0_SIZE) {
CVS commit: src/tools
Module Name:src Committed By: apb Date: Sat Jan 3 13:20:11 UTC 2015 Modified Files: src/tools: README Log Message: Update documentation about tools being restricted to C89 (or not). It's not practical for the C89 restriction to be maintained for compilers, but it is still desirable for most tools. The "long long" data type is in wide use despite not being in C89. C99 library features (as opposed to language features) can often be added to the compat framework when the need becomes apparent. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tools/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/README diff -u src/tools/README:1.3 src/tools/README:1.4 --- src/tools/README:1.3 Tue Sep 30 07:34:50 2014 +++ src/tools/README Sat Jan 3 13:20:11 2015 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.3 2014/09/30 07:34:50 apb Exp $ +$NetBSD: README,v 1.4 2015/01/03 13:20:11 apb Exp $ Notes for NetBSD src/tools @@ -28,12 +28,20 @@ Portability Programs that are built as tools need to be more portable than other parts of NetBSD, because they will need to run on the host platform. -Tools should restrict themselves to C language features that are defined -in C89 (ISO 9899-1989); they should avoid using C99 features. - -Tools may library features defined in C89 and in POSIX (IEEE Std 1003.1) -(XXX year?), and features that are provided by the src/tools/compat -framework described below. +Most tools should restrict themselves to C language features that are +defined in C89 (ISO 9899-1989); they should avoid using C99 language +features. There are a few tools, such as compilers, where it is not +practical for the C89 restriction to be maintained. There are also a +few features, such as the long long data type, that are used by many +tools despite not being defined in C89. + +Tools may use library features such as functions, macros, and +types, that are defined in C89 and in POSIX (IEEE Std 1003.1) (XXX +year?), and features that are provided by the compatibility framework +(src/tools/compat) described in a separate section below. This is +usually not an onerous burden, because many C99 library features, and +NetBSD-specific features, are already provided by src/tools/compat, or +can be added when the need for them becomes apparent. If a tool attempts to use a feature that is not available on the host platform, then the tools build will fail. This can be addressed by @@ -137,4 +145,3 @@ the program can use code like this: ... code to be used when FEATURE X is not desired, ... e.g. when being built as a tool. #endif -
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Sat Jan 3 13:16:41 UTC 2015
Modified Files:
src/lib/librumpuser: configure configure.ac
Log Message:
check that sys/cdefs.h builds with -Werror (not the case on alpine linux
where it contains an unconditional #warning)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/configure \
src/lib/librumpuser/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/configure
diff -u src/lib/librumpuser/configure:1.3 src/lib/librumpuser/configure:1.4
--- src/lib/librumpuser/configure:1.3 Wed Nov 5 01:40:30 2014
+++ src/lib/librumpuser/configure Sat Jan 3 13:16:41 2015
@@ -3646,7 +3646,7 @@ fi
done
-for ac_header in sys/cdefs.h sys/param.h sys/sysctl.h sys/disk.h \
+for ac_header in sys/param.h sys/sysctl.h sys/disk.h \
sys/disklabel.h sys/dkio.h sys/atomic.h paths.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4096,6 +4096,21 @@ fi
SAVE_CFLAGS="${CFLAGS}"
CFLAGS="${SAVE_CFLAGS} -Werror"
+
+for ac_header in sys/cdefs.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "#include
+"
+if test "x$ac_cv_header_sys_cdefs_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_CDEFS_H 1
+_ACEOF
+
+fi
+
+done
+
+
SAVE_LIBS="${LIBS}"
LIBS="${LIBS} -lpthread"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument pthread_setname_np()" >&5
Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.3 src/lib/librumpuser/configure.ac:1.4
--- src/lib/librumpuser/configure.ac:1.3 Wed Nov 5 01:40:30 2014
+++ src/lib/librumpuser/configure.ac Sat Jan 3 13:16:41 2015
@@ -19,7 +19,7 @@ AC_LANG([C])
AC_SYS_LARGEFILE
-AC_CHECK_HEADERS([sys/cdefs.h sys/param.h sys/sysctl.h sys/disk.h \
+AC_CHECK_HEADERS([sys/param.h sys/sysctl.h sys/disk.h \
sys/disklabel.h sys/dkio.h sys/atomic.h paths.h])
AC_CANONICAL_TARGET
@@ -52,6 +52,11 @@ dnl pthread_setname() sillyness is a bit
dnl
SAVE_CFLAGS="${CFLAGS}"
CFLAGS="${SAVE_CFLAGS} -Werror"
+
+dnl check sys/cdefs.h creatively to process only with cc, not cpp
+dnl (sys/cdefs.h in at least in musl contains a #warning)
+AC_CHECK_HEADERS([sys/cdefs.h], [], [], [#include ])
+
SAVE_LIBS="${LIBS}"
LIBS="${LIBS} -lpthread"
AC_MSG_CHECKING([for two-argument pthread_setname_np()])
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: prlw1
Date: Sat Jan 3 11:48:04 UTC 2015
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
Also print b_error in the IO Error message
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.321 src/sys/dev/raidframe/rf_netbsdkintf.c:1.322
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.321 Fri Jan 2 19:42:07 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Jan 3 11:48:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2279,8 +2279,9 @@ KernelWakeupFunc(struct buf *bp)
rf_ds_used_spare)) &&
(queue->raidPtr->numFailures <
queue->raidPtr->Layout.map->faultsTolerated)) {
- printf("raid%d: IO Error. Marking %s as failed.\n",
+ printf("raid%d: IO Error (%d). Marking %s as failed.\n",
queue->raidPtr->raidid,
+ bp->b_error,
queue->raidPtr->Disks[queue->col].devname);
queue->raidPtr->Disks[queue->col].status =
rf_ds_failed;
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: palle
Date: Sat Jan 3 11:22:14 UTC 2015
Modified Files:
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: ipifuncs.c
Log Message:
smp_tlb_flush_pte(): Avoid run-time check for cpu type/implementation by
installing correct function pointer in sparc64_ip_init(). sparc64_send_ipi() is
changed to a function pointer as well to avoid run-time checks.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/sparc64/ipifuncs.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/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.113 src/sys/arch/sparc64/include/cpu.h:1.114
--- src/sys/arch/sparc64/include/cpu.h:1.113 Wed Sep 24 18:32:10 2014
+++ src/sys/arch/sparc64/include/cpu.h Sat Jan 3 11:22:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.113 2014/09/24 18:32:10 palle Exp $ */
+/* $NetBSD: cpu.h,v 1.114 2015/01/03 11:22:14 palle Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -287,7 +287,7 @@ typedef void (* ipifunc_t)(void *, void
void sparc64_multicast_ipi(sparc64_cpuset_t, ipifunc_t, uint64_t, uint64_t);
void sparc64_broadcast_ipi(ipifunc_t, uint64_t, uint64_t);
-void sparc64_send_ipi(int, ipifunc_t, uint64_t, uint64_t);
+extern void (*sparc64_send_ipi)(int, ipifunc_t, uint64_t, uint64_t);
/*
* Call an arbitrary C function on another cpu (or all others but ourself)
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.53 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.54
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.53 Wed Nov 5 13:30:11 2014
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Sat Jan 3 11:22:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.54 2015/01/03 11:22:14 palle Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.54 2015/01/03 11:22:14 palle Exp $");
#include "opt_ddb.h"
@@ -68,6 +68,7 @@ static void sparc64_ipi_error(const char
/* Send IPI functions for supported platforms */
static void sparc64_send_ipi_sun4u(int, ipifunc_t, uint64_t, uint64_t);
static void sparc64_send_ipi_sun4v(int, ipifunc_t, uint64_t, uint64_t);
+void (*sparc64_send_ipi)(int, ipifunc_t, uint64_t, uint64_t) = NULL;
/*
* These are the "function" entry points in locore.s/mp_subr.s to handle IPI's.
@@ -83,6 +84,9 @@ void sparc64_ipi_dcache_flush_page_sun4v
void sparc64_ipi_blast_dcache(void *, void *);
void sparc64_ipi_ccall(void *, void *);
+/* Function pointer for use in smp_tlb_flush() - setup in sparc64_ipi_init() */
+static ipifunc_t smp_tlb_flush_pte_func = NULL;
+
/*
* Process cpu stop-self event.
*/
@@ -171,6 +175,23 @@ sparc64_ipi_init(void)
CPUSET_CLEAR(cpus_spinning);
CPUSET_CLEAR(cpus_paused);
CPUSET_CLEAR(cpus_resumed);
+
+ /*
+ * Prepare cpu type dependent function pointers
+ */
+
+ if (CPU_ISSUN4V)
+ smp_tlb_flush_pte_func = sparc64_ipi_flush_pte_sun4v;
+ else if (CPU_IS_USIII_UP())
+ smp_tlb_flush_pte_func = sparc64_ipi_flush_pte_usiii;
+ else
+ smp_tlb_flush_pte_func = sparc64_ipi_flush_pte_us;
+
+ if (CPU_ISSUN4V)
+ sparc64_send_ipi = sparc64_send_ipi_sun4v;
+ else
+ sparc64_send_ipi = sparc64_send_ipi_sun4u;
+
}
/*
@@ -206,19 +227,6 @@ sparc64_broadcast_ipi(ipifunc_t func, ui
}
/*
- * Send an interprocessor interrupt.
- */
-void
-sparc64_send_ipi(int upaid, ipifunc_t func, uint64_t arg1, uint64_t arg2)
-{
- if (CPU_ISSUN4V)
- sparc64_send_ipi_sun4v(upaid, func, arg1, arg2);
- else
- sparc64_send_ipi_sun4u(upaid, func, arg1, arg2);
-
-}
-
-/*
* Send an interprocessor interrupt - sun4v.
*/
void
@@ -438,14 +446,6 @@ smp_tlb_flush_pte(vaddr_t va, struct pma
struct cpu_info *ci;
int ctx;
bool kpm = (pm == pmap_kernel());
- ipifunc_t func;
- if (CPU_ISSUN4V)
- func = sparc64_ipi_flush_pte_sun4v;
- else if (CPU_IS_USIII_UP())
- func = sparc64_ipi_flush_pte_usiii;
- else
- func = sparc64_ipi_flush_pte_us;
-
/* Flush our own TLB */
ctx = pm->pm_ctx[cpu_number()];
KASSERT(ctx >= 0);
@@ -465,7 +465,7 @@ smp_tlb_flush_pte(vaddr_t va, struct pma
KASSERT(ctx >= 0);
if (!kpm && ctx == 0)
continue;
- sparc64_send_ipi(ci->ci_cpuid, func, va, ctx);
+ sparc64_send_ipi(ci->ci_cpuid, smp_tlb_flush_pte_func, va, ctx);
}
}
}
