CVS commit: src/sys
Module Name:src Committed By: mrg Date: Sun Jul 21 08:24:32 UTC 2019 Modified Files: src/sys/arch/arm/altera: cycv_gmac.c src/sys/arch/arm/amlogic: meson_dwmac.c src/sys/arch/arm/rockchip: rk_gmac.c src/sys/arch/arm/sunxi: sunxi_gmac.c src/sys/dev/ic: dwc_gmac.c dwc_gmac_var.h Log Message: move DWCGMAC_MPSAFE into dwc_gmac_var.h and introduce an additional define that is 0 or FDT_INTR_MPSAFE that the frontends can use when passing to fdtbus_intr_establish(). with NET_MPSAFE enabled, this avoids hangs seen on rock64, as well as finishing the MPSAFE port for this driver. XXX: still don't know why the existing hangs occur. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/altera/cycv_gmac.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_dwmac.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_gmac.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_gmac.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/ic/dwc_gmac.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_gmac_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Sun Jul 21 08:24:32 UTC 2019
Modified Files:
src/sys/arch/arm/altera: cycv_gmac.c
src/sys/arch/arm/amlogic: meson_dwmac.c
src/sys/arch/arm/rockchip: rk_gmac.c
src/sys/arch/arm/sunxi: sunxi_gmac.c
src/sys/dev/ic: dwc_gmac.c dwc_gmac_var.h
Log Message:
move DWCGMAC_MPSAFE into dwc_gmac_var.h and introduce an
additional define that is 0 or FDT_INTR_MPSAFE that the
frontends can use when passing to fdtbus_intr_establish().
with NET_MPSAFE enabled, this avoids hangs seen on rock64,
as well as finishing the MPSAFE port for this driver.
XXX: still don't know why the existing hangs occur.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/altera/cycv_gmac.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_dwmac.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_gmac.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_gmac.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_gmac_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/altera/cycv_gmac.c
diff -u src/sys/arch/arm/altera/cycv_gmac.c:1.3 src/sys/arch/arm/altera/cycv_gmac.c:1.4
--- src/sys/arch/arm/altera/cycv_gmac.c:1.3 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/altera/cycv_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: cycv_gmac.c,v 1.4 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.4 2019/07/21 08:24:32 mrg Exp $");
#include
#include
@@ -129,7 +129,7 @@ cycv_gmac_attach(device_t parent, device
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0,
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
cycv_gmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.6 src/sys/arch/arm/amlogic/meson_dwmac.c:1.7
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.6 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.7 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.7 2019/07/21 08:24:32 mrg Exp $");
#include
#include
@@ -218,7 +218,8 @@ meson_dwmac_attach(device_t parent, devi
aprint_naive("\n");
aprint_normal(": Gigabit Ethernet Controller\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, meson_dwmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ meson_dwmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.13 src/sys/arch/arm/rockchip/rk_gmac.c:1.14
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.13 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/rockchip/rk_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.14 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.14 2019/07/21 08:24:32 mrg Exp $");
#include
#include
@@ -421,7 +421,8 @@ rk_gmac_attach(device_t parent, device_t
if (dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102) != 0)
return;
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, rk_gmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ rk_gmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/sunxi/sunxi_gmac.c
diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.5 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.5 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/sunxi/sunxi_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gmac.c,v 1.5 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: sunxi_gmac.c,v 1.6 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_R
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Sun Jul 21 09:38:29 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c Log Message: remove unused axe_accum and axe_idx members of struct axe_chain. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/if_axe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Sun Jul 21 09:38:29 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
remove unused axe_accum and axe_idx members of struct axe_chain.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/if_axe.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/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.100 src/sys/dev/usb/if_axe.c:1.101
--- src/sys/dev/usb/if_axe.c:1.100 Mon Jul 15 06:40:21 2019
+++ src/sys/dev/usb/if_axe.c Sun Jul 21 09:38:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.100 2019/07/15 06:40:21 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.100 2019/07/15 06:40:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -138,8 +138,6 @@ struct axe_chain {
struct axe_softc *axe_sc;
struct usbd_xfer *axe_xfer;
uint8_t *axe_buf;
- int axe_accum;
- int axe_idx;
};
struct axe_cdata {
@@ -1360,7 +1358,6 @@ axe_rx_list_init(struct axe_softc *sc)
for (i = 0; i < AXE_RX_LIST_CNT; i++) {
c = &cd->axe_rx_chain[i];
c->axe_sc = sc;
- c->axe_idx = i;
if (c->axe_xfer == NULL) {
int err = usbd_create_xfer(sc->axe_ep[AXE_ENDPT_RX],
sc->axe_bufsz, 0, 0, &c->axe_xfer);
@@ -1385,7 +1382,6 @@ axe_tx_list_init(struct axe_softc *sc)
for (i = 0; i < AXE_TX_LIST_CNT; i++) {
c = &cd->axe_tx_chain[i];
c->axe_sc = sc;
- c->axe_idx = i;
if (c->axe_xfer == NULL) {
int err = usbd_create_xfer(sc->axe_ep[AXE_ENDPT_TX],
sc->axe_bufsz, USBD_FORCE_SHORT_XFER, 0,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Sun Jul 21 10:27:56 UTC 2019 Modified Files: src/sys/dev/usb: if_auereg.h if_axe.c if_cdce.c if_cuereg.h if_kuereg.h if_udavreg.h if_upl.c if_url.c if_urlreg.h Log Message: remove unused structure members. this brings most _chain and _cdata structures into being identical for usb ethernet drivers. upl(4) and url(4) need more work. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/if_auereg.h cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/if_axe.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_cdce.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_cuereg.h \ src/sys/dev/usb/if_kuereg.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/if_udavreg.h \ src/sys/dev/usb/if_urlreg.h cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_upl.c cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_url.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Sun Jul 21 10:27:56 UTC 2019
Modified Files:
src/sys/dev/usb: if_auereg.h if_axe.c if_cdce.c if_cuereg.h if_kuereg.h
if_udavreg.h if_upl.c if_url.c if_urlreg.h
Log Message:
remove unused structure members. this brings most _chain and
_cdata structures into being identical for usb ethernet drivers.
upl(4) and url(4) need more work.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/if_auereg.h
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_cuereg.h \
src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_url.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/if_auereg.h
diff -u src/sys/dev/usb/if_auereg.h:1.28 src/sys/dev/usb/if_auereg.h:1.29
--- src/sys/dev/usb/if_auereg.h:1.28 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_auereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_auereg.h,v 1.28 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_auereg.h,v 1.29 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul . All rights reserved.
@@ -220,9 +220,7 @@ struct aue_cdata {
struct aue_chain aue_rx_chain[AUE_RX_LIST_CNT];
struct aue_intrpkt aue_ibuf;
int aue_tx_prod;
- int aue_tx_cons;
int aue_tx_cnt;
- int aue_rx_prod;
};
struct aue_softc {
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.101 src/sys/dev/usb/if_axe.c:1.102
--- src/sys/dev/usb/if_axe.c:1.101 Sun Jul 21 09:38:28 2019
+++ src/sys/dev/usb/if_axe.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.102 2019/07/21 10:27:56 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.102 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -144,9 +144,7 @@ struct axe_cdata {
struct axe_chain axe_tx_chain[AXE_TX_LIST_CNT];
struct axe_chain axe_rx_chain[AXE_RX_LIST_CNT];
int axe_tx_prod;
- int axe_tx_cons;
int axe_tx_cnt;
- int axe_rx_prod;
};
struct axe_softc {
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.52 src/sys/dev/usb/if_cdce.c:1.53
--- src/sys/dev/usb/if_cdce.c:1.52 Sat Jun 29 07:46:19 2019
+++ src/sys/dev/usb/if_cdce.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.52 2019/06/29 07:46:19 skrll Exp $ */
+/* $NetBSD: if_cdce.c,v 1.53 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.52 2019/06/29 07:46:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.53 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -100,9 +100,7 @@ struct cdce_cdata {
struct cdce_chain cdce_rx_chain[CDCE_RX_LIST_CNT];
struct cdce_chain cdce_tx_chain[CDCE_TX_LIST_CNT];
int cdce_tx_prod;
- int cdce_tx_cons;
int cdce_tx_cnt;
- int cdce_rx_prod;
};
struct cdce_softc {
Index: src/sys/dev/usb/if_cuereg.h
diff -u src/sys/dev/usb/if_cuereg.h:1.21 src/sys/dev/usb/if_cuereg.h:1.22
--- src/sys/dev/usb/if_cuereg.h:1.21 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_cuereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_cuereg.h,v 1.22 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul . All rights reserved.
@@ -159,9 +159,7 @@ struct cue_cdata {
struct cue_chain cue_tx_chain[CUE_TX_LIST_CNT];
struct cue_chain cue_rx_chain[CUE_RX_LIST_CNT];
int cue_tx_prod;
- int cue_tx_cons;
int cue_tx_cnt;
- int cue_rx_prod;
};
struct cue_softc {
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.21 src/sys/dev/usb/if_kuereg.h:1.22
--- src/sys/dev/usb/if_kuereg.h:1.21 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_kuereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.22 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul . All rights reserved.
@@ -154,9 +154,7 @@ struct kue_cdata {
struct kue_chain kue_tx_chain[KUE_TX_LIST_CNT];
struct kue_chain kue_rx_chain[KUE_RX_LIST_CNT];
int kue_tx_prod;
- int kue_tx_cons;
int kue_tx_cnt;
- int kue_rx_prod;
};
struct kue_softc {
Index: src/sys/dev/us
CVS commit: src/etc
Module Name:src Committed By: maya Date: Sun Jul 21 11:14:19 UTC 2019 Modified Files: src/etc/etc.amd64: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf Log Message: Create up to pci19. We probably don't need more than one pci file, but the code needs to be changed for it, which might introduce problems, and we're just before a branch. Not needed for evbarm because it uses devpubd by default. Stopgap fix for PR xsrc/54388. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.29 -r1.30 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: maya Date: Sun Jul 21 11:14:19 UTC 2019 Modified Files: src/etc/etc.amd64: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf Log Message: Create up to pci19. We probably don't need more than one pci file, but the code needs to be changed for it, which might introduce problems, and we're just before a branch. Not needed for evbarm because it uses devpubd by default. Stopgap fix for PR xsrc/54388. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.29 -r1.30 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amd64/MAKEDEV.conf diff -u src/etc/etc.amd64/MAKEDEV.conf:1.27 src/etc/etc.amd64/MAKEDEV.conf:1.28 --- src/etc/etc.amd64/MAKEDEV.conf:1.27 Sun Jan 27 08:53:28 2019 +++ src/etc/etc.amd64/MAKEDEV.conf Sun Jul 21 11:14:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.27 2019/01/27 08:53:28 maxv Exp $ +# $NetBSD: MAKEDEV.conf,v 1.28 2019/07/21 11:14:18 maya Exp $ # As of 2003-04-17, the "init" case must not create more than 890 entries. all_md) @@ -38,7 +38,8 @@ all_md) makedev ttyCZ0 ttyCY0 makedev agp0 makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7 - makedev pci8 pci9 pci10 pci11 + makedev pci8 pci9 pci10 pci11 pci12 pci13 pci14 + makedev pci15 pci16 pci18 pci19 makedev altq makedev cir0 cir1 irframe0 irframe1 makedev kttcp Index: src/etc/etc.i386/MAKEDEV.conf diff -u src/etc/etc.i386/MAKEDEV.conf:1.29 src/etc/etc.i386/MAKEDEV.conf:1.30 --- src/etc/etc.i386/MAKEDEV.conf:1.29 Sun Jan 27 08:53:29 2019 +++ src/etc/etc.i386/MAKEDEV.conf Sun Jul 21 11:14:19 2019 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.29 2019/01/27 08:53:29 maxv Exp $ +# $NetBSD: MAKEDEV.conf,v 1.30 2019/07/21 11:14:19 maya Exp $ # As of 2005-03-15, the "init" case must not create more than 1024 entries. all_md) @@ -40,7 +40,8 @@ all_md) makedev ttyCZ0 ttyCY0 makedev agp0 makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7 - makedev pci8 pci9 pci10 pci11 + makedev pci8 pci9 pci10 pci11 pci12 pci13 pci14 + makedev pci15 pci16 pci17 pci18 pci19 makedev altq makedev cir0 cir1 irframe0 irframe1 makedev dmoverio
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 21 11:35:37 UTC 2019
Modified Files:
src/usr.sbin/sysinst: util.c
Log Message:
scripting_fprintf: when we traverse the va_list twice, we need to save
it before the first and reset it before the second pass.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/sysinst/util.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/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.26 src/usr.sbin/sysinst/util.c:1.27
--- src/usr.sbin/sysinst/util.c:1.26 Mon Jul 8 19:36:02 2019
+++ src/usr.sbin/sysinst/util.c Sun Jul 21 11:35:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.26 2019/07/08 19:36:02 martin Exp $ */
+/* $NetBSD: util.c,v 1.27 2019/07/21 11:35:36 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1469,9 +1469,14 @@ done:
void
scripting_vfprintf(FILE *f, const char *fmt, va_list ap)
{
+ va_list saved;
+ if (f && script)
+ va_copy(saved, ap);
if (f)
(void)vfprintf(f, fmt, ap);
+ if (f && script)
+ va_copy(ap, saved);
if (script)
(void)vfprintf(script, fmt, ap);
}
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 21 11:35:37 UTC 2019 Modified Files: src/usr.sbin/sysinst: util.c Log Message: scripting_fprintf: when we traverse the va_list twice, we need to save it before the first and reset it before the second pass. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/bzip2/dist
Module Name:src Committed By: maya Date: Sun Jul 21 11:35:33 UTC 2019 Update of /cvsroot/src/external/bsd/bzip2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23477 Log Message: Import bzip2 1.0.8 Status: Vendor Tag: JSEWARD Release Tags: bzip2-1-0-8 U src/external/bsd/bzip2/dist/CHANGES U src/external/bsd/bzip2/dist/LICENSE U src/external/bsd/bzip2/dist/Makefile U src/external/bsd/bzip2/dist/Makefile-libbz2_so U src/external/bsd/bzip2/dist/README U src/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS U src/external/bsd/bzip2/dist/README.XML.STUFF U src/external/bsd/bzip2/dist/bz-common.xsl U src/external/bsd/bzip2/dist/bz-fo.xsl U src/external/bsd/bzip2/dist/bz-html.xsl U src/external/bsd/bzip2/dist/bzdiff U src/external/bsd/bzip2/dist/bzgrep U src/external/bsd/bzip2/dist/bzip.css U src/external/bsd/bzip2/dist/bzmore U src/external/bsd/bzip2/dist/dlltest.dsp U src/external/bsd/bzip2/dist/entities.xml U src/external/bsd/bzip2/dist/format.pl U src/external/bsd/bzip2/dist/libbz2.def U src/external/bsd/bzip2/dist/libbz2.dsp U src/external/bsd/bzip2/dist/makefile.msc U src/external/bsd/bzip2/dist/manual.html C src/external/bsd/bzip2/dist/manual.pdf C src/external/bsd/bzip2/dist/manual.ps U src/external/bsd/bzip2/dist/manual.xml U src/external/bsd/bzip2/dist/sample1.bz2 U src/external/bsd/bzip2/dist/sample1.ref U src/external/bsd/bzip2/dist/sample2.bz2 U src/external/bsd/bzip2/dist/sample2.ref U src/external/bsd/bzip2/dist/sample3.bz2 U src/external/bsd/bzip2/dist/sample3.ref U src/external/bsd/bzip2/dist/words0 U src/external/bsd/bzip2/dist/words1 U src/external/bsd/bzip2/dist/words2 U src/external/bsd/bzip2/dist/words3 U src/external/bsd/bzip2/dist/xmlproc.sh U src/external/bsd/bzip2/dist/blocksort.c C src/external/bsd/bzip2/dist/bzip2.c C src/external/bsd/bzip2/dist/bzip2recover.c C src/external/bsd/bzip2/dist/bzlib.c U src/external/bsd/bzip2/dist/bzlib.h C src/external/bsd/bzip2/dist/bzlib_private.h U src/external/bsd/bzip2/dist/compress.c U src/external/bsd/bzip2/dist/crctable.c C src/external/bsd/bzip2/dist/decompress.c U src/external/bsd/bzip2/dist/dlltest.c U src/external/bsd/bzip2/dist/huffman.c U src/external/bsd/bzip2/dist/mk251.c U src/external/bsd/bzip2/dist/randtable.c U src/external/bsd/bzip2/dist/spewG.c U src/external/bsd/bzip2/dist/unzcrash.c U src/external/bsd/bzip2/dist/bzdiff.1 U src/external/bsd/bzip2/dist/bzgrep.1 C src/external/bsd/bzip2/dist/bzip2.1 U src/external/bsd/bzip2/dist/bzmore.1 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jJSEWARD:yesterday -jJSEWARD src/external/bsd/bzip2/dist
CVS import: src/external/bsd/bzip2/dist
Module Name:src Committed By: maya Date: Sun Jul 21 11:35:33 UTC 2019 Update of /cvsroot/src/external/bsd/bzip2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23477 Log Message: Import bzip2 1.0.8 Status: Vendor Tag: JSEWARD Release Tags: bzip2-1-0-8 U src/external/bsd/bzip2/dist/CHANGES U src/external/bsd/bzip2/dist/LICENSE U src/external/bsd/bzip2/dist/Makefile U src/external/bsd/bzip2/dist/Makefile-libbz2_so U src/external/bsd/bzip2/dist/README U src/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS U src/external/bsd/bzip2/dist/README.XML.STUFF U src/external/bsd/bzip2/dist/bz-common.xsl U src/external/bsd/bzip2/dist/bz-fo.xsl U src/external/bsd/bzip2/dist/bz-html.xsl U src/external/bsd/bzip2/dist/bzdiff U src/external/bsd/bzip2/dist/bzgrep U src/external/bsd/bzip2/dist/bzip.css U src/external/bsd/bzip2/dist/bzmore U src/external/bsd/bzip2/dist/dlltest.dsp U src/external/bsd/bzip2/dist/entities.xml U src/external/bsd/bzip2/dist/format.pl U src/external/bsd/bzip2/dist/libbz2.def U src/external/bsd/bzip2/dist/libbz2.dsp U src/external/bsd/bzip2/dist/makefile.msc U src/external/bsd/bzip2/dist/manual.html C src/external/bsd/bzip2/dist/manual.pdf C src/external/bsd/bzip2/dist/manual.ps U src/external/bsd/bzip2/dist/manual.xml U src/external/bsd/bzip2/dist/sample1.bz2 U src/external/bsd/bzip2/dist/sample1.ref U src/external/bsd/bzip2/dist/sample2.bz2 U src/external/bsd/bzip2/dist/sample2.ref U src/external/bsd/bzip2/dist/sample3.bz2 U src/external/bsd/bzip2/dist/sample3.ref U src/external/bsd/bzip2/dist/words0 U src/external/bsd/bzip2/dist/words1 U src/external/bsd/bzip2/dist/words2 U src/external/bsd/bzip2/dist/words3 U src/external/bsd/bzip2/dist/xmlproc.sh U src/external/bsd/bzip2/dist/blocksort.c C src/external/bsd/bzip2/dist/bzip2.c C src/external/bsd/bzip2/dist/bzip2recover.c C src/external/bsd/bzip2/dist/bzlib.c U src/external/bsd/bzip2/dist/bzlib.h C src/external/bsd/bzip2/dist/bzlib_private.h U src/external/bsd/bzip2/dist/compress.c U src/external/bsd/bzip2/dist/crctable.c C src/external/bsd/bzip2/dist/decompress.c U src/external/bsd/bzip2/dist/dlltest.c U src/external/bsd/bzip2/dist/huffman.c U src/external/bsd/bzip2/dist/mk251.c U src/external/bsd/bzip2/dist/randtable.c U src/external/bsd/bzip2/dist/spewG.c U src/external/bsd/bzip2/dist/unzcrash.c U src/external/bsd/bzip2/dist/bzdiff.1 U src/external/bsd/bzip2/dist/bzgrep.1 C src/external/bsd/bzip2/dist/bzip2.1 U src/external/bsd/bzip2/dist/bzmore.1 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jJSEWARD:yesterday -jJSEWARD src/external/bsd/bzip2/dist
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 21 11:36:34 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Reintroduce scripting for writing the disklabel To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/disklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 21 11:36:34 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
Reintroduce scripting for writing the disklabel
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/disklabel.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/sysinst/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.7 src/usr.sbin/sysinst/disklabel.c:1.8
--- src/usr.sbin/sysinst/disklabel.c:1.7 Fri Jul 12 18:22:36 2019
+++ src/usr.sbin/sysinst/disklabel.c Sun Jul 21 11:36:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.7 2019/07/12 18:22:36 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.8 2019/07/21 11:36:34 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -300,32 +300,34 @@ disklabel_write_to_disk(struct disk_part
sizeof(parts->l.d_typename));
lp = parts->l.d_partitions;
- fprintf(f, "%s|NetBSD installation generated:\\\n",
+ scripting_fprintf(NULL, "cat <%s\n", fname);
+ scripting_fprintf(f, "%s|NetBSD installation generated:\\\n",
parts->l.d_typename);
- fprintf(f, "\t:nc#%d:nt#%d:ns#%d:\\\n",
+ scripting_fprintf(f, "\t:nc#%d:nt#%d:ns#%d:\\\n",
parts->l.d_ncylinders, parts->l.d_ntracks, parts->l.d_nsectors);
- fprintf(f, "\t:sc#%d:su#%" PRIu32 ":\\\n",
+ scripting_fprintf(f, "\t:sc#%d:su#%" PRIu32 ":\\\n",
parts->l.d_secpercyl, lp[RAW_PART].p_offset+lp[RAW_PART].p_size);
- fprintf(f, "\t:se#%d:\\\n", parts->l.d_secsize);
+ scripting_fprintf(f, "\t:se#%d:\\\n", parts->l.d_secsize);
for (i = 0; i < parts->l.d_npartitions; i++) {
- fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%" PRIu32
+ scripting_fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%" PRIu32
":t%c=%s:", 'a'+i, (uint32_t)lp[i].p_size,
'a'+i, (uint32_t)lp[i].p_offset, 'a'+i,
getfslabelname(lp[i].p_fstype, 0));
if (lp[i].p_fstype == FS_BSDLFS ||
lp[i].p_fstype == FS_BSDFFS)
- fprintf (f, "b%c#%" PRIu32 ":f%c#%" PRIu32
+ scripting_fprintf (f, "b%c#%" PRIu32 ":f%c#%" PRIu32
":", 'a'+i,
(uint32_t)(lp[i].p_fsize *
lp[i].p_frag),
'a'+i, (uint32_t)lp[i].p_fsize);
if (i < parts->l.d_npartitions - 1)
- fprintf(f, "\\\n");
+ scripting_fprintf(f, "\\\n");
else
- fprintf(f, "\n");
+ scripting_fprintf(f, "\n");
}
+ scripting_fprintf(NULL, "EOF\n");
fclose(f);
CVS commit: src/external/bsd/bzip2/dist
Module Name:src Committed By: maya Date: Sun Jul 21 11:52:14 UTC 2019 Modified Files: src/external/bsd/bzip2/dist: bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib_private.h decompress.c Log Message: Merge bzip2 1.0.8 1.0.7 (27 Jun 19) ~ * Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH * bzip2: Fix return value when combining --test,-t and -q. * bzip2recover: Fix buffer overflow for large argv[0] * bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) * Make sure nSelectors is not out of range (CVE-2019-12900) 1.0.8 (13 Jul 19) ~ * Accept as many selectors as the file format allows. This relaxes the fix for CVE-2019-12900 from 1.0.7 so that bzip2 allows decompression of bz2 files that use (too) many selectors again. * Fix handling of large (> 4GB) files on Windows. * Cleanup of bzdiff and bzgrep scripts so they don't use any bash extensions and handle multiple archives correctly. * There is now a bz2-files testsuite at https://sourceware.org/git/bzip2-tests.git To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bzip2/dist/bzip2.1 \ src/external/bsd/bzip2/dist/bzlib.c \ src/external/bsd/bzip2/dist/bzlib_private.h \ src/external/bsd/bzip2/dist/decompress.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bzip2/dist/bzip2.c \ src/external/bsd/bzip2/dist/bzip2recover.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bzip2/dist/bzip2.1 diff -u src/external/bsd/bzip2/dist/bzip2.1:1.3 src/external/bsd/bzip2/dist/bzip2.1:1.4 --- src/external/bsd/bzip2/dist/bzip2.1:1.3 Mon May 7 00:45:47 2012 +++ src/external/bsd/bzip2/dist/bzip2.1 Sun Jul 21 11:52:14 2019 @@ -1,31 +1,40 @@ -.\" $NetBSD: bzip2.1,v 1.3 2012/05/07 00:45:47 wiz Exp $ +.\" $NetBSD: bzip2.1,v 1.4 2019/07/21 11:52:14 maya Exp $ .\" -.Dd May 14, 2010 -.Dt BZIP2 1 -.Os -.Sh NAME -.Nm bzip2 , -.Nm bunzip2 , -.Nm bzcat , -.Nm bzip2recover -.Nd block-sorting file compressor -.Sh SYNOPSIS -.Nm bzip2 -.Op Fl 123456789cdfkLqstVvz -.Op Ar filename Ar -.Pp -.Nm bunzip2 -.Op Fl fkLVvs -.Op Ar filename Ar -.Pp -.Nm bzcat -.Op Fl s -.Op Ar filename Ar -.Pp -.Nm bzip2recover -.Ar filename -.Sh DESCRIPTION -.Nm bzip2 +.PU +.TH bzip2 1 +.SH NAME +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.8 +.br +bzcat \- decompresses files to stdout +.br +bzip2recover \- recovers data from damaged bzip2 files + +.SH SYNOPSIS +.ll +8 +.B bzip2 +.RB [ " \-cdfkqstvzVL123456789 " ] +[ +.I "filenames \&..." +] +.ll -8 +.br +.B bunzip2 +.RB [ " \-fkvsVL " ] +[ +.I "filenames \&..." +] +.br +.B bzcat +.RB [ " \-s " ] +[ +.I "filenames \&..." +] +.br +.B bzip2recover +.I "filename" + +.SH DESCRIPTION +.I bzip2 compresses files using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression is generally considerably better than that achieved by @@ -486,25 +495,51 @@ I/O error messages are not as helpful as .Nm bzip2 tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading. -.Pp -This manual page pertains to version 1.0.6 of -.Nm bzip2 . + +This manual page pertains to version 1.0.8 of +.I bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions -0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the -following exception: 0.9.0 and above can correctly decompress multiple -concatenated compressed files. -0.1pl2 cannot do this; it will stop after decompressing just the first -file in the stream. -.Pp -.Nm bzip2recover -versions prior to 1.0.2 used 32-bit integers to represent bit -positions in compressed files, so they could not handle compressed -files more than 512 megabytes long. -Versions 1.0.2 and above use 64-bit ints on some platforms which -support them (GNU supported targets, and Windows). -To establish whether or not -.Nm bzip2recover -was built with such a limitation, run it without arguments. -In any event you can build yourself an unlimited version if you can -recompile it with MaybeUInt64 set to be an unsigned 64-bit integer. +0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following +exception: 0.9.0 and above can correctly decompress multiple +concatenated compressed files. 0.1pl2 cannot do this; it will stop +after decompressing just the first file in the stream. + +.I bzip2recover +versions prior to 1.0.2 used 32-bit integers to represent +bit positions in compressed files, so they could not handle compressed +files more than 512 megabytes long. Versions 1.0.2 and above use +64-bit ints on some platforms which support them (GNU supported +targets, and Windows). To establish whether or not bzip2recover was +built with such a limitation, run it without arguments. In any event +you can bu
CVS commit: src/external/bsd/bzip2/dist
Module Name:src Committed By: maya Date: Sun Jul 21 11:52:14 UTC 2019 Modified Files: src/external/bsd/bzip2/dist: bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib_private.h decompress.c Log Message: Merge bzip2 1.0.8 1.0.7 (27 Jun 19) ~ * Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH * bzip2: Fix return value when combining --test,-t and -q. * bzip2recover: Fix buffer overflow for large argv[0] * bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) * Make sure nSelectors is not out of range (CVE-2019-12900) 1.0.8 (13 Jul 19) ~ * Accept as many selectors as the file format allows. This relaxes the fix for CVE-2019-12900 from 1.0.7 so that bzip2 allows decompression of bz2 files that use (too) many selectors again. * Fix handling of large (> 4GB) files on Windows. * Cleanup of bzdiff and bzgrep scripts so they don't use any bash extensions and handle multiple archives correctly. * There is now a bz2-files testsuite at https://sourceware.org/git/bzip2-tests.git To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bzip2/dist/bzip2.1 \ src/external/bsd/bzip2/dist/bzlib.c \ src/external/bsd/bzip2/dist/bzlib_private.h \ src/external/bsd/bzip2/dist/decompress.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bzip2/dist/bzip2.c \ src/external/bsd/bzip2/dist/bzip2recover.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 21 11:56:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: When changing the user geometry, do not alter the disklabel internal geometry information. On drives only capable of doing CHS addressing, we rely on this data. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/disklabel.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/sysinst/disklabel.c diff -u src/usr.sbin/sysinst/disklabel.c:1.8 src/usr.sbin/sysinst/disklabel.c:1.9 --- src/usr.sbin/sysinst/disklabel.c:1.8 Sun Jul 21 11:36:34 2019 +++ src/usr.sbin/sysinst/disklabel.c Sun Jul 21 11:56:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.8 2019/07/21 11:36:34 martin Exp $ */ +/* $NetBSD: disklabel.c,v 1.9 2019/07/21 11:56:20 martin Exp $ */ /* * Copyright 2018 The NetBSD Foundation, Inc. @@ -99,18 +99,18 @@ disklabel_change_geom(struct disk_partit struct disklabel_disk_partitions *parts = (struct disklabel_disk_partitions*)arg; - disklabel_init_default_alignment(parts, nhead * nsec); - - parts->l.d_ncylinders = ncyl; - parts->l.d_ntracks = nhead; - parts->l.d_nsectors = nsec; - parts->l.d_secsize = DEV_BSIZE; - parts->l.d_secpercyl = nsec * nhead; + assert(parts->l.d_secsize != 0); + assert(parts->l.d_nsectors != 0); + assert(parts->l.d_ntracks != 0); + assert(parts->l.d_ncylinders != 0); + assert(parts->l.d_secpercyl != 0); + disklabel_init_default_alignment(parts, nhead * nsec); if (ncyl*nhead*nsec <= TINY_DISK_SIZE) set_default_sizemult(1); else set_default_sizemult(MEG/512); + return true; } @@ -273,6 +273,10 @@ disklabel_write_to_disk(struct disk_part size_t n; assert(parts->l.d_secsize != 0); + assert(parts->l.d_nsectors != 0); + assert(parts->l.d_ntracks != 0); + assert(parts->l.d_ncylinders != 0); + assert(parts->l.d_secpercyl != 0); sprintf(fname, "/tmp/disklabel.%u", getpid()); f = fopen(fname, "w");
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 21 11:56:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: When changing the user geometry, do not alter the disklabel internal geometry information. On drives only capable of doing CHS addressing, we rely on this data. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/disklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rjs
Date: Sun Jul 21 12:15:14 UTC 2019
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
Add ftcolor.h to build from freetype2.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.209 src/distrib/sets/lists/xcomp/mi:1.210
--- src/distrib/sets/lists/xcomp/mi:1.209 Tue Jul 9 22:17:33 2019
+++ src/distrib/sets/lists/xcomp/mi Sun Jul 21 12:15:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.209 2019/07/09 22:17:33 mrg Exp $
+# $NetBSD: mi,v 1.210 2019/07/21 12:15:13 rjs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -581,6 +581,7 @@
./usr/X11R7/include/freetype2/freetype/ftcffdrv.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/ftchapters.h -unknown- xorg
./usr/X11R7/include/freetype2/freetype/ftcid.h -unknown- xorg
+./usr/X11R7/include/freetype2/freetype/ftcolor.h -unknown- xorg
./usr/X11R7/include/freetype2/freetype/ftdriver.h -unknown- xorg
./usr/X11R7/include/freetype2/freetype/fterrdef.h -unknown- xorg
./usr/X11R7/include/freetype2/freetype/fterrors.h -unknown- xorg
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.23 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.24
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.23 Wed May 9 07:28:44 2018
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Sun Jul 21 12:15:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/05/09 07:28:44 maya Exp $
+# $NetBSD: Makefile,v 1.24 2019/07/21 12:15:14 rjs Exp $
.include
@@ -9,7 +9,8 @@ SUBDIR= config
INCSDIR=${X11INCDIR}/freetype2/freetype
INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
- ftchapters.h ftcid.h ftdriver.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
+ ftchapters.h ftcid.h ftcolor.h ftdriver.h fterrdef.h fterrors.h \
+ ftfntfmt.h ftgasp.h \
ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
ftparams.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
CVS commit: src
Module Name:src Committed By: rjs Date: Sun Jul 21 12:15:14 UTC 2019 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/lib/freetype/freetype: Makefile Log Message: Add ftcolor.h to build from freetype2. To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.23 -r1.24 \ src/external/mit/xorg/lib/freetype/freetype/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 21 12:23:18 UTC 2019
Modified Files:
src/usr.sbin/sysinst: util.c
Log Message:
scripting_vprintf: to simplify things for gcc (and avoid "may be used
uninitialized" warnings) just always copy the va_list and use one
copy for the first pass, the other for the second.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/sysinst/util.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/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.27 src/usr.sbin/sysinst/util.c:1.28
--- src/usr.sbin/sysinst/util.c:1.27 Sun Jul 21 11:35:36 2019
+++ src/usr.sbin/sysinst/util.c Sun Jul 21 12:23:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.27 2019/07/21 11:35:36 martin Exp $ */
+/* $NetBSD: util.c,v 1.28 2019/07/21 12:23:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1469,16 +1469,13 @@ done:
void
scripting_vfprintf(FILE *f, const char *fmt, va_list ap)
{
- va_list saved;
+ va_list ap2;
- if (f && script)
- va_copy(saved, ap);
+ va_copy(ap2, ap);
if (f)
(void)vfprintf(f, fmt, ap);
- if (f && script)
- va_copy(ap, saved);
if (script)
- (void)vfprintf(script, fmt, ap);
+ (void)vfprintf(script, fmt, ap2);
}
void
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 21 12:23:18 UTC 2019 Modified Files: src/usr.sbin/sysinst: util.c Log Message: scripting_vprintf: to simplify things for gcc (and avoid "may be used uninitialized" warnings) just always copy the va_list and use one copy for the first pass, the other for the second. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/printf
Module Name:src Committed By: kre Date: Sun Jul 21 15:00:18 UTC 2019 Modified Files: src/tests/usr.bin/printf: t_builtin.sh Log Message: Correct a typo. It is atf_require_prog not atf_require_pfog ... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/printf/t_builtin.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/printf/t_builtin.sh diff -u src/tests/usr.bin/printf/t_builtin.sh:1.4 src/tests/usr.bin/printf/t_builtin.sh:1.5 --- src/tests/usr.bin/printf/t_builtin.sh:1.4 Fri Sep 14 19:52:23 2018 +++ src/tests/usr.bin/printf/t_builtin.sh Sun Jul 21 15:00:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: t_builtin.sh,v 1.4 2018/09/14 19:52:23 kre Exp $ +# $NetBSD: t_builtin.sh,v 1.5 2019/07/21 15:00:18 kre Exp $ # # Copyright (c) 2018 The NetBSD Foundation, Inc. # All rights reserved. @@ -55,7 +55,7 @@ do_printf() case "$*" in *\'*) $Running_under_ATF && atf_require_prog printf - $Running_under_ATF && atf_require_pfog sed + $Running_under_ATF && atf_require_prog sed ;; esac
CVS commit: src/tests/usr.bin/printf
Module Name:src Committed By: kre Date: Sun Jul 21 15:00:18 UTC 2019 Modified Files: src/tests/usr.bin/printf: t_builtin.sh Log Message: Correct a typo. It is atf_require_prog not atf_require_pfog ... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/printf/t_builtin.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/printf
Module Name:src Committed By: kre Date: Sun Jul 21 15:25:39 UTC 2019 Modified Files: src/usr.bin/printf: printf.c Log Message: Stop assuming that printf handles options in any way at all (it doesn't - that is, shouldn't) which includes processing -- as an "end of options". The first arg is (always) the format string. Remove call to getopt() (but still do associated changes to argc/argv) Note: for now this is #if 0's out instead of being deleted, the old code should be fully removed sometime soon. Problem pointed out on tech-userlevel by Thierry Laronde. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/usr.bin/printf/printf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/printf
Module Name:src
Committed By: kre
Date: Sun Jul 21 15:25:39 UTC 2019
Modified Files:
src/usr.bin/printf: printf.c
Log Message:
Stop assuming that printf handles options in any way at all
(it doesn't - that is, shouldn't) which includes processing -- as an
"end of options". The first arg is (always) the format string.
Remove call to getopt() (but still do associated changes to argc/argv)
Note: for now this is #if 0's out instead of being deleted, the old
code should be fully removed sometime soon.
Problem pointed out on tech-userlevel by Thierry Laronde.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/printf/printf.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/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.48 src/usr.bin/printf/printf.c:1.49
--- src/usr.bin/printf/printf.c:1.48 Sun Jan 27 12:03:09 2019
+++ src/usr.bin/printf/printf.c Sun Jul 21 15:25:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.48 2019/01/27 12:03:09 kre Exp $ */
+/* $NetBSD: printf.c,v 1.49 2019/07/21 15:25:39 kre Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.48 2019/01/27 12:03:09 kre Exp $");
+__RCSID("$NetBSD: printf.c,v 1.49 2019/07/21 15:25:39 kre Exp $");
#endif
#endif /* not lint */
@@ -130,7 +130,7 @@ main(int argc, char *argv[])
char nextch;
char *format;
char ch;
- int error, o;
+ int error;
#if !defined(SHELL) && !defined(BUILTIN)
(void)setlocale (LC_ALL, "");
@@ -138,6 +138,13 @@ main(int argc, char *argv[])
rval = 0; /* clear for builtin versions (avoid holdover) */
+#if 0
+ int o;
+
+ /*
+ * printf does not comply with Posix XBD 12.2 - there are no opts,
+ * not even the -- end of options marker. Do not run getoot().
+ */
while ((o = getopt(argc, argv, "")) != -1) {
switch (o) {
case '?':
@@ -148,6 +155,10 @@ main(int argc, char *argv[])
}
argc -= optind;
argv += optind;
+#else
+ argc -= 1;
+ argv += 1;
+#endif
if (argc < 1) {
usage();
CVS commit: src/tests/usr.bin/printf
Module Name:src
Committed By: kre
Date: Sun Jul 21 15:25:59 UTC 2019
Modified Files:
src/tests/usr.bin/printf: printf.sh
Log Message:
Stop assuming that printf handles options in any way at all
(it doesn't - that is, shouldn't) which includes processing -- as an
"end of options". The first arg is (always) the format string.
Remove/fix tests that assumed the contrary.
Problem (with printf) pointed out on tech-userlevel by Thierry Laronde.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/printf/printf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/printf/printf.sh
diff -u src/tests/usr.bin/printf/printf.sh:1.3 src/tests/usr.bin/printf/printf.sh:1.4
--- src/tests/usr.bin/printf/printf.sh:1.3 Fri Sep 14 19:57:57 2018
+++ src/tests/usr.bin/printf/printf.sh Sun Jul 21 15:25:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: printf.sh,v 1.3 2018/09/14 19:57:57 kre Exp $
+# $NetBSD: printf.sh,v 1.4 2019/07/21 15:25:59 kre Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -206,23 +206,21 @@ basic()
{
setmsg basic
- for A in '' -- -@ # hope that '@' is not an option to printf...
- do
- if (do_printf $A >/dev/null 2>&1)
- then
- atf_fail "${A:-with no args} successful"
- fi
- if test -n "$( do_printf 2>/dev/null )"
- then
- atf_fail "${A:-with no args} produces text on stdout"
- fi
- if test -z "$( do_printf 2>&1 )"
- then
- atf_fail "${A:-with no args} no err/usage message"
- fi
-
- test -z "$A" && continue
+ if (do_printf >/dev/null 2>&1)
+ then
+ atf_fail "with no args successful"
+ fi
+ if test -n "$( do_printf 2>/dev/null )"
+ then
+ atf_fail "with no args produces text on stdout"
+ fi
+ if test -z "$( do_printf 2>&1 )"
+ then
+ atf_fail "with no args no err/usage message"
+ fi
+ for A in - -- X 1
+ do
if (do_printf "%${A}%" >/dev/null 2>&1)
then
atf_fail "%${A}% successful"
@@ -232,11 +230,10 @@ basic()
expect abcd abcd
expect % %%
expect xxx%yyy xxx%%yyy
- expect -123 -- -123
+ expect -123 -123
# technically these are all unspecified, but the only rational thing
expect_fail '' %3%
- expect_fail '' -123
expect_fail a a%.%
expect_fail '' '%*%b' # cannot continue after bad format
expect_fail a a%-%b # hence 'b' is not part of output
@@ -1126,7 +1123,7 @@ G_floats()
}
define G_floats '%G (floating) conversions'
-# It is difficul;t to test correct results from the %a conversions,
+# It is difficult to test correct results from the %a conversions,
# as they depend upon the underlying floating point format (not
# necessarily IEEE) and other factors chosen by the implementation,
# eg: the (floating) number 1 could be 0x8p-3 0x4p-2 0x1p-1 even
CVS commit: src/tests/usr.bin/printf
Module Name:src Committed By: kre Date: Sun Jul 21 15:25:59 UTC 2019 Modified Files: src/tests/usr.bin/printf: printf.sh Log Message: Stop assuming that printf handles options in any way at all (it doesn't - that is, shouldn't) which includes processing -- as an "end of options". The first arg is (always) the format string. Remove/fix tests that assumed the contrary. Problem (with printf) pointed out on tech-userlevel by Thierry Laronde. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/printf/printf.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src
Committed By: hannken
Date: Sun Jul 21 15:37:27 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c
Log Message:
Try to load module "dtrace" before opening "/dev/dtrace/dtrace".
Fixes PR kern/54387: DTrace Kernel module does not autoload on first use ...
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.13 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.14
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.13 Mon May 28 21:05:05 2018
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c Sun Jul 21 15:37:27 2019
@@ -1140,6 +1140,16 @@ dt_vopen(int version, int flags, int *er
*/
dt_provmod_open(&provmod, &df);
+#ifdef __NetBSD__
+ modctl_load_t cmdargs;
+
+ cmdargs.ml_filename = "dtrace";
+ cmdargs.ml_flags = MODCTL_NO_PROP;
+ cmdargs.ml_props = NULL;
+ cmdargs.ml_propslen = 0;
+
+ (void)modctl(MODCTL_LOAD, &cmdargs);
+#endif
dtfd = open("/dev/dtrace/dtrace", O_RDWR);
err = errno; /* save errno from opening dtfd */
#if defined(__FreeBSD__)
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: hannken Date: Sun Jul 21 15:37:27 UTC 2019 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c Log Message: Try to load module "dtrace" before opening "/dev/dtrace/dtrace". Fixes PR kern/54387: DTrace Kernel module does not autoload on first use ... To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src
Committed By: hannken
Date: Sun Jul 21 15:38:06 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c
Log Message:
Always use "netbsd" as kernel name, dt_module_update() already takes
care to load data from the booted kernel image.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.14 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.15
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.14 Sun Jul 21 15:37:27 2019
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c Sun Jul 21 15:38:06 2019
@@ -1367,9 +1367,13 @@ alloc:
# endif
{
const char *p;
+# ifdef __FreeBSD__
char kernname[512];
p = dt_bootfile(kernname, sizeof(kernname));
+# else
+ p = "netbsd";
+# endif
/*
* Format the global variables based on the kernel module name.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: hannken Date: Sun Jul 21 15:38:06 UTC 2019 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_open.c Log Message: Always use "netbsd" as kernel name, dt_module_update() already takes care to load data from the booted kernel image. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Sun Jul 21 15:51:58 UTC 2019 Modified Files: src/share/man/man4: ddb.4 Log Message: Describe how to enter ddb for evbarm. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Sun Jul 21 15:51:58 UTC 2019 Modified Files: src/share/man/man4: ddb.4 Log Message: Describe how to enter ddb for evbarm. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.184 src/share/man/man4/ddb.4:1.185 --- src/share/man/man4/ddb.4:1.184 Fri Oct 12 04:43:50 2018 +++ src/share/man/man4/ddb.4 Sun Jul 21 15:51:58 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.184 2018/10/12 04:43:50 msaitoh Exp $ +.\" $NetBSD: ddb.4,v 1.185 2019/07/21 15:51:58 rin Exp $ .\" .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd October 12, 2018 +.Dd July 21, 2019 .Dt DDB 4 .Os .Sh NAME @@ -117,6 +117,14 @@ from the keyboard: -- .It atari -- +.It evbarm +-- on PC style keyboards. +.It "" + on serial console. +.It "" +Some models: ++ +(five plus signs) on serial console. .It hp300 - .It hpcarm
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: rin Date: Sun Jul 21 15:57:24 UTC 2019 Modified Files: src/sys/dev/fdt: dw_apb_uart.c Log Message: The device cannot recognize break signal. Use + (five plus signs) as cnmagic in the same manner with bcm2835_com.c. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/dw_apb_uart.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: rin
Date: Sun Jul 21 15:57:24 UTC 2019
Modified Files:
src/sys/dev/fdt: dw_apb_uart.c
Log Message:
The device cannot recognize break signal. Use + (five plus signs) as
cnmagic in the same manner with bcm2835_com.c.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/dw_apb_uart.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/dw_apb_uart.c
diff -u src/sys/dev/fdt/dw_apb_uart.c:1.4 src/sys/dev/fdt/dw_apb_uart.c:1.5
--- src/sys/dev/fdt/dw_apb_uart.c:1.4 Sat Dec 8 17:46:13 2018
+++ src/sys/dev/fdt/dw_apb_uart.c Sun Jul 21 15:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_apb_uart.c,v 1.4 2018/12/08 17:46:13 thorpej Exp $ */
+/* $NetBSD: dw_apb_uart.c,v 1.5 2019/07/21 15:57:23 rin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.4 2018/12/08 17:46:13 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.5 2019/07/21 15:57:23 rin Exp $");
#include
#include
@@ -182,6 +182,8 @@ dw_apb_uart_console_consinit(struct fdt_
if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_DW_APB, flags))
panic("Cannot initialize dw-apb-uart console");
+
+ cn_set_magic("+");
}
static const struct fdt_console dw_apb_uart_console = {
CVS commit: src/distrib/utils/embedded
Module Name:src Committed By: rin Date: Sun Jul 21 16:05:24 UTC 2019 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Added Files: src/distrib/utils/embedded/files: armv7_boot_nonefi.cmd Log Message: Fallback to non-EFI boot script if EFI bootloader is absent. Note that we do not currently build EFI bootloader for earmv7hf-eb, as it requires little-endian version of toolchain. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/embedded/conf/armv7.conf cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/files/armv7_boot_nonefi.cmd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:05:24 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Added Files:
src/distrib/utils/embedded/files: armv7_boot_nonefi.cmd
Log Message:
Fallback to non-EFI boot script if EFI bootloader is absent.
Note that we do not currently build EFI bootloader for earmv7hf-eb,
as it requires little-endian version of toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/files/armv7_boot_nonefi.cmd
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/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.34 src/distrib/utils/embedded/conf/armv7.conf:1.35
--- src/distrib/utils/embedded/conf/armv7.conf:1.34 Sat May 18 07:33:10 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Jul 21 16:05:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.34 2019/05/18 07:33:10 skrll Exp $
+# $NetBSD: armv7.conf,v 1.35 2019/07/21 16:05:24 rin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -30,8 +30,8 @@ EOF
}
populate_common() {
- # Install EFI bootloader
if [ -f "${release}/usr/mdec/bootarm.efi" ]; then
+ # Install EFI bootloader
mkdir -p "${mnt}/boot/EFI/BOOT"
cp "${release}/usr/mdec/bootarm.efi" "${mnt}/boot/EFI/BOOT/bootarm.efi"
@@ -39,10 +39,14 @@ populate_common() {
${GZIP_CMD} -dc ${kernel}/netbsd-${kernels_generic}.gz > "${mnt}/netbsd"
echo "./netbsd type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
+
+ cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
+ else
+ # Fallback to non-EFI boot command
+ cp ${DIR}/files/armv7_boot_nonefi.cmd ${mnt}/boot/boot.cmd
fi
# Install boot script
- cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
}
Added files:
Index: src/distrib/utils/embedded/files/armv7_boot_nonefi.cmd
diff -u /dev/null src/distrib/utils/embedded/files/armv7_boot_nonefi.cmd:1.1
--- /dev/null Sun Jul 21 16:05:24 2019
+++ src/distrib/utils/embedded/files/armv7_boot_nonefi.cmd Sun Jul 21 16:05:24 2019
@@ -0,0 +1,61 @@
+if test "${board}" = "am335x" ; then
+ setenv kernel netbsd.ub
+ setenv mmcpart 0:1
+ setenv bootargs root=wd0a
+fi
+if test "${board}" = "de0-nano-soc" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs 'root=wd0a'
+ setenv mmcpart 0:1
+ setenv use_fdt 1
+fi
+if test "${soc}" = "exynos" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs 'root=wd0a'
+ setenv mmcpart 2:1
+ setenv use_fdt 1
+fi
+if test "${soc}" = "sunxi" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs 'root=wd0a'
+ setenv mmcpart 0:1
+ setenv use_fdt 1
+fi
+if test "${soc}" = "tegra" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs root=wd0a
+ setenv mmcpart 1:1
+ setenv use_fdt 1
+fi
+if test "${soc}" = "tegra124" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs root=wd0a
+ setenv mmcpart 1:1
+ setenv use_fdt 1
+fi
+if test "${soc}" = "tegra210" ; then
+ setenv kernel netbsd.ub
+ setenv bootargs root=wd0a
+ setenv mmcpart 1:1
+ setenv use_fdt 1
+ setenv fdtfile ${soc}-${board}.dtb
+ # enable PCIe
+ pci enum
+fi
+
+if test "${kernel}" = "" ; then
+ echo '>>>'
+ echo '>>> Target device is not supported by this script.'
+ echo '>>>'
+ exit
+fi
+
+if test "${use_fdt}" = "1" ; then
+ fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
+ fatload mmc ${mmcpart} ${fdt_addr_r} ${fdtfile}
+ fdt addr ${fdt_addr_r}
+ bootm ${kernel_addr_r} - ${fdt_addr_r}
+else
+ fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
+ bootm ${kernel_addr_r} ${bootargs}
+fi
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: rin Date: Sun Jul 21 16:08:13 UTC 2019 Modified Files: src/sys/dev/hyperv: hvkbd.c Log Message: Fix build for !WSDISPLAY_COMPAT_RAWKBD. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hyperv/hvkbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/hyperv
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:08:13 UTC 2019
Modified Files:
src/sys/dev/hyperv: hvkbd.c
Log Message:
Fix build for !WSDISPLAY_COMPAT_RAWKBD.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hyperv/hvkbd.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/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.1 src/sys/dev/hyperv/hvkbd.c:1.2
--- src/sys/dev/hyperv/hvkbd.c:1.1 Fri May 24 14:28:48 2019
+++ src/sys/dev/hyperv/hvkbd.c Sun Jul 21 16:08:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.1 2019/05/24 14:28:48 nonaka Exp $ */
+/* $NetBSD: hvkbd.c,v 1.2 2019/07/21 16:08:13 rin Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.1 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.2 2019/07/21 16:08:13 rin Exp $");
#include
#include
@@ -317,7 +317,9 @@ hvkbd_set_leds(void *v, int leds)
static int
hvkbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
+#if defined(WSDISPLAY_COMPAT_RAWKBD)
struct hvkbd_softc *sc = v;
+#endif
switch (cmd) {
case WSKBDIO_GTYPE:
@@ -434,6 +436,7 @@ hvkbd_decode(struct hvkbd_softc *sc, u_i
return 1;
}
+#if defined(WSDISPLAY_COMPAT_RAWKBD)
static int
hvkbd_encode(struct hvkbd_softc *sc, u_char *buf, int *len)
{
@@ -478,6 +481,7 @@ hvkbd_encode(struct hvkbd_softc *sc, u_c
return 1;
}
+#endif
static void
hvkbd_intr(void *xsc)
CVS commit: src/sys/dev/ic
Module Name:src Committed By: rin Date: Sun Jul 21 16:10:37 UTC 2019 Modified Files: src/sys/dev/ic: z8530tty.c Log Message: Fix panic due to inconsistent lock states of tty_lock in zsparam(). Tested on mac68k. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/sys/dev/ic/z8530tty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:10:37 UTC 2019
Modified Files:
src/sys/dev/ic: z8530tty.c
Log Message:
Fix panic due to inconsistent lock states of tty_lock in zsparam().
Tested on mac68k.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/ic/z8530tty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/z8530tty.c
diff -u src/sys/dev/ic/z8530tty.c:1.132 src/sys/dev/ic/z8530tty.c:1.133
--- src/sys/dev/ic/z8530tty.c:1.132 Tue Oct 31 10:45:19 2017
+++ src/sys/dev/ic/z8530tty.c Sun Jul 21 16:10:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530tty.c,v 1.132 2017/10/31 10:45:19 martin Exp $ */
+/* $NetBSD: z8530tty.c,v 1.133 2019/07/21 16:10:37 rin Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -137,7 +137,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.132 2017/10/31 10:45:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.133 2019/07/21 16:10:37 rin Exp $");
#include "opt_kgdb.h"
#include "opt_ntp.h"
@@ -629,7 +629,9 @@ zsopen(dev_t dev, int flags, int mode, s
/* Make sure zsparam will see changes. */
tp->t_ospeed = 0;
+ mutex_spin_exit(&tty_lock);
(void) zsparam(tp, &t);
+ mutex_spin_enter(&tty_lock);
/*
* Note: zsparam has done: cflag, ispeed, ospeed
@@ -1672,9 +1674,7 @@ zstty_stsoft(struct zstty_softc *zst, st
/*
* Inform the tty layer that carrier detect changed.
*/
- mutex_spin_exit(&tty_lock);
(void) (*tp->t_linesw->l_modem)(tp, ISSET(rr0, ZSRR0_DCD));
- mutex_spin_enter(&tty_lock);
}
if (ISSET(delta, cs->cs_rr0_cts)) {
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: rin Date: Sun Jul 21 16:12:59 UTC 2019 Modified Files: src/sys/arch/arm/arm32: db_interface.c Log Message: Fix hand-crafted trap instruction in cpu_Debugger() for big endian. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/arm32/db_interface.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:12:59 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: db_interface.c
Log Message:
Fix hand-crafted trap instruction in cpu_Debugger() for big endian.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/arm32/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/db_interface.c
diff -u src/sys/arch/arm/arm32/db_interface.c:1.58 src/sys/arch/arm/arm32/db_interface.c:1.59
--- src/sys/arch/arm/arm32/db_interface.c:1.58 Mon May 28 21:05:00 2018
+++ src/sys/arch/arm/arm32/db_interface.c Sun Jul 21 16:12:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.58 2018/05/28 21:05:00 chs Exp $ */
+/* $NetBSD: db_interface.c,v 1.59 2019/07/21 16:12:59 rin Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.58 2018/05/28 21:05:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.59 2019/07/21 16:12:59 rin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -302,7 +302,11 @@ db_write_bytes(vaddr_t addr, size_t size
void
cpu_Debugger(void)
{
+#if _BYTE_ORDER == _LITTLE_ENDIAN
__asm(".word 0xe7ff");
+#else
+ __asm(".word 0xffe7");
+#endif
}
int
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: rin Date: Sun Jul 21 16:18:09 UTC 2019 Modified Files: src/sys/dev/rasops: rasops15.c Log Message: Fix byte order of stamp for big endian so that width-optimized putchar functions work correctly. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/rasops/rasops15.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: rin Date: Sun Jul 21 16:18:09 UTC 2019 Modified Files: src/sys/dev/rasops: rasops15.c Log Message: Fix byte order of stamp for big endian so that width-optimized putchar functions work correctly. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/rasops/rasops15.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/rasops/rasops15.c diff -u src/sys/dev/rasops/rasops15.c:1.22 src/sys/dev/rasops/rasops15.c:1.23 --- src/sys/dev/rasops/rasops15.c:1.22 Tue Dec 4 09:27:59 2018 +++ src/sys/dev/rasops/rasops15.c Sun Jul 21 16:18:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rasops15.c,v 1.22 2018/12/04 09:27:59 mlelstv Exp $ */ +/* $NetBSD: rasops15.c,v 1.23 2019/07/21 16:18:08 rin Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.22 2018/12/04 09:27:59 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.23 2019/07/21 16:18:08 rin Exp $"); #include "opt_rasops.h" @@ -321,10 +321,10 @@ rasops15_makestamp(struct rasops_info *r stamp[i + 1] = (i & 4 ? fg : bg); stamp[i + 1] |= ((i & 2 ? fg : bg) << 16); #else - stamp[i] = (i & 2 ? fg : bg); - stamp[i] |= ((i & 4 ? fg : bg) << 16); - stamp[i + 1] = (i & 8 ? fg : bg); - stamp[i + 1] |= ((i & 16 ? fg : bg) << 16); + stamp[i] = (i & 8 ? fg : bg); + stamp[i] |= ((i & 16 ? fg : bg) << 16); + stamp[i + 1] = (i & 2 ? fg : bg); + stamp[i + 1] |= ((i & 4 ? fg : bg) << 16); #endif } }
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: rin Date: Sun Jul 21 16:19:45 UTC 2019 Modified Files: src/sys/dev/rasops: rasops.c Log Message: Fix cursor movement for ri_xscale = 1, e.g., fontwidth = 8 and bpp = 1. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/rasops/rasops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/rasops
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:19:45 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
Fix cursor movement for ri_xscale = 1, e.g., fontwidth = 8 and bpp = 1.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/rasops/rasops.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/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.79 src/sys/dev/rasops/rasops.c:1.80
--- src/sys/dev/rasops/rasops.c:1.79 Tue Dec 4 09:27:59 2018
+++ src/sys/dev/rasops/rasops.c Sun Jul 21 16:19:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.79 2018/12/04 09:27:59 mlelstv Exp $ */
+/* $NetBSD: rasops.c,v 1.80 2019/07/21 16:19:45 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.79 2018/12/04 09:27:59 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.80 2019/07/21 16:19:45 rin Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -1025,11 +1025,35 @@ rasops_do_cursor(struct rasops_info *ri)
hrp = ri->ri_hwbits + row * ri->ri_yscale + col
* ri->ri_xscale;
height = ri->ri_font->fontheight;
- slop1 = (4 - ((long)rp & 3)) & 3;
- if (slop1 > ri->ri_xscale)
- slop1 = ri->ri_xscale;
+ /*
+ * For ri_xscale = 1:
+ *
+ * Logic below does not work for ri_xscale = 1, e.g.,
+ * fontwidth = 8 and bpp = 1. So we take care of it.
+ */
+ if (ri->ri_xscale == 1) {
+ while (height--) {
+ uint8_t tmp8 = ~*rp;
+
+ *rp = tmp8;
+ rp += ri->ri_stride;
+ if (ri->ri_hwbits) {
+*hrp = tmp8;
+hrp += ri->ri_stride;
+ }
+ }
+ return;
+ }
+
+ /*
+ * For ri_xscale = 2, 3, 4, ...:
+ *
+ * Note that siop1 <= ri_xscale even for ri_xscale = 2,
+ * since rp % 3 = 0 or 2.
+ */
+ slop1 = (4 - ((uintptr_t)rp & 3)) & 3;
slop2 = (ri->ri_xscale - slop1) & 3;
full1 = (ri->ri_xscale - slop1 - slop2) >> 2;
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: rin Date: Sun Jul 21 16:53:17 UTC 2019 Modified Files: src/sys/lib/libsa: Makefile loadfile_elf32.c Log Message: Add SA_ENABLE_BIENDIAN option, which enable us to load kernel image of opposite byte order (for arm EFI bootloader). XXX Currently, it is restricted to load_elf*.c. It would be nice if we can recognize disklabel and filesystem of opposite byte order. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/lib/libsa/Makefile cvs rdiff -u -r1.54 -r1.55 src/sys/lib/libsa/loadfile_elf32.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: rin
Date: Sun Jul 21 16:53:17 UTC 2019
Modified Files:
src/sys/lib/libsa: Makefile loadfile_elf32.c
Log Message:
Add SA_ENABLE_BIENDIAN option, which enable us to load kernel image of
opposite byte order (for arm EFI bootloader).
XXX
Currently, it is restricted to load_elf*.c. It would be nice if we can
recognize disklabel and filesystem of opposite byte order.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.54 -r1.55 src/sys/lib/libsa/loadfile_elf32.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/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.90 src/sys/lib/libsa/Makefile:1.91
--- src/sys/lib/libsa/Makefile:1.90 Tue Apr 2 22:25:10 2019
+++ src/sys/lib/libsa/Makefile Sun Jul 21 16:53:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2019/04/02 22:25:10 christos Exp $
+# $NetBSD: Makefile,v 1.91 2019/07/21 16:53:17 rin Exp $
LIB= sa
LIBISPRIVATE?= yes
@@ -7,6 +7,8 @@ SA_USE_CREAD?= no # Read compressed ker
SA_INCLUDE_NET?= yes # Netboot via TFTP, NFS
SA_USE_LOADFILE?= no # Generic executable loading support
SA_ENABLE_LS_OP?= no # Filesystems ls operation
+SA_ENABLE_BIENDIAN?= no # Biendian support
+# (currently only for loadfile_elf*)
#DEBUGCPPFLAGS= -DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG -DARP_DEBUG -DNET_DEBUG -DDEBUG -DPARANOID
CPPFLAGS= -I${SADIR} ${SACPPFLAGS} ${SAMISCCPPFLAGS} \
@@ -73,6 +75,11 @@ SRCS+= bootp.c rarp.c bootparam.c
SRCS+= nfs.c tftp.c
.endif
+.if (${SA_ENABLE_BIENDIAN} == "yes")
+CPPFLAGS+= -DLIBSA_BIENDIAN_SUPPORT
+SRCS+= byteorder.c
+.endif
+
SRCS+= ffsv1.c ffsv2.c
SRCS+= lfsv1.c lfsv2.c
SRCS+= cd9660.c
Index: src/sys/lib/libsa/loadfile_elf32.c
diff -u src/sys/lib/libsa/loadfile_elf32.c:1.54 src/sys/lib/libsa/loadfile_elf32.c:1.55
--- src/sys/lib/libsa/loadfile_elf32.c:1.54 Thu Jun 20 17:33:30 2019
+++ src/sys/lib/libsa/loadfile_elf32.c Sun Jul 21 16:53:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_elf32.c,v 1.54 2019/06/20 17:33:30 maxv Exp $ */
+/* $NetBSD: loadfile_elf32.c,v 1.55 2019/07/21 16:53:17 rin Exp $ */
/*
* Copyright (c) 1997, 2008, 2017 The NetBSD Foundation, Inc.
@@ -59,12 +59,18 @@
#define ELFROUND (ELFSIZE / 8)
#ifndef _STANDALONE
-#include "byteorder.h"
-
/*
* Byte swapping may be necessary in the non-_STANDLONE case because
* we may be built with a host compiler.
*/
+#ifndef LIBSA_BIENDIAN_SUPPORT
+#define LIBSA_BIENDIAN_SUPPORT
+#endif
+#endif
+
+#ifdef LIBSA_BIENDIAN_SUPPORT
+#include "byteorder.h"
+
#define E16(f)\
f = (bo == ELFDATA2LSB) ? sa_htole16(f) : sa_htobe16(f)
#define E32(f)\
@@ -241,10 +247,10 @@ externalize_shdr(Elf_Byte bo, Elf_Shdr *
#error ELFSIZE is not 32 or 64
#endif
}
-#else /* _STANDALONE */
+#else /* LIBSA_BIENDIAN_SUPPORT */
/*
- * Byte swapping is never necessary in the _STANDALONE case because
- * we are being built with the target compiler.
+ * Byte swapping is never necessary in the !LIBSA_BIENDIAN_SUPPORT case
+ * because we are being built with the target compiler.
*/
#define internalize_ehdr(bo, ehdr) /* nothing */
#define externalize_ehdr(bo, ehdr) /* nothing */
@@ -253,7 +259,7 @@ externalize_shdr(Elf_Byte bo, Elf_Shdr *
#define internalize_shdr(bo, shdr) /* nothing */
#define externalize_shdr(bo, shdr) /* nothing */
-#endif /* _STANDALONE */
+#endif /* LIBSA_BIENDIAN_SUPPORT */
#define IS_TEXT(p) (p.p_flags & PF_X)
#define IS_DATA(p) ((p.p_flags & PF_X) == 0)
@@ -379,7 +385,7 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
internalize_ehdr(elf->e_ident[EI_DATA], elf);
maxp += sizeof(Elf_Ehdr);
-#ifndef _STANDALONE
+#ifdef LIBSA_BIENDIAN_SUPPORT
for (i = 0; i < elf->e_shnum; i++)
internalize_shdr(elf->e_ident[EI_DATA], &shdr[i]);
#endif
@@ -472,7 +478,7 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
/*
* Finally, load the SECTION HEADERS.
*/
-#ifndef _STANDALONE
+#ifdef LIBSA_BIENDIAN_SUPPORT
for (i = 0; i < elf->e_shnum; i++)
externalize_shdr(elf->e_ident[EI_DATA], &shdr[i]);
#endif
@@ -526,7 +532,7 @@ ELFNAMEEND(loadsym)(int fd, Elf_Ehdr *el
shpp = maxp;
maxp += roundup(sz, ELFROUND);
-#ifndef _STANDALONE
+#ifdef LIBSA_BIENDIAN_SUPPORT
for (i = 0; i < elf->e_shnum; i++)
internalize_shdr(elf->e_ident[EI_DATA], &shp[i]);
#endif
@@ -636,7 +642,7 @@ havesym:
}
}
if (flags & LOAD_SYM) {
-#ifndef _STANDALONE
+#ifdef LIBSA_BIENDIAN_SUPPORT
for (i = 0; i < elf->e_shnum; i++)
externalize_shdr(elf->e_ident[EI_DATA], &shp[i]);
#endif
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: rin
Date: Sun Jul 21 17:01:39 UTC 2019
Modified Files:
src/sys/stand/efiboot: Makefile.efiboot
Log Message:
Enable us to load kernel image of different byte order. Now, earmv7hf-eb
kernel can successfully boot from EFI bootloader.
XXX
We need to recognize disklabel and filesystem written in opposite byte oder.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/stand/efiboot/Makefile.efiboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.7 src/sys/stand/efiboot/Makefile.efiboot:1.8
--- src/sys/stand/efiboot/Makefile.efiboot:1.7 Sun Apr 21 22:30:41 2019
+++ src/sys/stand/efiboot/Makefile.efiboot Sun Jul 21 17:01:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.7 2019/04/21 22:30:41 thorpej Exp $
+# $NetBSD: Makefile.efiboot,v 1.8 2019/07/21 17:01:39 rin Exp $
S= ${.CURDIR}/../../..
@@ -97,6 +97,7 @@ SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
SAMISCMAKEFLAGS+="SA_INCLUDE_NET=yes"
SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
+SAMISCMAKEFLAGS+="SA_ENABLE_BIENDIAN=yes"
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: rin Date: Sun Jul 21 17:01:39 UTC 2019 Modified Files: src/sys/stand/efiboot: Makefile.efiboot Log Message: Enable us to load kernel image of different byte order. Now, earmv7hf-eb kernel can successfully boot from EFI bootloader. XXX We need to recognize disklabel and filesystem written in opposite byte oder. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/stand/efiboot/Makefile.efiboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sun Jul 21 17:05:11 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC.common Log Message: Enable DISKLABEL_EI, which is useful for machines that support both endian. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/GENERIC.common 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.common diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.33 src/sys/arch/evbarm/conf/GENERIC.common:1.34 --- src/sys/arch/evbarm/conf/GENERIC.common:1.33 Fri Apr 26 21:40:29 2019 +++ src/sys/arch/evbarm/conf/GENERIC.common Sun Jul 21 17:05:11 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.33 2019/04/26 21:40:29 sevan Exp $ +# $NetBSD: GENERIC.common,v 1.34 2019/07/21 17:05:11 rin Exp $ # # GENERIC evbarm kernel config (template) # @@ -28,7 +28,7 @@ no pseudo-device vcoda # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas -#options DISKLABEL_EI # disklabel Endian Independent support +options DISKLABEL_EI # disklabel Endian Independent support options FFS_EI # FFS Endian Independent support options NFSSERVER options WAPBL # File system journaling support
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sun Jul 21 17:05:11 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC.common Log Message: Enable DISKLABEL_EI, which is useful for machines that support both endian. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/GENERIC.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: maya Date: Sun Jul 21 19:03:12 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: update bzip2 homepage and version To generate a diff of this commit: cvs rdiff -u -r1.1635 -r1.1636 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1635 src/doc/3RDPARTY:1.1636 --- src/doc/3RDPARTY:1.1635 Wed Jul 17 18:35:00 2019 +++ src/doc/3RDPARTY Sun Jul 21 19:03:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1635 2019/07/17 18:35:00 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1636 2019/07/21 19:03:12 maya Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -239,12 +239,12 @@ Notes: See /usr/src/external/bsd/byacc/byacc2netbsd for update instructions. Package: bzip2 -Version: 1.0.6 -Current Vers: 1.0.6 +Version: 1.0.8 +Current Vers: 1.0.8 Maintainer: Julian Seward -Archive Site: http://sources.redhat.com/bzip2/files/ -Home Page: http://www.bzip.org/ -Date: 2019-01-09 +Archive Site: https://sourceware.org/pub/bzip2/ +Home Page: https://www.sourceware.org/bzip2/ +Date: 2019-07-21 Mailing List: Responsible: License: BSD (4-clause)
CVS commit: src/doc
Module Name:src Committed By: maya Date: Sun Jul 21 19:03:12 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: update bzip2 homepage and version To generate a diff of this commit: cvs rdiff -u -r1.1635 -r1.1636 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bzip2/dist
Module Name:src Committed By: wiz Date: Sun Jul 21 21:07:12 UTC 2019 Modified Files: src/external/bsd/bzip2/dist: bzip2.1 Log Message: Fix mismerge of man page after 1.0.8 import. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bzip2/dist/bzip2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bzip2/dist/bzip2.1 diff -u src/external/bsd/bzip2/dist/bzip2.1:1.4 src/external/bsd/bzip2/dist/bzip2.1:1.5 --- src/external/bsd/bzip2/dist/bzip2.1:1.4 Sun Jul 21 11:52:14 2019 +++ src/external/bsd/bzip2/dist/bzip2.1 Sun Jul 21 21:07:12 2019 @@ -1,40 +1,31 @@ -.\" $NetBSD: bzip2.1,v 1.4 2019/07/21 11:52:14 maya Exp $ +.\" $NetBSD: bzip2.1,v 1.5 2019/07/21 21:07:12 wiz Exp $ .\" -.PU -.TH bzip2 1 -.SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.8 -.br -bzcat \- decompresses files to stdout -.br -bzip2recover \- recovers data from damaged bzip2 files - -.SH SYNOPSIS -.ll +8 -.B bzip2 -.RB [ " \-cdfkqstvzVL123456789 " ] -[ -.I "filenames \&..." -] -.ll -8 -.br -.B bunzip2 -.RB [ " \-fkvsVL " ] -[ -.I "filenames \&..." -] -.br -.B bzcat -.RB [ " \-s " ] -[ -.I "filenames \&..." -] -.br -.B bzip2recover -.I "filename" - -.SH DESCRIPTION -.I bzip2 +.Dd July 13, 2019 +.Dt BZIP2 1 +.Os +.Sh NAME +.Nm bzip2 , +.Nm bunzip2 , +.Nm bzcat , +.Nm bzip2recover +.Nd block-sorting file compressor +.Sh SYNOPSIS +.Nm bzip2 +.Op Fl 123456789cdfkLqstVvz +.Op Ar filename Ar +.Pp +.Nm bunzip2 +.Op Fl fkLVvs +.Op Ar filename Ar +.Pp +.Nm bzcat +.Op Fl s +.Op Ar filename Ar +.Pp +.Nm bzip2recover +.Ar filename +.Sh DESCRIPTION +.Nm bzip2 compresses files using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression is generally considerably better than that achieved by @@ -495,51 +486,25 @@ I/O error messages are not as helpful as .Nm bzip2 tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading. - +.Pp This manual page pertains to version 1.0.8 of -.I bzip2. +.Nm bzip2 . Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions -0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following -exception: 0.9.0 and above can correctly decompress multiple -concatenated compressed files. 0.1pl2 cannot do this; it will stop -after decompressing just the first file in the stream. - -.I bzip2recover -versions prior to 1.0.2 used 32-bit integers to represent -bit positions in compressed files, so they could not handle compressed -files more than 512 megabytes long. Versions 1.0.2 and above use -64-bit ints on some platforms which support them (GNU supported -targets, and Windows). To establish whether or not bzip2recover was -built with such a limitation, run it without arguments. In any event -you can build yourself an unlimited version if you can recompile it -with MaybeUInt64 set to be an unsigned 64-bit integer. - - - -.SH AUTHOR -Julian Seward, jsew...@acm.org. - -https://sourceware.org/bzip2/ - -The ideas embodied in -.I bzip2 -are due to (at least) the following -people: Michael Burrows and David Wheeler (for the block sorting -transformation), David Wheeler (again, for the Huffman coder), Peter -Fenwick (for the structured coding model in the original -.I bzip, -and many refinements), and Alistair Moffat, Radford Neal and Ian Witten -(for the arithmetic coder in the original -.I bzip). -I am much -indebted for their help, support and advice. See the manual in the -source distribution for pointers to sources of documentation. Christian -von Roques encouraged me to look for faster sorting algorithms, so as to -speed up compression. Bela Lubkin encouraged me to improve the -worst-case compression performance. -Donna Robinson XMLised the documentation. -The bz* scripts are derived from those of GNU gzip. -Many people sent patches, helped -with portability problems, lent machines, gave advice and were generally -helpful. +0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the +following exception: 0.9.0 and above can correctly decompress multiple +concatenated compressed files. +0.1pl2 cannot do this; it will stop after decompressing just the first +file in the stream. +.Pp +.Nm bzip2recover +versions prior to 1.0.2 used 32-bit integers to represent bit +positions in compressed files, so they could not handle compressed +files more than 512 megabytes long. +Versions 1.0.2 and above use 64-bit ints on some platforms which +support them (GNU supported targets, and Windows). +To establish whether or not +.Nm bzip2recover +was built with such a limitation, run it without arguments. +In any event you can build yourself an unlimited version if you can +recompile it with MaybeUInt64 set to be an unsigned 64-bit integer.
CVS commit: src/external/bsd/bzip2/dist
Module Name:src Committed By: wiz Date: Sun Jul 21 21:07:12 UTC 2019 Modified Files: src/external/bsd/bzip2/dist: bzip2.1 Log Message: Fix mismerge of man page after 1.0.8 import. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bzip2/dist/bzip2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: hkenken Date: Mon Jul 22 01:35:37 UTC 2019 Modified Files: src/sys/arch/arm/imx: imx31_gpio.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/imx31_gpio.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/imx/imx31_gpio.c diff -u src/sys/arch/arm/imx/imx31_gpio.c:1.7 src/sys/arch/arm/imx/imx31_gpio.c:1.8 --- src/sys/arch/arm/imx/imx31_gpio.c:1.7 Sat Oct 27 17:17:39 2012 +++ src/sys/arch/arm/imx/imx31_gpio.c Mon Jul 22 01:35:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: imx31_gpio.c,v 1.7 2012/10/27 17:17:39 chs Exp $ */ +/* $NetBSD: imx31_gpio.c,v 1.8 2019/07/22 01:35:36 hkenken Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,21 +28,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.7 2012/10/27 17:17:39 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.8 2019/07/22 01:35:36 hkenken Exp $"); #define _INTR_PRIVATE #include "locators.h" #include "gpio.h" - + #include #include #include - + #include - + #include - + #include #include #include @@ -182,7 +182,7 @@ gpio_pic_establish_irq(struct pic_softc GPIO_WRITE(gpio, GPIO_ISR, irq_mask); /* - * Convert the type to a gpio type and figure out which bits in what + * Convert the type to a gpio type and figure out which bits in what * register we have to tweak. */ gtype = (GPIO_TYPEMAP >> (2 * is->is_type)) & 3; @@ -202,7 +202,7 @@ gpio_pic_establish_irq(struct pic_softc */ v = GPIO_READ(gpio, GPIO_DIR); v &= ~irq_mask; - GPIO_WRITE(gpio, GPIO_DIR, v); + GPIO_WRITE(gpio, GPIO_DIR, v); /* * Now record the type of interrupt. @@ -243,7 +243,7 @@ imxgpio_pin_write(void *arg, int pin, in old = GPIO_READ(gpio, GPIO_DR); if (value) - new = old | mask; + new = old | mask; else new = old & ~mask;
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: hkenken Date: Mon Jul 22 01:35:37 UTC 2019 Modified Files: src/sys/arch/arm/imx: imx31_gpio.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/imx31_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Jul 22 06:24:57 UTC 2019 Modified Files: src/sys/dev/usb: udsir.c Log Message: KNF (from nhusb) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/udsir.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Jul 22 06:24:57 UTC 2019 Modified Files: src/sys/dev/usb: udsir.c Log Message: KNF (from nhusb) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/udsir.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/udsir.c diff -u src/sys/dev/usb/udsir.c:1.7 src/sys/dev/usb/udsir.c:1.8 --- src/sys/dev/usb/udsir.c:1.7 Mon Sep 3 16:29:34 2018 +++ src/sys/dev/usb/udsir.c Mon Jul 22 06:24:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: udsir.c,v 1.7 2018/09/03 16:29:34 riastradh Exp $ */ +/* $NetBSD: udsir.c,v 1.8 2019/07/22 06:24:57 skrll Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.7 2018/09/03 16:29:34 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.8 2019/07/22 06:24:57 skrll Exp $"); #include #include @@ -693,7 +693,7 @@ udsir_kqfilter(void *h, struct knote *kn kn->kn_fop = &udsirwrite_filtops; break; default: - return (EINVAL); + return EINVAL; } kn->kn_hook = sc; @@ -702,7 +702,7 @@ udsir_kqfilter(void *h, struct knote *kn SLIST_INSERT_HEAD(klist, kn, kn_selnext); splx(s); - return (0); + return 0; } static int @@ -783,7 +783,7 @@ filt_udsirread(struct knote *kn, long hi struct udsir_softc *sc = kn->kn_hook; kn->kn_data = sc->sc_ur_framelen; - return (kn->kn_data > 0); + return kn->kn_data > 0; } static void @@ -804,7 +804,7 @@ filt_udsirwrite(struct knote *kn, long h struct udsir_softc *sc = kn->kn_hook; kn->kn_data = 0; - return (sc->sc_direction != udir_input); + return sc->sc_direction != udir_input; }
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Mon Jul 22 06:52:06 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: remove unnecessary NULL check after kmem_zalloc(KM_SLEEP) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: knakahara
Date: Mon Jul 22 06:52:06 UTC 2019
Modified Files:
src/sys/arch/x86/pci: if_vmx.c
Log Message:
remove unnecessary NULL check after kmem_zalloc(KM_SLEEP)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x86/pci/if_vmx.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/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.35 src/sys/arch/x86/pci/if_vmx.c:1.36
--- src/sys/arch/x86/pci/if_vmx.c:1.35 Fri Jul 19 08:49:44 2019
+++ src/sys/arch/x86/pci/if_vmx.c Mon Jul 22 06:52:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.35 2019/07/19 08:49:44 knakahara Exp $ */
+/* $NetBSD: if_vmx.c,v 1.36 2019/07/22 06:52:06 knakahara Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.35 2019/07/19 08:49:44 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.36 2019/07/22 06:52:06 knakahara Exp $");
#include
#include
@@ -1030,8 +1030,6 @@ vmxnet3_init_rxq(struct vmxnet3_softc *s
rxr->vxrxr_ndesc = sc->vmx_nrxdescs;
rxr->vxrxr_rxbuf = kmem_zalloc(rxr->vxrxr_ndesc *
sizeof(struct vmxnet3_rxbuf), KM_SLEEP);
- if (rxr->vxrxr_rxbuf == NULL)
- return (ENOMEM);
rxq->vxrxq_comp_ring.vxcr_ndesc += sc->vmx_nrxdescs;
}
@@ -1058,8 +1056,6 @@ vmxnet3_init_txq(struct vmxnet3_softc *s
txr->vxtxr_ndesc = sc->vmx_ntxdescs;
txr->vxtxr_txbuf = kmem_zalloc(txr->vxtxr_ndesc *
sizeof(struct vmxnet3_txbuf), KM_SLEEP);
- if (txr->vxtxr_txbuf == NULL)
- return (ENOMEM);
txq->vxtxq_comp_ring.vxcr_ndesc = sc->vmx_ntxdescs;
@@ -1093,8 +1089,6 @@ vmxnet3_alloc_rxtx_queues(struct vmxnet3
sizeof(struct vmxnet3_rxqueue) * sc->vmx_max_nrxqueues, KM_SLEEP);
sc->vmx_txq = kmem_zalloc(
sizeof(struct vmxnet3_txqueue) * sc->vmx_max_ntxqueues, KM_SLEEP);
- if (sc->vmx_rxq == NULL || sc->vmx_txq == NULL)
- return (ENOMEM);
for (i = 0; i < sc->vmx_max_nrxqueues; i++) {
error = vmxnet3_init_rxq(sc, i);
