CVS commit: src/sys/dev/usb
Module Name:src Committed By: ryoon Date: Sun Aug 6 02:33:13 UTC 2017 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen from previous changes of usbdevs to fix kernel build To generate a diff of this commit: cvs rdiff -u -r1.730 -r1.731 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.731 -r1.732 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.730 src/sys/dev/usb/usbdevs.h:1.731 --- src/sys/dev/usb/usbdevs.h:1.730 Tue Jun 27 08:09:50 2017 +++ src/sys/dev/usb/usbdevs.h Sun Aug 6 02:33:13 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.730 2017/06/27 08:09:50 wiz Exp $ */ +/* $NetBSD: usbdevs.h,v 1.731 2017/08/06 02:33:13 ryoon Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.737 2017/06/26 20:28:42 is Exp + * NetBSD: usbdevs,v 1.738 2017/07/09 19:37:33 christos Exp */ /* @@ -2732,6 +2732,7 @@ #define USB_PRODUCT_RALINK_RT2070 0x2070 /* RT2070 */ #define USB_PRODUCT_RALINK_RT2570_2 0x2570 /* RT2570 */ #define USB_PRODUCT_RALINK_RT2573 0x2573 /* RT2573 */ +#define USB_PRODUCT_RALINK_RT73 0x2578 /* RT73 */ #define USB_PRODUCT_RALINK_RT2671 0x2671 /* RT2671 */ #define USB_PRODUCT_RALINK_RT2770 0x2770 /* RT2770 */ #define USB_PRODUCT_RALINK_RT2870 0x2870 /* RT2870 */ @@ -2829,9 +2830,12 @@ #define USB_PRODUCT_ROLAND_UA101F 0x008d /* EDIROL UA-101 USB1 */ #define USB_PRODUCT_ROLAND_UA1EX 0x0096 /* EDIROL UA-1EX */ #define USB_PRODUCT_ROLAND_UM3 0x009A /* EDIROL UM-3 */ -#define USB_PRODUCT_ROLAND_UA4FX 0x00A3 /* EDIROL UA-4FX */ -#define USB_PRODUCT_ROLAND_SONICCELL 0x00C2 /* SonicCell */ +#define USB_PRODUCT_ROLAND_UA4FX 0x00a3 /* EDIROL UA-4FX */ +#define USB_PRODUCT_ROLAND_SONICCELL 0x00c2 /* SonicCell */ +#define USB_PRODUCT_ROLAND_UA25EXA 0x00e6 /* EDIROL UA-25EX (advanced) */ +#define USB_PRODUCT_ROLAND_UA25EX 0x00e7 /* EDIROL UA-25EX */ #define USB_PRODUCT_ROLAND_UMONE 0x012a /* UM-ONE MIDI I/F */ +#define USB_PRODUCT_ROLAND_QUADCAPTURE 0x012f /* QUAD-CAPTURE */ /* RT Systems products */ #define USB_PRODUCT_RTSYS_CT57A 0x9e51 /* CT57A Radio Cable */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.731 src/sys/dev/usb/usbdevs_data.h:1.732 --- src/sys/dev/usb/usbdevs_data.h:1.731 Tue Jun 27 08:09:50 2017 +++ src/sys/dev/usb/usbdevs_data.h Sun Aug 6 02:33:13 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.731 2017/06/27 08:09:50 wiz Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.732 2017/08/06 02:33:13 ryoon Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.737 2017/06/26 20:28:42 is Exp + * NetBSD: usbdevs,v 1.738 2017/07/09 19:37:33 christos Exp */ /* @@ -3656,8 +3656,10 @@ static const uint16_t usb_products[] = { 6619, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573, 5140, 0, - USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671, + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT73, 16180, 0, + USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671, + 16185, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2770, 4962, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2870, @@ -3669,53 +3671,53 @@ static const uint16_t usb_products[] = { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3072, 4990, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3370, - 16187, 0, + 16192, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3572, 5775, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3573, - 16194, 0, + 16199, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT5370, - 16201, 0, + 16206, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT5572, - 16208, 0, + 16213, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_MT7610U, 9228, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT8070, - 16215, 0, + 16220, 0, USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3, 6619, 0, USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, - 4743, 9396, 4782, 16222, 0, + 4743, 9396, 4782, 16227, 0, USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F, - 4743, 9396, 4782, 16232, 0, + 4743, 9396, 4782, 16237, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188ETV, - 16243, 0, + 16248, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CTV, - 16254, 0, + 16259, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_2, - 16265, 0, + 16270, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150L, - 16275, 16284, 1786, 0, + 16280, 16289, 1786, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8151, - 16297, 16305, 0, + 16302, 16310, 0, USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152, - 16309, 0, + 16314, 0, USB_
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: ginsbach Date: Sun Aug 6 01:55:22 UTC 2017 Modified Files: src/usr.sbin/rpcbind: warmstart.c Log Message: Fix compile warnings. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/rpcbind/warmstart.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.sbin/rpcbind/warmstart.c diff -u src/usr.sbin/rpcbind/warmstart.c:1.4 src/usr.sbin/rpcbind/warmstart.c:1.5 --- src/usr.sbin/rpcbind/warmstart.c:1.4 Sun Aug 6 01:02:44 2017 +++ src/usr.sbin/rpcbind/warmstart.c Sun Aug 6 01:55:21 2017 @@ -134,9 +134,9 @@ error: warnx("Will start from scratch"); void write_warmstart(void) { - (void)write_struct(RPCBFILE, xdr_rpcblist_ptr, &list_rbl); + (void)write_struct(RPCBFILE, (xdrproc_t) xdr_rpcblist_ptr, &list_rbl); #ifdef PORTMAP - (void)write_struct(PMAPFILE, xdr_pmaplist_ptr, &list_pml); + (void)write_struct(PMAPFILE, (xdrproc_t) xdr_pmaplist_ptr, &list_pml); #endif } @@ -150,11 +150,11 @@ read_warmstart(void) #endif int ok1, ok2 = TRUE; - ok1 = read_struct(RPCBFILE, xdr_rpcblist_ptr, &tmp_rpcbl); + ok1 = read_struct(RPCBFILE, (xdrproc_t) xdr_rpcblist_ptr, &tmp_rpcbl); if (ok1 == FALSE) return; #ifdef PORTMAP - ok2 = read_struct(PMAPFILE, xdr_pmaplist_ptr, &tmp_pmapl); + ok2 = read_struct(PMAPFILE, (xdrproc_t) xdr_pmaplist_ptr, &tmp_pmapl); #endif if (ok2 == FALSE) { xdr_free((xdrproc_t) xdr_rpcblist_ptr, (char *)&tmp_rpcbl);
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: ginsbach Date: Sun Aug 6 01:02:45 UTC 2017 Modified Files: src/usr.sbin/rpcbind: warmstart.c Log Message: Write the "warm start" file to /var/run rather than /tmp. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/rpcbind/warmstart.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.sbin/rpcbind/warmstart.c diff -u src/usr.sbin/rpcbind/warmstart.c:1.3 src/usr.sbin/rpcbind/warmstart.c:1.4 --- src/usr.sbin/rpcbind/warmstart.c:1.3 Fri Oct 12 21:24:01 2007 +++ src/usr.sbin/rpcbind/warmstart.c Sun Aug 6 01:02:44 2017 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -59,9 +60,9 @@ /* These files keep the pmap_list and rpcb_list in XDR format */ -#define RPCBFILE "/tmp/rpcbind.file" +#define RPCBFILE _PATH_VARRUN "rpcbind.file" #ifdef PORTMAP -#define PMAPFILE "/tmp/portmap.file" +#define PMAPFILE _PATH_VARRUN "portmap.file" #endif static bool_t write_struct(const char *, xdrproc_t, void *);
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Sat Aug 5 17:50:53 UTC 2017 Modified Files: src/sys/arch/arm/sunxi: sun8i_h3_ccu.c Log Message: add DMA gate To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sun8i_h3_ccu.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/sunxi/sun8i_h3_ccu.c diff -u src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.8 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.9 --- src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.8 Mon Jul 17 23:26:17 2017 +++ src/sys/arch/arm/sunxi/sun8i_h3_ccu.c Sat Aug 5 17:50:53 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i_h3_ccu.c,v 1.8 2017/07/17 23:26:17 jmcneill Exp $ */ +/* $NetBSD: sun8i_h3_ccu.c,v 1.9 2017/08/05 17:50:53 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -29,7 +29,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.8 2017/07/17 23:26:17 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.9 2017/08/05 17:50:53 jmcneill Exp $"); #include #include @@ -203,6 +203,8 @@ static struct sunxi_ccu_clk sun8i_h3_ccu SUNXI_CCU_PHASE(H3_CLK_MMC2_OUTPUT, "mmc2_output", "mmc2", SDMMC2_CLK_REG, __BITS(10,8)), + SUNXI_CCU_GATE(H3_CLK_BUS_DMA, "bus-dma", "ahb1", + BUS_CLK_GATING_REG0, 6), SUNXI_CCU_GATE(H3_CLK_BUS_MMC0, "bus-mmc0", "ahb1", BUS_CLK_GATING_REG0, 8), SUNXI_CCU_GATE(H3_CLK_BUS_MMC1, "bus-mmc1", "ahb1",
CVS commit: src/sys/dev
Module Name:src Committed By: nat Date: Sat Aug 5 13:34:06 UTC 2017 Modified Files: src/sys/dev: audio.c Log Message: Reset mixer ports on opening /dev/sound. This fixes an issue reported on port-arm@ by Brian Buhrow. To generate a diff of this commit: cvs rdiff -u -r1.385 -r1.386 src/sys/dev/audio.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/audio.c diff -u src/sys/dev/audio.c:1.385 src/sys/dev/audio.c:1.386 --- src/sys/dev/audio.c:1.385 Thu Aug 3 11:39:06 2017 +++ src/sys/dev/audio.c Sat Aug 5 13:34:06 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.385 2017/08/03 11:39:06 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.386 2017/08/05 13:34:06 nat Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss @@ -148,7 +148,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.385 2017/08/03 11:39:06 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.386 2017/08/05 13:34:06 nat Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -2229,6 +2229,8 @@ audio_open(dev_t dev, struct audio_softc error = audio_set_defaults(sc, mode, vc); if (!error && ISDEVSOUND(dev) && sc->sc_aivalid == true) { sc->sc_ai.mode = mode; + sc->sc_ai.play.port = ~0; + sc->sc_ai.record.port = ~0; error = audiosetinfo(sc, &sc->sc_ai, true, vc); } if (error)
CVS commit: src/usr.sbin/traceroute6
Module Name:src Committed By: wiz Date: Sat Aug 5 20:24:17 UTC 2017 Modified Files: src/usr.sbin/traceroute6: traceroute6.8 Log Message: Fix punctuation markup, remove superfluous Pp. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/traceroute6/traceroute6.8 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/traceroute6/traceroute6.8 diff -u src/usr.sbin/traceroute6/traceroute6.8:1.16 src/usr.sbin/traceroute6/traceroute6.8:1.17 --- src/usr.sbin/traceroute6/traceroute6.8:1.16 Fri Aug 4 02:08:21 2017 +++ src/usr.sbin/traceroute6/traceroute6.8 Sat Aug 5 20:24:17 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: traceroute6.8,v 1.16 2017/08/04 02:08:21 ginsbach Exp $ +.\" $NetBSD: traceroute6.8,v 1.17 2017/08/05 20:24:17 wiz Exp $ .\" $KAME: traceroute6.8,v 1.8 2000/06/12 16:29:18 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -93,7 +93,7 @@ is not specified, and only numeric addre is specified. .It Fl m Ar hoplimit Specify maximum -.Ar hoplimit, +.Ar hoplimit , up to 255. The default is 30 hops. .It Fl n @@ -151,7 +151,6 @@ in the same manner as traceroute. .Pp Here is a list of possible annotations after the round-trip time for each gateway: -.Pp .Bl -hang -offset indent .It !N Destination Unreachable - No Route to Host.
CVS commit: src/sbin/fsdb
Module Name:src Committed By: wiz Date: Sat Aug 5 20:25:41 UTC 2017 Modified Files: src/sbin/fsdb: fsdb.8 Log Message: Fix punctuation markup. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/fsdb/fsdb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsdb/fsdb.8 diff -u src/sbin/fsdb/fsdb.8:1.25 src/sbin/fsdb/fsdb.8:1.26 --- src/sbin/fsdb/fsdb.8:1.25 Fri Aug 4 07:19:35 2017 +++ src/sbin/fsdb/fsdb.8 Sat Aug 5 20:25:41 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: fsdb.8,v 1.25 2017/08/04 07:19:35 mrg Exp $ +.\" $NetBSD: fsdb.8,v 1.26 2017/08/05 20:25:41 wiz Exp $ .\" .\" Copyright (c) 1996, 2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -223,7 +223,7 @@ or .Va atimensec field will be set to zero. .Pp -.It Cm quit, Cm q, Cm exit, Aq Em EOF +.It Cm quit , Cm q , Cm exit , Aq Em EOF Exit the program. .El .Sh SEE ALSO
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Aug 5 17:52:06 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: SUNXI Log Message: Enable sun6idma To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/SUNXI 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/SUNXI diff -u src/sys/arch/evbarm/conf/SUNXI:1.19 src/sys/arch/evbarm/conf/SUNXI:1.20 --- src/sys/arch/evbarm/conf/SUNXI:1.19 Thu Jul 27 18:13:46 2017 +++ src/sys/arch/evbarm/conf/SUNXI Sat Aug 5 17:52:06 2017 @@ -1,5 +1,5 @@ # -# $NetBSD: SUNXI,v 1.19 2017/07/27 18:13:46 jmcneill Exp $ +# $NetBSD: SUNXI,v 1.20 2017/08/05 17:52:06 jmcneill Exp $ # # Allwinner sunxi family # @@ -91,6 +91,7 @@ armgic0 at gic? # Memory controller # DMA controller +sun6idma* at fdt? # DMA controller # Clock and Reset controller
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Sat Aug 5 17:51:49 UTC 2017 Modified Files: src/sys/arch/arm/sunxi: files.sunxi Added Files: src/sys/arch/arm/sunxi: sun6i_dma.c Log Message: Add DMA controller driver for sun6i and later family SoCs. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/sunxi/files.sunxi cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/sunxi/sun6i_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/sunxi/files.sunxi diff -u src/sys/arch/arm/sunxi/files.sunxi:1.14 src/sys/arch/arm/sunxi/files.sunxi:1.15 --- src/sys/arch/arm/sunxi/files.sunxi:1.14 Tue Jul 25 17:04:52 2017 +++ src/sys/arch/arm/sunxi/files.sunxi Sat Aug 5 17:51:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunxi,v 1.14 2017/07/25 17:04:52 jmcneill Exp $ +# $NetBSD: files.sunxi,v 1.15 2017/08/05 17:51:49 jmcneill Exp $ # # Configuration info for Allwinner sunxi family SoCs # @@ -108,6 +108,11 @@ device sunxiwdt: sysmon_wdog attach sunxiwdt at fdt with sunxi_wdt file arch/arm/sunxi/sunxi_wdt.c sunxi_wdt +# DMA controller +device sun6idma +attach sun6idma at fdt with sun6i_dma +file arch/arm/sunxi/sun6i_dma.c sun6i_dma + # SOC parameters defflag opt_soc.h SOC_SUNXI defflag opt_soc.h SOC_SUN8I: SOC_SUNXI Added files: Index: src/sys/arch/arm/sunxi/sun6i_dma.c diff -u /dev/null src/sys/arch/arm/sunxi/sun6i_dma.c:1.1 --- /dev/null Sat Aug 5 17:51:49 2017 +++ src/sys/arch/arm/sunxi/sun6i_dma.c Sat Aug 5 17:51:49 2017 @@ -0,0 +1,408 @@ +/* $NetBSD: sun6i_dma.c,v 1.1 2017/08/05 17:51:49 jmcneill Exp $ */ + +/*- + * Copyright (c) 2014-2017 Jared 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 +__KERNEL_RCSID(0, "$NetBSD: sun6i_dma.c,v 1.1 2017/08/05 17:51:49 jmcneill Exp $"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define DMA_IRQ_EN_REG0_REG 0x +#define DMA_IRQ_EN_REG1_REG 0x0004 +#define DMA_IRQ_EN_REG0_QUEUE_IRQ_EN(n) __BIT(n * 4 + 2) +#define DMA_IRQ_EN_REG0_PKG_IRQ_EN(n) __BIT(n * 4 + 1) +#define DMA_IRQ_EN_REG0_HLAF_IRQ_EN(n) __BIT(n * 4 + 0) +#define DMA_IRQ_EN_REG1_QUEUE_IRQ_EN(n) __BIT((n - 8) * 4 + 2) +#define DMA_IRQ_EN_REG1_PKG_IRQ_EN(n) __BIT((n - 8) * 4 + 1) +#define DMA_IRQ_EN_REG1_HLAF_IRQ_EN(n) __BIT((n - 8) * 4 + 0) +#define DMA_IRQ_PEND_REG0_REG 0x0010 +#define DMA_IRQ_PEND_REG1_REG 0x0014 +#define DMA_IRQ_QUEUE_MASK 0xULL +#define DMA_IRQ_PKG_MASK 0xULL +#define DMA_IRQ_HF_MASK 0xULL +#define DMA_STA_REG 0x0030 +#define DMA_EN_REG(n) (0x0100 + (n) * 0x40 + 0x00) +#define DMA_EN_EN__BIT(0) +#define DMA_PAU_REG(n) (0x0100 + (n) * 0x40 + 0x04) +#define DMA_PAU_PAUSE__BIT(0) +#define DMA_START_ADDR_REG(n) (0x0100 + (n) * 0x40 + 0x08) +#define DMA_CFG_REG(n) (0x0100 + (n) * 0x40 + 0x0C) +#define DMA_CFG_DEST_DATA_WIDTH __BITS(26,25) +#define DMA_CFG_DATA_WIDTH(n) ((n) >> 4) +#define DMA_CFG_DEST_BST_LEN __BITS(24,23) +#define DMA_CFG_BST_LEN(n) ((n) == 1 ? 0 : (((n) >> 3) + 1)) +#define DMA_CFG_DEST_ADDR_MODE __BITS(22,21) +#define DMA_CFG_ADDR_MODE_LINEAR 0 +#define DMA_CFG_ADDR_MODE_IO 1 +#define DMA_CFG_DEST_DRQ_TYPE __BITS(20,16) +#define DMA_CFG_DRQ_TYPE_SDRAM 1 +#define DMA_CFG_SRC_DATA_WIDTH __BITS(10,9) +#define DMA_CFG_SRC_BST_LEN __BITS(8,7) +#define DMA_CFG_SRC_ADDR_MODE __BITS(6,5) +#define DMA_CFG_SRC_DRQ_TYPE __BITS(4,0) +#define DMA_CUR_SRC_REG(n) (0x0100 + (n) * 0x40 + 0x10) +#define DMA_CUR_DEST_REG(n) (0x0100 + (n) * 0x40 + 0x14) +#define DMA_BCNT_LEFT_REG(n) (0x010
CVS commit: [perseant-stdc-iso10646] src/usr.bin/localedef
Module Name:src Committed By: wiz Date: Sat Aug 5 20:30:41 UTC 2017 Modified Files: src/usr.bin/localedef [perseant-stdc-iso10646]: localedef.1 Log Message: Sort; simplify; new sentence, new line; fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.bin/localedef/localedef.1 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/localedef/localedef.1 diff -u src/usr.bin/localedef/localedef.1:1.1.2.1 src/usr.bin/localedef/localedef.1:1.1.2.2 --- src/usr.bin/localedef/localedef.1:1.1.2.1 Fri Aug 4 21:43:11 2017 +++ src/usr.bin/localedef/localedef.1 Sat Aug 5 20:30:41 2017 @@ -1,3 +1,5 @@ +.\" $NetBSD: localedef.1,v 1.1.2.2 2017/08/05 20:30:41 wiz Exp $ +.\" .\" Copyright (c) 1992, X/Open Company Limited All Rights Reserved .\" Portions Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved .\" Portions Copyright 2013 DEY Storage Systems, Inc. @@ -71,6 +73,8 @@ The following categories are supported: Defines character classification and case conversion. .It Ev LC_COLLATE Defines collation rules. +.It Ev LC_MESSAGES +Defines the format and values of affirmative and negative responses. .It Ev LC_MONETARY Defines the format and symbols used in formatting of monetary information. .It Ev LC_NUMERIC @@ -78,8 +82,6 @@ Defines the decimal delimiter, grouping numeric editing. .It Ev LC_TIME Defines the format and content of date and time information. -.It Ev LC_MESSAGES -Defines the format and values of affirmative and negative responses. .El .Pp The following options are supported: @@ -112,17 +114,18 @@ option is not present, the default chara The path name of a file containing the source definitions. If this option is not present, source definitions will be read from standard input. +.It Fl U +Ignore the presence of character symbols that have no matching character +definition. +This facilitates the use of a common locale definition file +to be used across multiple encodings, even when some symbols are not +present in a given encoding. .It Fl u Ar codeset Specifies the name of a codeset used as the target mapping of character symbols and collating element symbols whose encoding values are defined in terms of the ISO/IEC 10646-1:2000 standard position constant values. See .Sx NOTES . -.It Fl U -Ignore the presence of character symbols that have no matching character -definition. This facilitates the use of a common locale definition file -to be used across multiple encodings, even when some symbols are not -present in a given encoding. .It Fl v Emit verbose debugging output on standard output. .It Fl w Ar widthfile @@ -151,10 +154,9 @@ belonging to the same locale can be proc .Nm creates a directory of files that represents the locale's data, unless instructed otherwise by the -.Fl D ( -BSD -output) option. -The contants of this directory should generally be copied into the +.Fl D +(BSD output) option. +The contents of this directory should generally be copied into the appropriate subdirectory of .Pa /usr/share/locale in order the definitions to be visible to programs linked with libc. @@ -170,7 +172,7 @@ execution of .Ev LC_CTYPE , .Ev LC_MESSAGES , .Ev LC_MONETARY , -.Ev LC_MUMERIC , +.Ev LC_NUMERIC , .Ev LC_TIME , and .Ev NLSPATH .
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Sat Aug 5 20:22:29 UTC 2017 Modified Files: src/lib/libc/gen: vis.3 Log Message: Remove superfluous Pp. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/lib/libc/gen/vis.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/gen/vis.3 diff -u src/lib/libc/gen/vis.3:1.48 src/lib/libc/gen/vis.3:1.49 --- src/lib/libc/gen/vis.3:1.48 Fri Aug 4 01:06:22 2017 +++ src/lib/libc/gen/vis.3 Sat Aug 5 20:22:29 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: vis.3,v 1.48 2017/08/04 01:06:22 ginsbach Exp $ +.\" $NetBSD: vis.3,v 1.49 2017/08/05 20:22:29 wiz Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -374,7 +374,6 @@ space. .It Dv \e240 Represents Meta-space. .El -.Pp .It Dv VIS_CSTYLE Use C-style backslash sequences to represent standard non-printable characters.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sat Aug 5 19:41:03 UTC 2017 Modified Files: src/distrib/sets/lists/xdebug: md.alpha md.cats src/distrib/sets/lists/xserver: md.alpha md.sgimips Log Message: fixes for xorg-server 1.18. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.alpha cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.sgimips 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/xdebug/md.alpha diff -u src/distrib/sets/lists/xdebug/md.alpha:1.9 src/distrib/sets/lists/xdebug/md.alpha:1.10 --- src/distrib/sets/lists/xdebug/md.alpha:1.9 Sat Sep 24 21:57:38 2016 +++ src/distrib/sets/lists/xdebug/md.alpha Sat Aug 5 19:41:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.9 2016/09/24 21:57:38 mrg Exp $ +# $NetBSD: md.alpha,v 1.10 2017/08/05 19:41:03 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- xorg,debug @@ -8,7 +8,8 @@ ./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.cats diff -u src/distrib/sets/lists/xdebug/md.cats:1.8 src/distrib/sets/lists/xdebug/md.cats:1.9 --- src/distrib/sets/lists/xdebug/md.cats:1.8 Sat Sep 24 21:57:38 2016 +++ src/distrib/sets/lists/xdebug/md.cats Sat Aug 5 19:41:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.8 2016/09/24 21:57:38 mrg Exp $ +# $NetBSD: md.cats,v 1.9 2017/08/05 19:41:03 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete @@ -34,7 +34,8 @@ ./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.46 src/distrib/sets/lists/xserver/md.alpha:1.47 --- src/distrib/sets/lists/xserver/md.alpha:1.46 Thu Jan 5 02:22:19 2017 +++ src/distrib/sets/lists/xserver/md.alpha Sat Aug 5 19:41:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.46 2017/01/05 02:22:19 christos Exp $ +# $NetBSD: md.alpha,v 1.47 2017/08/05 19:41:03 mrg Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -39,8 +39,10 @@ ./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg,xorg_server_ver=118,obsolete ./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=118,obsolete -./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=118,obsolete +./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/driv
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Sat Aug 5 11:58:19 UTC 2017 Modified Files: src/sys/arch/arm/fdt: psci_fdt.c Log Message: Wrap MP-specific code in ifdef MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/psci_fdt.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/fdt/psci_fdt.c diff -u src/sys/arch/arm/fdt/psci_fdt.c:1.1 src/sys/arch/arm/fdt/psci_fdt.c:1.2 --- src/sys/arch/arm/fdt/psci_fdt.c:1.1 Wed Jun 28 23:48:22 2017 +++ src/sys/arch/arm/fdt/psci_fdt.c Sat Aug 5 11:58:19 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: psci_fdt.c,v 1.1 2017/06/28 23:48:22 jmcneill Exp $ */ +/* $NetBSD: psci_fdt.c,v 1.2 2017/08/05 11:58:19 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -26,8 +26,10 @@ * SUCH DAMAGE. */ +#include "opt_multiprocessor.h" + #include -__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.1 2017/06/28 23:48:22 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.2 2017/08/05 11:58:19 jmcneill Exp $"); #include #include @@ -115,6 +117,7 @@ psci_fdt_init(const int phandle) void psci_fdt_bootstrap(void) { +#ifdef MULTIPROCESSOR extern void cortex_mpstart(void); bus_addr_t mpidr; uint32_t bp_mpidr; @@ -173,4 +176,5 @@ psci_fdt_bootstrap(void) if (arm_cpu_hatched == started) break; } +#endif }
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd
Module Name:xsrc Committed By: mrg Date: Sat Aug 5 06:03:26 UTC 2017 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd: alpha_video.c Log Message: make this build on netbsd. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.5 Thu Aug 11 00:04:31 2016 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c Sat Aug 5 06:03:26 2017 @@ -34,6 +34,9 @@ #include #ifndef __NetBSD__ #include +#else +#include +#include #endif #include "xf86_OSlib.h"
CVS commit: src/sys
Module Name:src Committed By: isaki Date: Sat Aug 5 05:53:27 UTC 2017 Modified Files: src/sys/arch/x68k/dev: vs.c vsvar.h src/sys/dev/ic: msm6258.c msm6258var.h Log Message: vs(4) became to able to play audio again. At the moment the encoding conversion using set_params() does not seem to work for me. So vs(4) uses local conversion to/from ADPCM instead of it. But this should be a temporary work. XXX The playback quality is very poor compared to before... XXX Recording is not tested. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x68k/dev/vs.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/dev/vsvar.h cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/msm6258.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/msm6258var.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/x68k/dev/vs.c diff -u src/sys/arch/x68k/dev/vs.c:1.42 src/sys/arch/x68k/dev/vs.c:1.43 --- src/sys/arch/x68k/dev/vs.c:1.42 Sat Aug 5 05:22:55 2017 +++ src/sys/arch/x68k/dev/vs.c Sat Aug 5 05:53:27 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vs.c,v 1.42 2017/08/05 05:22:55 isaki Exp $ */ +/* $NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $ */ /* * Copyright (c) 2001 Tetsuya Isaki. All rights reserved. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.42 2017/08/05 05:22:55 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $"); #include "audio.h" #include "vs.h" @@ -78,10 +78,10 @@ static void vs_close(void *); static int vs_query_encoding(void *, struct audio_encoding *); static int vs_set_params(void *, int, int, audio_params_t *, audio_params_t *, stream_filter_list_t *, stream_filter_list_t *); -static int vs_trigger_output(void *, void *, void *, int, - void (*)(void *), void *, const audio_params_t *); -static int vs_trigger_input(void *, void *, void *, int, - void (*)(void *), void *, const audio_params_t *); +static int vs_init_output(void *, void *, int); +static int vs_init_input(void *, void *, int); +static int vs_start_input(void *, void *, int, void (*)(void *), void *); +static int vs_start_output(void *, void *, int, void (*)(void *), void *); static int vs_halt_output(void *); static int vs_halt_input(void *); static int vs_allocmem(struct vs_softc *, size_t, size_t, size_t, @@ -101,6 +101,7 @@ static void vs_get_locks(void *, kmutex_ static int vs_round_sr(u_long); static void vs_set_sr(struct vs_softc *, int); static inline void vs_set_po(struct vs_softc *, u_long); +static void *vs_realloc_hwbuf(struct vs_softc *, int); extern struct cfdriver vs_cd; @@ -117,10 +118,10 @@ static const struct audio_hw_if vs_hw_if vs_set_params, NULL, /* round_blocksize */ NULL, /* commit_settings */ - NULL, /* init_output */ - NULL, /* init_input */ - NULL, /* start_output */ - NULL, /* start_input */ + vs_init_output, + vs_init_input, + vs_start_output, + vs_start_input, vs_halt_output, vs_halt_input, NULL, /* speaker_ctl */ @@ -129,13 +130,13 @@ static const struct audio_hw_if vs_hw_if vs_set_port, vs_get_port, vs_query_devinfo, - vs_allocm, - vs_freem, + NULL, /* allocm */ + NULL, /* freem */ vs_round_buffersize, NULL, /* mappage */ vs_get_props, - vs_trigger_output, - vs_trigger_input, + NULL, /* trigger_output */ + NULL, /* trigger_input */ NULL, vs_get_locks, }; @@ -160,8 +161,6 @@ struct { #define NUM_RATE (sizeof(vs_l2r)/sizeof(vs_l2r[0])) -extern stream_filter_factory_t null_filter; - static int vs_match(device_t parent, cfdata_t cf, void *aux) { @@ -222,6 +221,9 @@ vs_attach(device_t parent, device_t self sc->sc_addr = (void *) ia->ia_addr; sc->sc_dmas = NULL; sc->sc_active = 0; + sc->sc_hwbuf = NULL; + sc->sc_hwbufsize = 0; + sc->sc_codec = vs_alloc_msm6258codec(); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED); @@ -253,27 +255,13 @@ vs_dmaintr(void *hdl) mutex_spin_enter(&sc->sc_intr_lock); + sc->sc_active = 0; if (sc->sc_pintr) { - /* start next transfer */ - sc->sc_current.dmap += sc->sc_current.blksize; - if (sc->sc_current.dmap + sc->sc_current.blksize - > sc->sc_current.bufsize) - sc->sc_current.dmap -= sc->sc_current.bufsize; - dmac_start_xfer_offset(sc->sc_dma_ch->ch_softc, - sc->sc_current.xfer, - sc->sc_current.dmap, - sc->sc_current.blksize); sc->sc_pintr(sc->sc_parg); } else if (sc->sc_rintr) { - /* start next transfer */ - sc->sc_current.dmap += sc->sc_current.blksize; - if (sc->sc_current.dmap + sc->sc_current.blksize - > sc->sc_current.bufsize) - sc->sc_current.dmap -= sc->sc_current.bufsize; - dmac_start_xfer_offset(sc->sc_dma_ch->ch_softc, - sc->sc_current.xfer, - sc->sc_current.dmap, - sc->sc_current.blksize); + /* convert ADPCM to slinear */ + sc->sc_rconv(sc->sc_codec, sc->sc_current.rb
CVS commit: src/sbin/gpt
Module Name:src Committed By: wiz Date: Sat Aug 5 20:21:08 UTC 2017 Modified Files: src/sbin/gpt: gpt.8 Log Message: Use Fx/Nx. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.54 src/sbin/gpt/gpt.8:1.55 --- src/sbin/gpt/gpt.8:1.54 Fri Aug 4 02:43:56 2017 +++ src/sbin/gpt/gpt.8 Sat Aug 5 20:21:08 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: gpt.8,v 1.54 2017/08/04 02:43:56 kre Exp $ +.\" $NetBSD: gpt.8,v 1.55 2017/08/05 20:21:08 wiz Exp $ .\" .\" Copyright (c) 2002 Marcel Moolenaar .\" All rights reserved. @@ -171,15 +171,20 @@ BIOS Boot .It Cm efi EFI System .It Cm fbsd-legacy -FreeBSD legacy +.Fx +legacy .It Cm fbsd-swap -FreeBSD swap +.Fx +swap .It Cm fbsd-ufs -FreeBSD UFS/UFS2 +.Fx +UFS/UFS2 .It Cm fbsd-vinum -FreeBSD vinum +.Fx +vinum .It Cm fbsd-zfs -FreeBSD ZFS +.Fx +ZFS .It Cm linux-data Linux data .It Cm linux-raid @@ -193,17 +198,23 @@ Windows basic data .It Cm windows-reserved Windows reserved .It Cm ccd -NetBSD ccd component +.Nx +ccd component .It Cm cgd -NetBSD Cryptographic Disk +.Nx +Cryptographic Disk .It Cm ffs -NetBSD FFSv1/FFSv2 +.Nx +FFSv1/FFSv2 .It Cm lfs -NetBSD LFS +.Nx +LFS .It Cm raid -NetBSD RAIDFrame component +.Nx +RAIDFrame component .It Cm swap -NetBSD swap +.Nx +swap .El as aliases for the most commonly used partition types. .\" backup
CVS commit: [jdolecek-ncq] src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Sat Aug 5 13:22:01 UTC 2017 Modified Files: src/sys/dev/pci [jdolecek-ncq]: acardide.c Log Message: kill dead code To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.31.18.1 src/sys/dev/pci/acardide.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/acardide.c diff -u src/sys/dev/pci/acardide.c:1.31 src/sys/dev/pci/acardide.c:1.31.18.1 --- src/sys/dev/pci/acardide.c:1.31 Mon Oct 7 19:51:55 2013 +++ src/sys/dev/pci/acardide.c Sat Aug 5 13:22:01 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: acardide.c,v 1.31 2013/10/07 19:51:55 jakllsch Exp $ */ +/* $NetBSD: acardide.c,v 1.31.18.1 2017/08/05 13:22:01 jdolecek Exp $ */ /*- * Copyright (c) 2001 Izumi Tsutsui. All rights reserved. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.31 2013/10/07 19:51:55 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.31.18.1 2017/08/05 13:22:01 jdolecek Exp $"); #include #include @@ -292,41 +292,3 @@ acard_setup_channel(struct ata_channel * pci_conf_write(sc->sc_pc, sc->sc_tag, ATP860_UDMA, udma_mode); } } - -#if 0 /* XXX !! */ -static int -acard_pci_intr(void *arg) -{ - struct pciide_softc *sc = arg; - struct pciide_channel *cp; - struct ata_channel *wdc_cp; - int rv = 0; - int dmastat, i, crv; - - for (i = 0; i < sc->sc_wdcdev.sc_atac.atac_nchannels; i++) { - cp = &sc->pciide_channels[i]; - dmastat = bus_space_read_1(sc->sc_dma_iot, - cp->dma_iohs[IDEDMA_CTL], 0); - if ((dmastat & IDEDMA_CTL_INTR) == 0) - continue; - wdc_cp = &cp->ata_channel; - if ((wdc_cp->ch_flags & ATACH_IRQ_WAIT) == 0) { - (void)wdcintr(wdc_cp); - bus_space_write_1(sc->sc_dma_iot, - cp->dma_iohs[IDEDMA_CTL], 0, dmastat); - continue; - } - crv = wdcintr(wdc_cp); - if (crv == 0) { - printf("%s:%d: bogus intr\n", - device_xname(sc->sc_wdcdev.sc_atac.atac_dev), i); - bus_space_write_1(sc->sc_dma_iot, - cp->dma_iohs[IDEDMA_CTL], 0, dmastat); - } else if (crv == 1) - rv = 1; - else if (rv == 0) - rv = crv; - } - return rv; -} -#endif
CVS commit: src/sys/dev/usb
Module Name:src Committed By: khorben Date: Sat Aug 5 12:29:38 UTC 2017 Modified Files: src/sys/dev/usb: umodeswitch.c Log Message: Sort the matching vendor list alphabetically NFC. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/umodeswitch.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/umodeswitch.c diff -u src/sys/dev/usb/umodeswitch.c:1.1 src/sys/dev/usb/umodeswitch.c:1.2 --- src/sys/dev/usb/umodeswitch.c:1.1 Wed May 24 20:23:58 2017 +++ src/sys/dev/usb/umodeswitch.c Sat Aug 5 12:29:38 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: umodeswitch.c,v 1.1 2017/05/24 20:23:58 christos Exp $ */ +/* $NetBSD: umodeswitch.c,v 1.2 2017/08/05 12:29:38 khorben Exp $ */ /*- * Copyright (c) 2009, 2017 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.1 2017/05/24 20:23:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.2 2017/08/05 12:29:38 khorben Exp $"); #include #include @@ -401,16 +401,16 @@ umodeswitch_match(device_t parent, cfdat } break; - case USB_VENDOR_SIERRA: - if (uaa->uaa_product == USB_PRODUCT_SIERRA_INSTALLER) - return u3g_sierra_reinit(uaa->uaa_device); - break; - case USB_VENDOR_QUALCOMM: if (uaa->uaa_product == USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_STORAGE) return u3g_bulk_scsi_eject(uaa->uaa_device); break; + case USB_VENDOR_SIERRA: + if (uaa->uaa_product == USB_PRODUCT_SIERRA_INSTALLER) + return u3g_sierra_reinit(uaa->uaa_device); + break; + case USB_VENDOR_ZTE: switch (uaa->uaa_product){ case USB_PRODUCT_ZTE_INSTALLER:
CVS commit: src/sys/arch/x68k/dev
Module Name:src Committed By: isaki Date: Sat Aug 5 06:05:37 UTC 2017 Modified Files: src/sys/arch/x68k/dev: vs.c vsvar.h Log Message: Merge prate and rrate. These can not be separated. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x68k/dev/vs.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/dev/vsvar.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/x68k/dev/vs.c diff -u src/sys/arch/x68k/dev/vs.c:1.43 src/sys/arch/x68k/dev/vs.c:1.44 --- src/sys/arch/x68k/dev/vs.c:1.43 Sat Aug 5 05:53:27 2017 +++ src/sys/arch/x68k/dev/vs.c Sat Aug 5 06:05:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $ */ +/* $NetBSD: vs.c,v 1.44 2017/08/05 06:05:37 isaki Exp $ */ /* * Copyright (c) 2001 Tetsuya Isaki. All rights reserved. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.44 2017/08/05 06:05:37 isaki Exp $"); #include "audio.h" #include "vs.h" @@ -404,8 +404,7 @@ vs_set_params(void *hdl, int setmode, in return EINVAL; } - sc->sc_current.prate = rate; - sc->sc_current.rrate = rate; + sc->sc_current.rate = rate; /* pfil and rfil are independent even if !AUDIO_PROP_INDEPENDENT */ @@ -449,7 +448,7 @@ vs_init_output(void *hdl, void *buffer, sc = hdl; /* Set rate and pan */ - vs_set_sr(sc, sc->sc_current.prate); + vs_set_sr(sc, sc->sc_current.rate); vs_set_po(sc, VS_PANOUT_LR); return 0; @@ -464,7 +463,7 @@ vs_init_input(void *hdl, void *buffer, i sc = hdl; /* Set rate */ - vs_set_sr(sc, sc->sc_current.rrate); + vs_set_sr(sc, sc->sc_current.rate); return 0; } Index: src/sys/arch/x68k/dev/vsvar.h diff -u src/sys/arch/x68k/dev/vsvar.h:1.13 src/sys/arch/x68k/dev/vsvar.h:1.14 --- src/sys/arch/x68k/dev/vsvar.h:1.13 Sat Aug 5 05:53:27 2017 +++ src/sys/arch/x68k/dev/vsvar.h Sat Aug 5 06:05:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vsvar.h,v 1.13 2017/08/05 05:53:27 isaki Exp $ */ +/* $NetBSD: vsvar.h,v 1.14 2017/08/05 06:05:37 isaki Exp $ */ /* * Copyright (c) 2001 Tetsuya Isaki. All rights reserved. @@ -90,7 +90,7 @@ struct vs_softc { struct { struct dmac_dma_xfer *xfer; - int prate, rrate; + int rate; int precision; int bufsize, blksize; int dmap;
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Sat Aug 5 11:33:05 UTC 2017 Modified Files: src/bin/sh: input.c parser.c Log Message: PR bin/52458 Avoid mangling history when editing is enabled, and the prompt contains a \n Also, allow empty input lines into history when they are being appended to a previous (partial) command (but not when they would just make an empty entry). For all the gory details, see the PR. Note nothing here actually makes prompts containing \n work correctly when editing is enabled, that's a libedit issue, which will be addressed some other time. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/bin/sh/input.c cvs rdiff -u -r1.142 -r1.143 src/bin/sh/parser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/input.c diff -u src/bin/sh/input.c:1.60 src/bin/sh/input.c:1.61 --- src/bin/sh/input.c:1.60 Wed Jul 5 19:54:21 2017 +++ src/bin/sh/input.c Sat Aug 5 11:33:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: input.c,v 1.60 2017/07/05 19:54:21 kre Exp $ */ +/* $NetBSD: input.c,v 1.61 2017/08/05 11:33:05 kre Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95"; #else -__RCSID("$NetBSD: input.c,v 1.60 2017/07/05 19:54:21 kre Exp $"); +__RCSID("$NetBSD: input.c,v 1.61 2017/08/05 11:33:05 kre Exp $"); #endif #endif /* not lint */ @@ -310,10 +310,11 @@ preadbuffer(void) *q = '\0'; #ifndef SMALL - if (parsefile->fd == 0 && hist && something) { + if (parsefile->fd == 0 && hist && (something || whichprompt == 2)) { HistEvent he; + INTOFF; - history(hist, &he, whichprompt == 1? H_ENTER : H_APPEND, + history(hist, &he, whichprompt != 2 ? H_ENTER : H_APPEND, parsenextc); INTON; } Index: src/bin/sh/parser.c diff -u src/bin/sh/parser.c:1.142 src/bin/sh/parser.c:1.143 --- src/bin/sh/parser.c:1.142 Wed Jul 26 23:09:41 2017 +++ src/bin/sh/parser.c Sat Aug 5 11:33:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: parser.c,v 1.142 2017/07/26 23:09:41 kre Exp $ */ +/* $NetBSD: parser.c,v 1.143 2017/08/05 11:33:05 kre Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #else -__RCSID("$NetBSD: parser.c,v 1.142 2017/07/26 23:09:41 kre Exp $"); +__RCSID("$NetBSD: parser.c,v 1.143 2017/08/05 11:33:05 kre Exp $"); #endif #endif /* not lint */ @@ -2192,13 +2192,14 @@ getprompt(void *unused) { char *p; const char *cp; + int wp; if (!doprompt) return ""; VTRACE(DBG_PARSE|DBG_EXPAND, ("getprompt %d\n", whichprompt)); - switch (whichprompt) { + switch (wp = whichprompt) { case 0: return ""; case 1: @@ -2216,6 +2217,7 @@ getprompt(void *unused) VTRACE(DBG_PARSE|DBG_EXPAND, ("prompt <<%s>>\n", p)); cp = expandstr(p, plinno); + whichprompt = wp; /* history depends on it not changing */ VTRACE(DBG_PARSE|DBG_EXPAND, ("prompt -> <<%s>>\n", cp));
CVS commit: src/sys/dev/usb
Module Name:src Committed By: khorben Date: Sat Aug 5 12:38:08 UTC 2017 Modified Files: src/sys/dev/usb: umodeswitch.c Log Message: Automatically eject RALINK RT73 devices This lets the MW-P54SS USB Wireless Broadband Router from Synet attach as rum(4). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/umodeswitch.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/umodeswitch.c diff -u src/sys/dev/usb/umodeswitch.c:1.2 src/sys/dev/usb/umodeswitch.c:1.3 --- src/sys/dev/usb/umodeswitch.c:1.2 Sat Aug 5 12:29:38 2017 +++ src/sys/dev/usb/umodeswitch.c Sat Aug 5 12:38:08 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: umodeswitch.c,v 1.2 2017/08/05 12:29:38 khorben Exp $ */ +/* $NetBSD: umodeswitch.c,v 1.3 2017/08/05 12:38:08 khorben Exp $ */ /*- * Copyright (c) 2009, 2017 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.2 2017/08/05 12:29:38 khorben Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.3 2017/08/05 12:38:08 khorben Exp $"); #include #include @@ -406,6 +406,14 @@ umodeswitch_match(device_t parent, cfdat return u3g_bulk_scsi_eject(uaa->uaa_device); break; + case USB_VENDOR_RALINK: + switch (uaa->uaa_product){ + case USB_PRODUCT_RALINK_RT73: + return u3g_bulk_scsi_eject(uaa->uaa_device); + break; + } + break; + case USB_VENDOR_SIERRA: if (uaa->uaa_product == USB_PRODUCT_SIERRA_INSTALLER) return u3g_sierra_reinit(uaa->uaa_device);