CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Dec 24 06:14:42 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Remove strange ixgbe_enable_intr() in ixgbe_legacy_irq().
If the interface is UP and the INTx line is shared with other devices,
it result in enabling all interrupt sources even if some of them are
disabled for the workqueue. Delete ixgbe_enable_intr() in ixgbe_legacy_irq().
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.263 src/sys/dev/pci/ixgbe/ixgbe.c:1.264
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.263 Tue Dec 22 07:16:23 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 24 06:14:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.263 2020/12/22 07:16:23 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.264 2020/12/24 06:14:41 msaitoh Exp $ */
/**
@@ -5181,8 +5181,6 @@ ixgbe_legacy_irq(void *arg)
++que->irqs.ev_count;
if (eicr == 0) {
adapter->stats.pf.intzero.ev_count++;
- if ((ifp->if_flags & IFF_UP) != 0)
- ixgbe_enable_intr(adapter);
return 0;
}
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Wed Dec 23 17:57:17 UTC 2020 Modified Files: src/distrib/notes/hp300: hardware Log Message: Add A1659A CRX framebuffer to "Supported hardware" list. Also remove SGC support from "Unsupported hardware" list. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.23 src/distrib/notes/hp300/hardware:1.24 --- src/distrib/notes/hp300/hardware:1.23 Sat May 23 00:02:10 2020 +++ src/distrib/notes/hp300/hardware Wed Dec 23 17:57:17 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.23 2020/05/23 00:02:10 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.24 2020/12/23 17:57:17 tsutsui Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -177,6 +177,8 @@ A1096A monochrome Hyperion (1280x1024, 1 .It A1416A Kathmandu (a.k.a. Color VRX) (1280x1024 @ 60 hz, 8 bits, DIO-II) .It +A1659A CRX (1280x1024 @ 72 hz, 8 bits, SGC) +.It 98705 Tigershark PersonalVRX DIO-II graphics device .br .Em "Untested" @@ -249,8 +251,6 @@ CPUs .It Graphics Devices .(bullet -compact -SGC support for some rare configurations of 4XXt and 4XXdl workstations -.It 98702 TurboVRX DIO-II graphics device .bullet) .It
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: uwe
Date: Wed Dec 23 17:57:00 UTC 2020
Modified Files:
src/sys/dev/i2c: em3027.c
Log Message:
G/c trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/em3027.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/i2c/em3027.c
diff -u src/sys/dev/i2c/em3027.c:1.4 src/sys/dev/i2c/em3027.c:1.5
--- src/sys/dev/i2c/em3027.c:1.4 Wed Dec 23 17:10:37 2020
+++ src/sys/dev/i2c/em3027.c Wed Dec 23 17:57:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: em3027.c,v 1.4 2020/12/23 17:10:37 thorpej Exp $ */
+/* $NetBSD: em3027.c,v 1.5 2020/12/23 17:57:00 uwe Exp $ */
/*
* Copyright (c) 2018 Valery Ushakov
* All rights reserved.
@@ -28,7 +28,7 @@
* EM Microelectronic EM3027 RTC
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.4 2020/12/23 17:10:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.5 2020/12/23 17:57:00 uwe Exp $");
#include
#include
@@ -305,7 +305,7 @@ em3027rtc_envsys_attach(struct em3027rtc
"unable to attach sensor (error %d)\n", error);
goto out;
}
-
+
error = sysmon_envsys_register(sc->sc_sme);
if (error) {
aprint_error_dev(sc->sc_dev,
@@ -360,7 +360,7 @@ static int
em3027rtc_read_byte(struct em3027rtc_softc *sc, uint8_t reg, uint8_t *valp)
{
- return em3027rtc_read(sc, reg, valp, 1);
+ return em3027rtc_read(sc, reg, valp, 1);
}
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: thorpej
Date: Wed Dec 23 17:10:37 UTC 2020
Modified Files:
src/sys/dev/i2c: em3027.c
Log Message:
Add direct-config support.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/em3027.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/i2c/em3027.c
diff -u src/sys/dev/i2c/em3027.c:1.3 src/sys/dev/i2c/em3027.c:1.4
--- src/sys/dev/i2c/em3027.c:1.3 Sat Jul 27 16:02:27 2019
+++ src/sys/dev/i2c/em3027.c Wed Dec 23 17:10:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: em3027.c,v 1.3 2019/07/27 16:02:27 thorpej Exp $ */
+/* $NetBSD: em3027.c,v 1.4 2020/12/23 17:10:37 thorpej Exp $ */
/*
* Copyright (c) 2018 Valery Ushakov
* All rights reserved.
@@ -28,7 +28,7 @@
* EM Microelectronic EM3027 RTC
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.3 2019/07/27 16:02:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: em3027.c,v 1.4 2020/12/23 17:10:37 thorpej Exp $");
#include
#include
@@ -105,7 +105,10 @@ static int em3027rtc_write(struct em3027
static int em3027rtc_read_byte(struct em3027rtc_softc *, uint8_t, uint8_t *);
static int em3027rtc_write_byte(struct em3027rtc_softc *, uint8_t, uint8_t);
-
+static const struct device_compatible_entry compat_data[] = {
+ { "emmicro,em3027", 0 },
+ { NULL, 0 },
+};
static int
em3027rtc_match(device_t parent, cfdata_t cf, void *aux)
@@ -113,6 +116,10 @@ em3027rtc_match(device_t parent, cfdata_
const struct i2c_attach_args *ia = aux;
uint8_t reg;
int error;
+ int match_result;
+
+ if (iic_use_direct_match(ia, cf, compat_data, _result))
+ return match_result;
if (ia->ia_addr != EM3027_ADDR)
return 0;
CVS commit: src/sys/arch/arm/nxp
Module Name:src
Committed By: skrll
Date: Wed Dec 23 16:52:06 UTC 2020
Modified Files:
src/sys/arch/arm/nxp: imx6_spi.c
Log Message:
Attachment pretty print
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_spi.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/nxp/imx6_spi.c
diff -u src/sys/arch/arm/nxp/imx6_spi.c:1.1 src/sys/arch/arm/nxp/imx6_spi.c:1.2
--- src/sys/arch/arm/nxp/imx6_spi.c:1.1 Wed Dec 23 14:42:38 2020
+++ src/sys/arch/arm/nxp/imx6_spi.c Wed Dec 23 16:52:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_spi.c,v 1.1 2020/12/23 14:42:38 skrll Exp $ */
+/* $NetBSD: imx6_spi.c,v 1.2 2020/12/23 16:52:06 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.1 2020/12/23 14:42:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.2 2020/12/23 16:52:06 skrll Exp $");
#include "opt_imxspi.h"
@@ -104,6 +104,9 @@ imxspi_attach(device_t parent, device_t
bus_size_t size;
int error;
+ aprint_naive("\n");
+ aprint_normal(": SPI\n");
+
u_int nslaves;
error = of_getprop_uint32(phandle, "fsl,spi-num-chipselects", );
if (error)
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: thorpej Date: Wed Dec 23 16:04:42 UTC 2020 Modified Files: src/sys/dev/fdt: i2cmux_fdt.c Log Message: Register each virtual bus's i2c_tag_t so that references for e.g. HDMI DDC in the device tree work. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/i2cmux_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/dev/fdt/i2cmux_fdt.c diff -u src/sys/dev/fdt/i2cmux_fdt.c:1.1 src/sys/dev/fdt/i2cmux_fdt.c:1.2 --- src/sys/dev/fdt/i2cmux_fdt.c:1.1 Wed Dec 23 04:09:32 2020 +++ src/sys/dev/fdt/i2cmux_fdt.c Wed Dec 23 16:04:42 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: i2cmux_fdt.c,v 1.1 2020/12/23 04:09:32 thorpej Exp $ */ +/* $NetBSD: i2cmux_fdt.c,v 1.2 2020/12/23 16:04:42 thorpej Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i2cmux_fdt.c,v 1.1 2020/12/23 04:09:32 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i2cmux_fdt.c,v 1.2 2020/12/23 16:04:42 thorpej Exp $"); #include #include @@ -366,6 +366,8 @@ iicmux_attach_bus(struct iicmux_softc * bus->controller.ic_release_bus = iicmux_release_bus; bus->controller.ic_exec = iicmux_exec; + fdtbus_register_i2c_controller(>controller, bus->phandle); + fdtbus_attach_i2cbus(sc->sc_dev, bus->phandle, >controller, iicmux_print); }
CVS commit: src/sys
Module Name:src
Committed By: thorpej
Date: Wed Dec 23 16:02:12 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_bsc_fdt.c
src/sys/arch/arm/nvidia: tegra_i2c.c
src/sys/arch/arm/rockchip: rk_i2c.c
src/sys/arch/arm/samsung: exynos_i2c.c
src/sys/arch/arm/sociox: sni_i2c.c
src/sys/arch/arm/sunxi: sunxi_rsb.c sunxi_twi.c
src/sys/arch/arm/ti: ti_iic.c
src/sys/dev/fdt: dwiic_fdt.c fdt_i2c.c fdtvar.h
src/sys/dev/i2c: motoi2c.c
Log Message:
Change fdtbus_register_i2c_controller() to directly register the i2c_tag_t,
rather than the device and a set of functions (the only of which was to
return the i2c_tag_t anyway). Previously, this assumed only a single
i2c controller node per device_t, which is not true with an i2c mux.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra_i2c.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_i2c.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sociox/sni_i2c.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sunxi_rsb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_twi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ti/ti_iic.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/dwiic_fdt.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/fdt/fdt_i2c.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/motoi2c.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/broadcom/bcm2835_bsc_fdt.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.3 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.4
--- src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.3 Wed Dec 23 02:56:11 2020
+++ src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c Wed Dec 23 16:02:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc_fdt.c,v 1.3 2020/12/23 02:56:11 thorpej Exp $ */
+/* $NetBSD: bcm2835_bsc_fdt.c,v 1.4 2020/12/23 16:02:11 thorpej Exp $ */
/*
* Copyright (c) 2019 Jason R. Thorpe
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.3 2020/12/23 02:56:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.4 2020/12/23 16:02:11 thorpej Exp $");
#include
#include
@@ -46,18 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_
#include
-static i2c_tag_t
-bsciic_fdt_get_tag(device_t dev)
-{
- struct bsciic_softc * const sc = device_private(dev);
-
- return >sc_i2c;
-}
-
-static const struct fdtbus_i2c_controller_func bsciic_fdt_funcs = {
- .get_tag = bsciic_fdt_get_tag,
-};
-
static int bsciic_fdt_match(device_t, cfdata_t, void *);
static void bsciic_fdt_attach(device_t, device_t, void *);
@@ -141,7 +129,7 @@ bsciic_fdt_attach(device_t parent, devic
sc->sc_i2c.ic_release_bus = bsciic_release_bus;
sc->sc_i2c.ic_exec = bsciic_exec;
- fdtbus_register_i2c_controller(self, phandle, _fdt_funcs);
+ fdtbus_register_i2c_controller(>sc_i2c, phandle);
fdtbus_attach_i2cbus(self, phandle, >sc_i2c, iicbus_print);
}
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.23 src/sys/arch/arm/nvidia/tegra_i2c.c:1.24
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.23 Sun Dec 22 23:40:49 2019
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Wed Dec 23 16:02:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.23 2019/12/22 23:40:49 thorpej Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.24 2020/12/23 16:02:11 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.23 2019/12/22 23:40:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.24 2020/12/23 16:02:11 thorpej Exp $");
#include
#include
@@ -47,12 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,
static int tegra_i2c_match(device_t, cfdata_t, void *);
static void tegra_i2c_attach(device_t, device_t, void *);
-static i2c_tag_t tegra_i2c_get_tag(device_t);
-
-struct fdtbus_i2c_controller_func tegra_i2c_funcs = {
- .get_tag = tegra_i2c_get_tag
-};
-
struct tegra_i2c_softc {
device_t sc_dev;
bus_space_tag_t sc_bst;
@@ -183,19 +177,11 @@ tegra_i2c_attach(device_t parent, device
sc->sc_ic.ic_cookie = sc;
sc->sc_ic.ic_exec = tegra_i2c_exec;
- fdtbus_register_i2c_controller(self, phandle, _i2c_funcs);
+ fdtbus_register_i2c_controller(>sc_ic, phandle);
fdtbus_attach_i2cbus(self, phandle, >sc_ic, iicbus_print);
}
-static i2c_tag_t
-tegra_i2c_get_tag(device_t dev)
-{
- struct tegra_i2c_softc * const sc = device_private(dev);
-
- return >sc_ic;
-}
-
static void
tegra_i2c_init(struct tegra_i2c_softc *sc)
{
Index: src/sys/arch/arm/rockchip/rk_i2c.c
diff -u src/sys/arch/arm/rockchip/rk_i2c.c:1.8 src/sys/arch/arm/rockchip/rk_i2c.c:1.9
--- src/sys/arch/arm/rockchip/rk_i2c.c:1.8 Sat Sep 19
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Dec 23 15:56:43 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Deduplicate and group the USB stuff. Spotted by uwe@ To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/GENERIC 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.88 src/sys/arch/evbarm/conf/GENERIC:1.89 --- src/sys/arch/evbarm/conf/GENERIC:1.88 Wed Dec 23 14:42:38 2020 +++ src/sys/arch/evbarm/conf/GENERIC Wed Dec 23 15:56:43 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.88 2020/12/23 14:42:38 skrll Exp $ +# $NetBSD: GENERIC,v 1.89 2020/12/23 15:56:43 skrll Exp $ # # GENERIC ARM (aarch32) kernel # @@ -535,13 +535,13 @@ sun9iusbphy* at fdt? pass 9 # Allwinne sunxiusbphy* at fdt? pass 9 # Allwinner USB PHY sunxiusb3phy* at fdt? pass 9 # Allwinner USB3 PHY tegrausbphy* at fdt? # NVIDIA Tegra USB PHY -imxusbc* at fdt? -ehci* at imxusbc? usbnopphy* at fdt? pass 9 # Generic USB PHY -imxusbc* at fdt? pass 9 # i.MX USB host + +imxusbc* at fdt? tiotg* at fdt? # TI dual port OTG tiusb* at fdt? pass 9 # TI HS USB host tiusbtll* at fdt? pass 8 # TI HS USB host TLL + dwctwo* at fdt? # Designware USB DRD ehci* at fdt? # EHCI ehci* at imxusbc?
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 23 14:13:49 UTC 2020
Modified Files:
src/usr.bin/make: main.c parse.c
Log Message:
make(1): fix a few lint warnings
To generate a diff of this commit:
cvs rdiff -u -r1.501 -r1.502 src/usr.bin/make/main.c
cvs rdiff -u -r1.515 -r1.516 src/usr.bin/make/parse.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/make/main.c
diff -u src/usr.bin/make/main.c:1.501 src/usr.bin/make/main.c:1.502
--- src/usr.bin/make/main.c:1.501 Wed Dec 23 13:50:54 2020
+++ src/usr.bin/make/main.c Wed Dec 23 14:13:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.501 2020/12/23 13:50:54 rillig Exp $ */
+/* $NetBSD: main.c,v 1.502 2020/12/23 14:13:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.501 2020/12/23 13:50:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.502 2020/12/23 14:13:49 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1147,10 +1147,11 @@ InitVarMake(const char *argv0)
if (argv0[0] != '/' && strchr(argv0, '/') != NULL) {
char pathbuf[MAXPATHLEN];
- const char *abs = cached_realpath(argv0, pathbuf);
+ const char *abspath = cached_realpath(argv0, pathbuf);
struct stat st;
- if (abs != NULL && abs[0] == '/' && stat(make, ) == 0)
- make = abs;
+ if (abspath != NULL && abspath[0] == '/' &&
+ stat(make, ) == 0)
+ make = abspath;
}
Var_Set("MAKE", make, VAR_GLOBAL);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.515 src/usr.bin/make/parse.c:1.516
--- src/usr.bin/make/parse.c:1.515 Wed Dec 23 13:50:54 2020
+++ src/usr.bin/make/parse.c Wed Dec 23 14:13:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.515 2020/12/23 13:50:54 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.516 2020/12/23 14:13:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.515 2020/12/23 13:50:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.516 2020/12/23 14:13:49 rillig Exp $");
/* types and constants */
@@ -2204,7 +2204,7 @@ Parse_include_file(char *file, Boolean i
const char *suff;
SearchPath *suffPath = NULL;
- if ((suff = strrchr(file, '.'))) {
+ if ((suff = strrchr(file, '.')) != NULL) {
suffPath = Suff_GetPath(suff);
if (suffPath != NULL)
fullname = Dir_FindFile(file, suffPath);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 23 14:05:32 UTC 2020
Modified Files:
src/usr.bin/make: make.h
Log Message:
make(1): fix lint warnings for constant condition in DEBUG calls
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/usr.bin/make/make.h
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/make/make.h
diff -u src/usr.bin/make/make.h:1.238 src/usr.bin/make/make.h:1.239
--- src/usr.bin/make/make.h:1.238 Wed Dec 23 14:03:13 2020
+++ src/usr.bin/make/make.h Wed Dec 23 14:05:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.238 2020/12/23 14:03:13 rillig Exp $ */
+/* $NetBSD: make.h,v 1.239 2020/12/23 14:05:32 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -589,7 +589,7 @@ void debug_printf(const char *, ...) MAK
do { \
if (DEBUG(module)) \
debug_printf args; \
- } while (0)
+ } while (/*CONSTCOND*/ 0)
#define DEBUG0(module, text) \
DEBUG_IMPL(module, ("%s", text))
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Dec 23 14:03:13 UTC 2020 Modified Files: src/usr.bin/make: make.h Log Message: make(1): fix MAKE_RCSID for lint mode Previously, running lint mode didn't define MAKE_RCSID at all, which resulted in a syntax error. While here, reduced the indentation and nesting of the preprocessor directives. To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 src/usr.bin/make/make.h 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/make/make.h diff -u src/usr.bin/make/make.h:1.237 src/usr.bin/make/make.h:1.238 --- src/usr.bin/make/make.h:1.237 Wed Dec 23 13:50:54 2020 +++ src/usr.bin/make/make.h Wed Dec 23 14:03:13 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.237 2020/12/23 13:50:54 rillig Exp $ */ +/* $NetBSD: make.h,v 1.238 2020/12/23 14:03:13 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -831,19 +831,17 @@ pp_skip_hspace(char **pp) (*pp)++; } -#ifdef MAKE_NATIVE +#if defined(lint) +# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) +#elif defined(MAKE_NATIVE) # include -# ifndef lint -#define MAKE_RCSID(id) __RCSID(id) -# endif -#elif defined(MAKE_ALL_IN_ONE) -# if defined(__COUNTER__) -#define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y) -#define MAKE_RCSID(id) static volatile char \ +# define MAKE_RCSID(id) __RCSID(id) +#elif defined(MAKE_ALL_IN_ONE) && defined(__COUNTER__) +# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y) +# define MAKE_RCSID(id) static volatile char \ MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id -# else -#define MAKE_RCSID(id) extern void do_not_define_rcsid(void) -# endif +#elif defined(MAKE_ALL_IN_ONE) +# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) #else # define MAKE_RCSID(id) static volatile char rcsid[] = id #endif
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 23 13:50:55 UTC 2020
Modified Files:
src/usr.bin/make: cond.c main.c make.h parse.c var.c
Log Message:
make(1): rename CmdOpts.lint to strict
When running lint(1) on the code, it defines the preprocessor macro
"lint" to 1, which generated a syntax error in the declaration "Boolean
lint", as that became "Boolean 1".
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 src/usr.bin/make/cond.c
cvs rdiff -u -r1.500 -r1.501 src/usr.bin/make/main.c
cvs rdiff -u -r1.236 -r1.237 src/usr.bin/make/make.h
cvs rdiff -u -r1.514 -r1.515 src/usr.bin/make/parse.c
cvs rdiff -u -r1.763 -r1.764 src/usr.bin/make/var.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/make/cond.c
diff -u src/usr.bin/make/cond.c:1.230 src/usr.bin/make/cond.c:1.231
--- src/usr.bin/make/cond.c:1.230 Sun Dec 20 14:32:13 2020
+++ src/usr.bin/make/cond.c Wed Dec 23 13:50:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.230 2020/12/20 14:32:13 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.231 2020/12/23 13:50:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -94,7 +94,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.230 2020/12/20 14:32:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.231 2020/12/23 13:50:54 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -852,7 +852,7 @@ CondParser_Token(CondParser *par, Boolea
par->p++;
if (par->p[0] == '|')
par->p++;
- else if (opts.lint) {
+ else if (opts.strict) {
Parse_Error(PARSE_FATAL, "Unknown operator '|'");
par->printedError = TRUE;
return TOK_ERROR;
@@ -863,7 +863,7 @@ CondParser_Token(CondParser *par, Boolea
par->p++;
if (par->p[0] == '&')
par->p++;
- else if (opts.lint) {
+ else if (opts.strict) {
Parse_Error(PARSE_FATAL, "Unknown operator '&'");
par->printedError = TRUE;
return TOK_ERROR;
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.500 src/usr.bin/make/main.c:1.501
--- src/usr.bin/make/main.c:1.500 Sun Dec 20 14:39:46 2020
+++ src/usr.bin/make/main.c Wed Dec 23 13:50:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.500 2020/12/20 14:39:46 rillig Exp $ */
+/* $NetBSD: main.c,v 1.501 2020/12/23 13:50:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.500 2020/12/20 14:39:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.501 2020/12/23 13:50:54 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -288,7 +288,7 @@ parse_debug_options(const char *argvalue
debug |= DEBUG_JOB;
break;
case 'L':
- opts.lint = TRUE;
+ opts.strict = TRUE;
break;
case 'l':
debug |= DEBUG_LOUD;
@@ -1114,7 +1114,7 @@ CmdOpts_Init(void)
opts.compatMake = FALSE;
opts.debug = DEBUG_NONE;
/* opts.debug_file has been initialized earlier */
- opts.lint = FALSE;
+ opts.strict = FALSE;
opts.debugVflag = FALSE;
opts.checkEnvFirst = FALSE;
Lst_Init();
@@ -1645,7 +1645,7 @@ main_CleanUp(void)
static int
main_Exit(Boolean outOfDate)
{
- if (opts.lint && (main_errors > 0 || Parse_GetFatals() > 0))
+ if (opts.strict && (main_errors > 0 || Parse_GetFatals() > 0))
return 2; /* Not 1 so -q can distinguish error */
return outOfDate ? 1 : 0;
}
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.236 src/usr.bin/make/make.h:1.237
--- src/usr.bin/make/make.h:1.236 Tue Dec 22 22:31:50 2020
+++ src/usr.bin/make/make.h Wed Dec 23 13:50:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.236 2020/12/22 22:31:50 rillig Exp $ */
+/* $NetBSD: make.h,v 1.237 2020/12/23 13:50:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -626,7 +626,7 @@ typedef struct CmdOpts {
*
* Runs make in strict mode, with additional checks and better error
* handling. */
- Boolean lint;
+ Boolean strict;
/* -dV: for the -V option, print unexpanded variable values */
Boolean debugVflag;
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.514 src/usr.bin/make/parse.c:1.515
--- src/usr.bin/make/parse.c:1.514 Tue Dec 22 08:51:30 2020
+++ src/usr.bin/make/parse.c Wed Dec 23 13:50:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.514 2020/12/22 08:51:30 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.515 2020/12/23 13:50:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.514 2020/12/22 08:51:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.515 2020/12/23 13:50:54 rillig Exp $");
/* types and
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Dec 23 13:49:12 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: make(1): remove trailing whitespace in manual page To generate a diff of this commit: cvs rdiff -u -r1.294 -r1.295 src/usr.bin/make/make.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/make/make.1 diff -u src/usr.bin/make/make.1:1.294 src/usr.bin/make/make.1:1.295 --- src/usr.bin/make/make.1:1.294 Tue Dec 22 20:10:21 2020 +++ src/usr.bin/make/make.1 Wed Dec 23 13:49:12 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.294 2020/12/22 20:10:21 rillig Exp $ +.\" $NetBSD: make.1,v 1.295 2020/12/23 13:49:12 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -1102,7 +1102,7 @@ to that directory before executing any t .Pp Except in the case of an explicit .Ql Ic .OBJDIR -target, +target, .Nm will check that the specified directory is writable and ignore it if not. This check can be skipped by setting the environment variable
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Dec 23 13:11:27 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix memory leak in Var_Undef (since 2020-12-22)
To generate a diff of this commit:
cvs rdiff -u -r1.762 -r1.763 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.762 src/usr.bin/make/var.c:1.763
--- src/usr.bin/make/var.c:1.762 Tue Dec 22 20:10:21 2020
+++ src/usr.bin/make/var.c Wed Dec 23 13:11:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.762 2020/12/22 20:10:21 rillig Exp $ */
+/* $NetBSD: var.c,v 1.763 2020/12/23 13:11:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.762 2020/12/22 20:10:21 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.763 2020/12/23 13:11:27 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -547,6 +547,7 @@ Var_Undef(const char *arg)
}
Words_Free(varnames);
+ free(expanded);
}
static Boolean
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Dec 23 12:37:04 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1159 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.25 src/doc/CHANGES-9.2:1.1.2.26 --- src/doc/CHANGES-9.2:1.1.2.25 Sat Dec 19 13:56:20 2020 +++ src/doc/CHANGES-9.2 Wed Dec 23 12:37:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.25 2020/12/19 13:56:20 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.26 2020/12/23 12:37:03 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1283,3 +1283,12 @@ sys/dev/audio/audio.c1.83 Avoid a deadlock in audiodetach. [isaki, ticket #1158] +sys/dev/usb/ehci.c1.284 +sys/dev/usb/ohci.c1.314 +sys/dev/usb/uhci.c1.305 +sys/dev/usb/xhci.c1.136 +sys/external/bsd/dwc2/dwc2.c 1.75 + + Remove bogus assertions in USB abort paths. + [riastradh, ticket #1159] +
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Wed Dec 23 12:34:38 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: ehci.c ohci.c uhci.c xhci.c
src/sys/external/bsd/dwc2 [netbsd-9]: dwc2.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1159):
sys/dev/usb/ohci.c: revision 1.314
sys/external/bsd/dwc2/dwc2.c: revision 1.75
sys/dev/usb/ehci.c: revision 1.284
sys/dev/usb/uhci.c: revision 1.305
sys/dev/usb/xhci.c: revision 1.136
usb: Omit bogus assertions about struct usbd_pipe::up_intrxfer.
These assertions were only valid for pipes at UE_IN_DIR, UE_INTERRUPT
endpoints created with usbd_open_pipe_intr, which uses up_intrxfer to
pass the struct usbd_xfer object to usbd_close_pipe to free later.
In contrast, for pipes at UE_OUT_DIR, UE_INTERRUPT endpoints,
up_intrxfer is never initialized, so the assertion cannot be right.
In principle we might even have more than one outstanding interrupt
transfer at a time, rendering the point of the assertion moot anyway.
Found by interrupting a uhidev write to a u2f device.
ok nick
To generate a diff of this commit:
cvs rdiff -u -r1.267.2.3 -r1.267.2.4 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.289.4.6 -r1.289.4.7 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.288.4.2 -r1.288.4.3 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.107.2.6 -r1.107.2.7 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.59.4.3 -r1.59.4.4 src/sys/external/bsd/dwc2/dwc2.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.267.2.3 src/sys/dev/usb/ehci.c:1.267.2.4
--- src/sys/dev/usb/ehci.c:1.267.2.3 Sun Mar 1 12:35:16 2020
+++ src/sys/dev/usb/ehci.c Wed Dec 23 12:34:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.267.2.3 2020/03/01 12:35:16 martin Exp $ */
+/* $NetBSD: ehci.c,v 1.267.2.4 2020/12/23 12:34:38 martin Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.267.2.3 2020/03/01 12:35:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.267.2.4 2020/12/23 12:34:38 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -4132,7 +4132,6 @@ ehci_device_intr_abort(struct usbd_xfer
EHCIHIST_FUNC(); EHCIHIST_CALLED();
DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
/*
* XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.289.4.6 src/sys/dev/usb/ohci.c:1.289.4.7
--- src/sys/dev/usb/ohci.c:1.289.4.6 Sat Dec 12 20:29:11 2020
+++ src/sys/dev/usb/ohci.c Wed Dec 23 12:34:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.289.4.6 2020/12/12 20:29:11 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.289.4.7 2020/12/23 12:34:38 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.6 2020/12/12 20:29:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.7 2020/12/23 12:34:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3356,7 +3356,6 @@ ohci_device_intr_abort(struct usbd_xfer
ohci_softc_t *sc __diagused = OHCI_XFER2SC(xfer);
KASSERT(mutex_owned(>sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
usbd_xfer_abort(xfer);
}
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.288.4.2 src/sys/dev/usb/uhci.c:1.288.4.3
--- src/sys/dev/usb/uhci.c:1.288.4.2 Sun Mar 1 12:35:16 2020
+++ src/sys/dev/usb/uhci.c Wed Dec 23 12:34:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.288.4.2 2020/03/01 12:35:16 martin Exp $ */
+/* $NetBSD: uhci.c,v 1.288.4.3 2020/12/23 12:34:38 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.288.4.2 2020/03/01 12:35:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.288.4.3 2020/12/23 12:34:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2817,7 +2817,6 @@ uhci_device_intr_abort(struct usbd_xfer
uhci_softc_t *sc __diagused = UHCI_XFER2SC(xfer);
KASSERT(mutex_owned(>sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
UHCIHIST_FUNC(); UHCIHIST_CALLED();
DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.107.2.6 src/sys/dev/usb/xhci.c:1.107.2.7
--- src/sys/dev/usb/xhci.c:1.107.2.6 Mon May 25 15:31:45 2020
+++ src/sys/dev/usb/xhci.c Wed Dec 23 12:34:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.107.2.6 2020/05/25 15:31:45 martin Exp $ */
+/* $NetBSD: xhci.c,v 1.107.2.7 2020/12/23 12:34:38 martin Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.107.2.6 2020/05/25 15:31:45
CVS commit: src/sys/arch/arm/acpi
Module Name:src
Committed By: jmcneill
Date: Wed Dec 23 11:05:08 UTC 2020
Modified Files:
src/sys/arch/arm/acpi: gicv3_acpi.c
Log Message:
Future-proof ID_AA64PFR0_EL1.GIC test -- any value other than 0 means that
the GIC CPU interface is supported.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/acpi/gicv3_acpi.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/acpi/gicv3_acpi.c
diff -u src/sys/arch/arm/acpi/gicv3_acpi.c:1.7 src/sys/arch/arm/acpi/gicv3_acpi.c:1.8
--- src/sys/arch/arm/acpi/gicv3_acpi.c:1.7 Thu Feb 13 00:02:21 2020
+++ src/sys/arch/arm/acpi/gicv3_acpi.c Wed Dec 23 11:05:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_acpi.c,v 1.7 2020/02/13 00:02:21 jmcneill Exp $ */
+/* $NetBSD: gicv3_acpi.c,v 1.8 2020/12/23 11:05:08 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3_acpi.c,v 1.7 2020/02/13 00:02:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_acpi.c,v 1.8 2020/12/23 11:05:08 jmcneill Exp $");
#include
#include
@@ -91,7 +91,7 @@ gicv3_acpi_match(device_t parent, cfdata
switch (gicd->Version) {
case ACPI_MADT_GIC_VERSION_NONE:
- return __SHIFTOUT(reg_id_aa64pfr0_el1_read(), ID_AA64PFR0_EL1_GIC) == 1;
+ return __SHIFTOUT(reg_id_aa64pfr0_el1_read(), ID_AA64PFR0_EL1_GIC) != 0;
case ACPI_MADT_GIC_VERSION_V3:
case ACPI_MADT_GIC_VERSION_V4:
return 1;
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Dec 23 10:43:00 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: More sorting To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/arch/evbarm/conf/GENERIC 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.86 src/sys/arch/evbarm/conf/GENERIC:1.87 --- src/sys/arch/evbarm/conf/GENERIC:1.86 Wed Dec 23 10:32:07 2020 +++ src/sys/arch/evbarm/conf/GENERIC Wed Dec 23 10:43:00 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.86 2020/12/23 10:32:07 skrll Exp $ +# $NetBSD: GENERIC,v 1.87 2020/12/23 10:43:00 skrll Exp $ # # GENERIC ARM (aarch32) kernel # @@ -261,8 +261,8 @@ tegra210xpad* at fdt? # NVIDIA Tegra tegra210xphy* at tegra210xpad? # PCIE -pcihost* at fdt? # Generic PCI host controller imxpcie* at fdt? # i.MX PCIE +pcihost* at fdt? # Generic PCI host controller tegrapcie0 at fdt? # NVIDIA Tegra PCIE pci* at pcibus? ppb* at pci? dev ? function ?
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: rin
Date: Wed Dec 23 10:35:18 UTC 2020
Modified Files:
src/distrib/utils/embedded: mkimage
src/distrib/utils/embedded/conf: evbarm.conf evbmips.conf x86.conf
Log Message:
Fix fallout from mkimage rev 1.76.
For mkimage:
- Update "size" if auto-calculated.
- Use "dd bs=1" instead of non-portable "head -c".
- Some style nits.
For MD make_label() functions:
- Stop using "newsize" as image size in MB, use "size" instead.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbmips.conf
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/x86.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.76 src/distrib/utils/embedded/mkimage:1.77
--- src/distrib/utils/embedded/mkimage:1.76 Mon Dec 21 16:38:02 2020
+++ src/distrib/utils/embedded/mkimage Wed Dec 23 10:35:18 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.76 2020/12/21 16:38:02 riastradh Exp $
+# $NetBSD: mkimage,v 1.77 2020/12/23 10:35:18 rin Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -259,15 +259,16 @@ if [ -z "${bootonly}" ]; then
-F "$tmp/selected_sets" ${image} "${release}" "${mnt}"
fi
-cursize="$(getsize "${image}")"
if [ "${size}" = 0 ]; then
- size="${cursize}"
+ size="$(getsize "${image}")"
# Round up to a multiple of 4m and add 1m of slop.
alignunit=$((4*1024*1024))
- alignsize=$((alignunit*((cursize + alignunit - 1)/alignunit)))
+ alignsize=$((alignunit*((size + alignunit - 1)/alignunit)))
alignsize=$((alignsize + 1024*1024))
- if [ $cursize -lt $alignsize ]; then
- head -c "$((alignsize - cursize))" < /dev/zero >> "${image}"
+ if [ "${size}" -lt "${alignsize}" ]; then
+ dd bs=1 count="$((alignsize - size))" if=/dev/zero \
+ >> "${image}" 2> /dev/null
+ size="${alignsize}"
fi
fi
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.37 src/distrib/utils/embedded/conf/evbarm.conf:1.38
--- src/distrib/utils/embedded/conf/evbarm.conf:1.37 Fri Jul 17 15:16:34 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.37 2020/07/17 15:16:34 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.38 2020/12/23 10:35:18 rin Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -23,7 +23,7 @@ mkdir -p ${mnt}/boot
make_label_evbarm() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local bootsize=$(( ${boot} * 1024 ))
Index: src/distrib/utils/embedded/conf/evbmips.conf
diff -u src/distrib/utils/embedded/conf/evbmips.conf:1.1 src/distrib/utils/embedded/conf/evbmips.conf:1.2
--- src/distrib/utils/embedded/conf/evbmips.conf:1.1 Fri Jul 17 15:16:34 2020
+++ src/distrib/utils/embedded/conf/evbmips.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.1 2020/07/17 15:16:34 jmcneill Exp $
+# $NetBSD: evbmips.conf,v 1.2 2020/12/23 10:35:18 rin Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -23,7 +23,7 @@ mkdir -p ${mnt}/boot
make_label_evbmips() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local bootsize=$(( ${boot} * 1024 ))
Index: src/distrib/utils/embedded/conf/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.8 src/distrib/utils/embedded/conf/x86.conf:1.9
--- src/distrib/utils/embedded/conf/x86.conf:1.8 Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/conf/x86.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: x86.conf,v 1.8 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: x86.conf,v 1.9 2020/12/23 10:35:18 rin Exp $
# x86 shared config
#
@@ -15,7 +15,7 @@ ffsoffset=${init}b
make_label() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local aoffset=${init}
local asize=$(( ${totalsize} - ${aoffset} ))
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Dec 23 10:32:07 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: consistency To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/arch/evbarm/conf/GENERIC 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.85 src/sys/arch/evbarm/conf/GENERIC:1.86 --- src/sys/arch/evbarm/conf/GENERIC:1.85 Wed Dec 23 10:27:23 2020 +++ src/sys/arch/evbarm/conf/GENERIC Wed Dec 23 10:32:07 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.85 2020/12/23 10:27:23 skrll Exp $ +# $NetBSD: GENERIC,v 1.86 2020/12/23 10:32:07 skrll Exp $ # # GENERIC ARM (aarch32) kernel # @@ -102,24 +102,24 @@ cpus* at fdt? pass 0 cpu* at fdt? pass 0 # CPU frequency scaling -tegra124cpu* at cpu? -cpufreqdt* at cpu? +tegra124cpu* at cpu? +cpufreqdt* at cpu? # Power State Coordination Interface (PSCI) -psci* at fdt? +psci* at fdt? # Clock and reset controllers -am3prcm* at fdt? pass 1 # TI AM335x PRCM +am3prcm* at fdt? pass 1 # TI AM335x PRCM cycvclkmgr* at fdt? pass 1 # Cyclone V clock manager cycvrstmgr* at fdt? pass 0 # Cyclone V reset manager exy5410clk* at fdt? pass 3 # Exynos5410 clock controller exy5422clk* at fdt? pass 3 # Exynos5422 clock controller imx6ccm* at fdt? pass 1 # i.MX6 CCM -imx7dccm* at fdt? pass 2 # i.MX7D CCM +imx7dccm* at fdt? pass 2 # i.MX7D CCM meson8bclkc* at fdt? pass 2 # Amlogic Meson8b clock controller mesonresets* at fdt? pass 2 # Amlogic Meson misc. clock resets -omap3cm* at fdt? pass 1 # TI OMAP3 CM -omap3prm* at fdt? pass 1 # TI OMAP3 PRM +omap3cm* at fdt? pass 1 # TI OMAP3 CM +omap3prm* at fdt? pass 1 # TI OMAP3 PRM sun4ia10ccu* at fdt? pass 2 # Allwinner A10/A20 CCU sun5ia13ccu* at fdt? pass 2 # Allwinner A13 CCU sun6ia31ccu* at fdt? pass 2 # Allwinner A31 CCU @@ -136,17 +136,17 @@ sun9immcclk* at fdt? pass 2 # Allwinne sun9iusbclk* at fdt? pass 2 # Allwinner A80 USB HCI tegra124car* at fdt? pass 3 # NVIDIA Tegra CAR (T124) tegra210car* at fdt? pass 3 # NVIDIA Tegra CAR (T210) -tidivclk* at fdt? pass 1 # TI divider clock -tidpllclk* at fdt? pass 2 # TI DPLL clock -timuxclk* at fdt? pass 1 # TI mux clock - -fclock* at fdt? pass 1 -ffclock* at fdt? pass 1 -fregulator* at fdt? pass 5 -gregulator* at fdt? pass 4 -gpiokeys* at fdt? -wskbd* at gpiokeys? console ? mux 1 -gpioleds* at fdt? +tidivclk* at fdt? pass 1 # TI divider clock +tidpllclk* at fdt? pass 2 # TI DPLL clock +timuxclk* at fdt? pass 1 # TI mux clock + +fclock* at fdt? pass 1 +ffclock* at fdt? pass 1 +fregulator* at fdt? pass 5 +gregulator* at fdt? pass 4 +gpiokeys* at fdt? +wskbd* at gpiokeys? console ? mux 1 +gpioleds* at fdt? # ARM Motherboard Express uATX system registers vxsysreg* at fdt? @@ -155,20 +155,20 @@ vxsysreg* at fdt? sunxisramc* at fdt? pass 4 # SRAM controller # System Controller -syscon* at fdt? pass 1 # Generic System Controller -tisysc* at fdt? pass 2 # TI sysc interconnect -#zynqslcr* at fdt? pass 1 # Zynq 7000 system Controller +syscon* at fdt? pass 1 # Generic System Controller +tisysc* at fdt? pass 2 # TI sysc interconnect +#zynqslcr* at fdt? pass 1 # Zynq 7000 system Controller # Timer a9ptmr* at fdt? pass 2 # ARM Cortex A5/A9 Private Timer arma9ptmr* at a9ptmr? a9tmr* at fdt? pass 2 # ARM Cortex A5/A9 Timer arma9tmr* at a9tmr? -gtmr* at fdt? pass 1 # ARM Generic Timer -armgtmr0 at gtmr? -mct* at fdt? pass 2 # Exynos Multi Core Timer (MCT) -armgtmr* at mct? -omaptimer* at fdt? # TI OMAP Timer +gtmr* at fdt? pass 1 # ARM Generic Timer +armgtmr0 at gtmr? +mct* at fdt? pass 2 # Exynos Multi Core Timer (MCT) +armgtmr* at mct? +omaptimer* at fdt? # TI OMAP Timer meson6timer* at fdt? # Amlogic Timer sunxitimer* at fdt? # Allwinner async timer sunxihstimer* at fdt? # Allwinner High-Speed timer @@ -179,16 +179,16 @@ bcmpmwdog* at fdt? # Broadcom BCM283x dwcwdt* at fdt? # DesignWare watchdog mesonwdt* at fdt? # Amlogic Meson watchdog sunxiwdt* at fdt? # Allwinner watchdog -tiwdt* at fdt? # TI OMAP watchdog +tiwdt* at fdt? # TI OMAP watchdog # Interrupt controller -gic* at fdt? pass 1 # ARM GIC -armgic0 at gic? +gic* at fdt? pass 1 # ARM GIC +armgic0 at gic? bcmicu* at fdt? pass 1 # Broadcom BCM283x ICU exyointr* at fdt? pass 1 # Samsung Exynos ICU imxgpc* at fdt? pass 2 # i.MX General Power Controller INTC -imx7gpc* at fdt? pass 2 # i.MX General Power Controller v2 INTC -omapintc* at fdt? pass 2 # TI OMAP INTC +imx7gpc* at fdt? pass 2 # i.MX General Power Controller v2 INTC +omapintc* at fdt? pass 2 # TI OMAP INTC tegralic* at fdt? pass 1 # NVIDIA Tegra LIC sunxiintc* at fdt? pass 1 # Allwinner INTC sunxinmi* at fdt? pass 2 # Allwinner NMI / R_INTC @@ -199,7
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Dec 23 10:27:23 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Sort some devices under each driver type To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/conf/GENERIC 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.84 src/sys/arch/evbarm/conf/GENERIC:1.85 --- src/sys/arch/evbarm/conf/GENERIC:1.84 Wed Dec 23 04:09:32 2020 +++ src/sys/arch/evbarm/conf/GENERIC Wed Dec 23 10:27:23 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.84 2020/12/23 04:09:32 thorpej Exp $ +# $NetBSD: GENERIC,v 1.85 2020/12/23 10:27:23 skrll Exp $ # # GENERIC ARM (aarch32) kernel # @@ -241,8 +241,8 @@ gpio* at gpiobus? # MPIO / Pinmux pinctrl* at fdt? pass 2 # Generic pinctrl driver -tegrapinmux* at fdt? # NVIDIA Tegra MPIO imxiomux* at fdt? pass 2 # i.MX IOMUX +tegrapinmux* at fdt? # NVIDIA Tegra MPIO # PWM controller expwm* at fdt? pass 4 # PWM @@ -262,8 +262,8 @@ tegra210xphy* at tegra210xpad? # PCIE pcihost* at fdt? # Generic PCI host controller -tegrapcie0 at fdt? # NVIDIA Tegra PCIE imxpcie* at fdt? # i.MX PCIE +tegrapcie0 at fdt? # NVIDIA Tegra PCIE pci* at pcibus? ppb* at pci? dev ? function ? pci* at ppb? @@ -315,9 +315,9 @@ ukphy* at mii? phy ? # generic unknow # UART com* at fdt? pass 4 # UART exuart* at fdt? pass 4 # SSCOM UART -plcom* at fdt? pass 4 # ARM PL011 UART imxuart* at fdt? pass 4 # i.MX UART mesonuart* at fdt? pass 4 # Amlogic Meson UART +plcom* at fdt? pass 4 # ARM PL011 UART zynquart* at fdt? pass 4 # Cadence UART # I2C controllers
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Wed Dec 23 08:38:46 UTC 2020 Modified Files: src/doc: CHANGES Log Message: Note about bitmap access ops support for hp300 SGC CRX framebuffer. To generate a diff of this commit: cvs rdiff -u -r1.2767 -r1.2768 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/CHANGES diff -u src/doc/CHANGES:1.2767 src/doc/CHANGES:1.2768 --- src/doc/CHANGES:1.2767 Wed Dec 23 07:26:36 2020 +++ src/doc/CHANGES Wed Dec 23 08:38:45 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2767 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2768 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -318,3 +318,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: OpenSSL: Imported 1.1.1i. [christos 20201209] pkg_install: Updated to 20201212. [wiz 20201212] sparc64: Add environment monitoring for the E250 [jdc 20201223] + sti(4), hp300: Add bitmap access ops support for SGC CRX (A1659-66001) + framebuffer for HP9000/425t. [tsutsui 20201223]
CVS commit: src/sys/arch/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Wed Dec 23 08:36:47 UTC 2020
Modified Files:
src/sys/arch/hp300/dev: sti_sgc.c
Log Message:
Add bitmap access ops support for SGC CRX (A1659-66001) framebuffer.
Also modify existing 425e EVRX attachment to use updated MI sti(4) ops
more efficiently.
The Xorg server and mlterm-wscons (that support wsdisplay bitmap) work
fine on SGC hp425t.
No particular comments on port-hp300@ and port-hppa@:
https://mail-index.netbsd.org/port-hp300/2020/12/19/msg000184.html
https://mail-index.netbsd.org/port-hp300/2020/12/20/msg000185.html
Special thanks to Miod Vallat again, for contributing the SGC CRX
framebuffer with the SGC connector and flexible cable for HP9000/425t.
He also contributed DIO-II "Hyperion" monochrome framebuffer and
1 plane grayscale SGC GRX (A1924-66001), and I've confirmed hyper(4)
just works even with Xorg server. I will try GRX as the next project.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/dev/sti_sgc.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/hp300/dev/sti_sgc.c
diff -u src/sys/arch/hp300/dev/sti_sgc.c:1.3 src/sys/arch/hp300/dev/sti_sgc.c:1.4
--- src/sys/arch/hp300/dev/sti_sgc.c:1.3 Mon May 4 06:52:53 2020
+++ src/sys/arch/hp300/dev/sti_sgc.c Wed Dec 23 08:36:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.3 2020/05/04 06:52:53 tsutsui Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.4 2020/12/23 08:36:47 tsutsui Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.14 2007/05/26 00:36:03 krw Exp $ */
/*
@@ -27,7 +27,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.3 2020/05/04 06:52:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.4 2020/12/23 08:36:47 tsutsui Exp $");
#include
#include
@@ -49,33 +49,40 @@ struct sti_sgc_softc {
struct sti_softc sc_sti;
paddr_t sc_bitmap;
- bus_space_tag_t sc_bst;
- bus_space_handle_t sc_ramdach;
};
/*
* 425e EVRX specific hardware
*/
-#define STI_EVRX_RAMDACOFFSET 0x06
-#define STI_EVRX_RAMDACSIZE 0x000800
+/*
+ * EVRX RAMDAC (Bt458) is found at offset 0x06 from SGC bus PA and
+ * offset 0x04 length 0x1c is mapped in MI sti via ROM region 2
+ */
+#define STI_EVRX_REGNO2OFFSET 0x02
#define STI_EVRX_FBOFFSET 0x20
-#define EVRX_BT458_ADDR (0x200 + 2)
-#define EVRX_BT458_CMAP (0x204 + 2)
-#define EVRX_BT458_CTRL (0x208 + 2)
-#define EVRX_BT458_OMAP (0x20C + 2)
+#define EVRX_BT458_ADDR (STI_EVRX_REGNO2OFFSET + 0x200 + 2)
+#define EVRX_BT458_CMAP (STI_EVRX_REGNO2OFFSET + 0x204 + 2)
+#define EVRX_BT458_CTRL (STI_EVRX_REGNO2OFFSET + 0x208 + 2)
+#define EVRX_BT458_OMAP (STI_EVRX_REGNO2OFFSET + 0x20C + 2)
/* from HP-UX /usr/lib/libddevrx.a */
-#define EVRX_MAGIC00 0x600
-#define EVRX_MAGIC04 0x604
-#define EVRX_MAGIC08 0x608
-#define EVRX_MAGIC0C 0x60c
-#define EVRX_MAGIC10 0x610
+#define EVRX_MAGIC00 (STI_EVRX_REGNO2OFFSET + 0x600)
+#define EVRX_MAGIC04 (STI_EVRX_REGNO2OFFSET + 0x604)
+#define EVRX_MAGIC08 (STI_EVRX_REGNO2OFFSET + 0x608)
+#define EVRX_MAGIC0C (STI_EVRX_REGNO2OFFSET + 0x60c)
+#define EVRX_MAGIC10 (STI_EVRX_REGNO2OFFSET + 0x610)
#define EVRX_MAGIC10_BSY 0x0001
-#define EVRX_MAGIC18 0x618
-#define EVRX_MAGIC1C 0x61c
+#define EVRX_MAGIC18 (STI_EVRX_REGNO2OFFSET + 0x618)
+#define EVRX_MAGIC1C (STI_EVRX_REGNO2OFFSET + 0x61c)
+
+/*
+ * HP A1659A CRX specific hardware
+ */
+#define STI_CRX_FBOFFSET 0x0100
static int sticonslot = -1;
+static struct bus_space_tag sticn_tag;
static struct sti_rom sticn_rom;
static struct sti_screen sticn_scr;
static bus_addr_t sticn_bases[STI_REGION_MAX];
@@ -88,16 +95,16 @@ static int sti_sgc_probe(bus_space_tag_t
CFATTACH_DECL_NEW(sti_sgc, sizeof(struct sti_sgc_softc),
sti_sgc_match, sti_sgc_attach, NULL, NULL);
-/* 425e EVRX specific access functions */
-static int sti_evrx_setcmap(struct sti_sgc_softc *, struct wsdisplay_cmap *);
-static void sti_evrx_resetramdac(struct sti_sgc_softc *);
-static void sti_evrx_resetcmap(struct sti_sgc_softc *);
-static int sti_evrx_ioctl(void *, void *, u_long, void *, int, struct lwp *);
-static paddr_t sti_evrx_mmap(void *, void *, off_t, int);
-
-static const struct wsdisplay_accessops sti_evrx_accessops = {
- sti_evrx_ioctl,
- sti_evrx_mmap,
+/* 425e EVRX/CRX specific access functions */
+static int sti_evrx_putcmap(struct sti_screen *, u_int, u_int);
+static void sti_evrx_resetramdac(struct sti_screen *);
+static void sti_evrx_resetcmap(struct sti_screen *);
+static void sti_evrx_setupfb(struct sti_screen *);
+static paddr_t sti_m68k_mmap(void *, void *, off_t, int);
+
+static const struct wsdisplay_accessops sti_m68k_accessops = {
+ sti_ioctl,
+ sti_m68k_mmap,
sti_alloc_screen,
sti_free_screen,
sti_show_screen,
@@ -126,6 +133,7 @@ sti_sgc_attach(device_t parent, device_t
struct sti_softc *ssc = >sc_sti;
struct sgc_attach_args *saa = aux;
struct
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Wed Dec 23 08:34:35 UTC 2020
Modified Files:
src/sys/dev/ic: sti.c stivar.h
Log Message:
Pull the latest OpenBSD sti(4) changes for bitmap framebuffer support.
- bitmap and colormap ops based on old HP ngle X11 driver:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sys/dev/ic/sti.c#rev1.76
> Work-in-progress support for non-accelerated X11 on *some* sti(4)
> frame buffers; based upon the old HP ngle X11 driver.
> Currently limited to CRX (720/735/750), Timber (710, old 715),
> Artist (712, 715) and EG (B-series), however the
> colormap isn't set up correctly on Timber and EG yet.
>
> Joint work with Artem Falcon, now in good enough shape to be worked further
> in the tree.
- misc other cosmetic changes to reduce diffs
No particular comments on port-hp300@ and port-hppa@:
https://mail-index.netbsd.org/port-hp300/2020/12/19/msg000184.html
https://mail-index.netbsd.org/port-hp300/2020/12/20/msg000185.html
The MD hp300 attachment for SGC CRX (A1659-66001) will be committed
separately.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/stivar.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/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.22 src/sys/dev/ic/sti.c:1.23
--- src/sys/dev/ic/sti.c:1.22 Sat Sep 5 16:30:11 2020
+++ src/sys/dev/ic/sti.c Wed Dec 23 08:34:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.22 2020/09/05 16:30:11 riastradh Exp $ */
+/* $NetBSD: sti.c,v 1.23 2020/12/23 08:34:35 tsutsui Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -31,11 +31,11 @@
* TODO:
* call sti procs asynchronously;
* implement console scroll-back;
- * X11 support.
+ * X11 support on more models.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.22 2020/09/05 16:30:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.23 2020/12/23 08:34:35 tsutsui Exp $");
#include "wsdisplay.h"
@@ -80,32 +80,32 @@ void sti_eraserows(void *, int, int, lon
int sti_alloc_attr(void *, int, int, int, long *);
struct wsdisplay_emulops sti_emulops = {
- sti_cursor,
- sti_mapchar,
- sti_putchar,
- sti_copycols,
- sti_erasecols,
- sti_copyrows,
- sti_eraserows,
- sti_alloc_attr
+ .cursor = sti_cursor,
+ .mapchar = sti_mapchar,
+ .putchar = sti_putchar,
+ .copycols = sti_copycols,
+ .erasecols = sti_erasecols,
+ .copyrows = sti_copyrows,
+ .eraserows = sti_eraserows,
+ .allocattr = sti_alloc_attr
};
const struct wsdisplay_accessops sti_accessops = {
- sti_ioctl,
- sti_mmap,
- sti_alloc_screen,
- sti_free_screen,
- sti_show_screen,
- sti_load_font
+ .ioctl = sti_ioctl,
+ .mmap = sti_mmap,
+ .alloc_screen = sti_alloc_screen,
+ .free_screen = sti_free_screen,
+ .show_screen = sti_show_screen,
+ .load_font = sti_load_font
};
enum sti_bmove_funcs {
bmf_clear, bmf_copy, bmf_invert, bmf_underline
};
-int sti_inqcfg(struct sti_screen *, struct sti_inqconfout *);
void sti_bmove(struct sti_screen *, int, int, int, int, int, int,
enum sti_bmove_funcs);
+int sti_inqcfg(struct sti_screen *, struct sti_inqconfout *);
int sti_setcment(struct sti_screen *, u_int, u_char, u_char, u_char);
struct sti_screen *sti_attach_screen(struct sti_softc *, int);
@@ -118,6 +118,15 @@ int sti_rom_setup(struct sti_rom *, bus_
bus_space_handle_t, bus_addr_t *, u_int);
int sti_screen_setup(struct sti_screen *, int);
+int ngle_default_putcmap(struct sti_screen *, u_int, u_int);
+
+#ifndef SMALL_KERNEL
+void ngle_artist_setupfb(struct sti_screen *);
+void ngle_elk_setupfb(struct sti_screen *);
+void ngle_timber_setupfb(struct sti_screen *);
+int ngle_putcmap(struct sti_screen *, u_int, u_int);
+#endif
+
#if NSTI_PCI > 0
#define STI_ENABLE_ROM(sc) \
do { \
@@ -210,51 +219,52 @@ sti_rom_setup(struct sti_rom *rom, bus_s
/*
* Get ROM header and code function pointers.
*/
+
dd = >rom_dd;
rom->rom_devtype = bus_space_read_1(memt, romh, 3);
if (rom->rom_devtype == STI_DEVTYPE1) {
- dd->dd_type = bus_space_read_1(memt, romh, 0x03);
- dd->dd_nmon = bus_space_read_1(memt, romh, 0x07);
- dd->dd_grrev = bus_space_read_1(memt, romh, 0x0b);
- dd->dd_lrrev = bus_space_read_1(memt, romh, 0x0f);
- dd->dd_grid[0] = parseword(0x10);
- dd->dd_grid[1] = parseword(0x20);
- dd->dd_fntaddr = parseword(0x30) & ~3;
- dd->dd_maxst = parseword(0x40);
- dd->dd_romend = parseword(0x50) & ~3;
- dd->dd_reglst = parseword(0x60) & ~3;
- dd->dd_maxreent= parseshort(0x70);
- dd->dd_maxtimo = parseshort(0x78);
- dd->dd_montbl = parseword(0x80) & ~3;
- dd->dd_udaddr = parseword(0x90) & ~3;
- dd->dd_stimemreq=parseword(0xa0);
- dd->dd_udsize = parseword(0xb0);
- dd->dd_pwruse = parseshort(0xc0);
- dd->dd_bussup = bus_space_read_1(memt, romh, 0xcb);
- dd->dd_ebussup = bus_space_read_1(memt, romh, 0xcf);
- dd->dd_altcodet=
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: skrll
Date: Wed Dec 23 08:17:01 UTC 2020
Modified Files:
src/sys/dev/ata: ata_subr.c
Log Message:
Add missing '\n' in debug
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ata/ata_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/ata_subr.c
diff -u src/sys/dev/ata/ata_subr.c:1.12 src/sys/dev/ata/ata_subr.c:1.13
--- src/sys/dev/ata/ata_subr.c:1.12 Sat Dec 19 18:09:44 2020
+++ src/sys/dev/ata/ata_subr.c Wed Dec 23 08:17:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_subr.c,v 1.12 2020/12/19 18:09:44 jmcneill Exp $ */
+/* $NetBSD: ata_subr.c,v 1.13 2020/12/23 08:17:01 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.12 2020/12/19 18:09:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.13 2020/12/23 08:17:01 skrll Exp $");
#include "opt_ata.h"
@@ -306,7 +306,7 @@ ata_queue_alloc_slot(struct ata_channel
KASSERT(mutex_owned(>ch_lock));
KASSERT(chq->queue_active < chq->queue_openings);
- ATADEBUG_PRINT(("%s: channel %d qavail 0x%x qact %d",
+ ATADEBUG_PRINT(("%s: channel %d qavail 0x%x qact %d\n",
__func__, chp->ch_channel,
chq->queue_xfers_avail, chq->queue_active),
DEBUG_XFERS);
