CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Sat May 6 22:17:28 UTC 2023
Modified Files:
src/sys/arch/arm/at91: at91pioreg.h
src/sys/arch/arm/s3c2xx0: s3c2440_i2s.c
src/sys/arch/hppa/dev: viper.h
src/sys/arch/sparc64/include: ctlreg.h
src/sys/dev/cardbus: cardbusreg.h
src/sys/dev/ic: cd18xxreg.h
src/sys/dev/pci: pccbbreg.h
Log Message:
few more typos in the word "register", mainly s/resister/register/.
In one comment I assume that it was meant to be pull-up resistor.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91pioreg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/viper.h
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc64/include/ctlreg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/cd18xxreg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/pccbbreg.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/at91/at91pioreg.h
diff -u src/sys/arch/arm/at91/at91pioreg.h:1.2 src/sys/arch/arm/at91/at91pioreg.h:1.3
--- src/sys/arch/arm/at91/at91pioreg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pioreg.h Sat May 6 22:17:28 2023
@@ -1,5 +1,5 @@
-/* $Id: at91pioreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91pioreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91pioreg.h,v 1.3 2023/05/06 22:17:28 andvar Exp $ */
+/* $NetBSD: at91pioreg.h,v 1.3 2023/05/06 22:17:28 andvar Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -58,6 +58,6 @@
#define PIO_OWER 0xA0U /* A0: PIO Output Write Enable */
#define PIO_OWDR 0xA4U /* A4: PIO Output Write Disable */
#define PIO_OWSR 0xA8U /* A8: PIO Output Write Status Reg */
-#define PIO_VERSION 0xFCU /* FC: version reqister (AT91SAM92xx) */
+#define PIO_VERSION 0xFCU /* FC: version register (AT91SAM92xx) */
#endif /* _AT91GPIOREG_H_ */
Index: src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.7 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.8
--- src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.7 Tue Sep 27 06:36:43 2022
+++ src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c Sat May 6 22:17:28 2023
@@ -156,7 +156,7 @@ s3c2440_i2s_init(struct s3c2440_i2s_soft
reg = GPIO_SET_FUNC(reg, 4, 2);
bus_space_write_4(sc->sc_iot, sc->sc_gpio_ioh, GPIO_PECON, reg);
- /* Disable Pull-up resister for all I2S pins */
+ /* Disable Pull-up resistor for all I2S pins */
reg = bus_space_read_4(sc->sc_iot, sc->sc_gpio_ioh, GPIO_PEUP);
reg = GPIO_SET_DATA(reg, 0, 1);
Index: src/sys/arch/hppa/dev/viper.h
diff -u src/sys/arch/hppa/dev/viper.h:1.2 src/sys/arch/hppa/dev/viper.h:1.3
--- src/sys/arch/hppa/dev/viper.h:1.2 Sat Oct 18 08:33:25 2014
+++ src/sys/arch/hppa/dev/viper.h Sat May 6 22:17:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: viper.h,v 1.2 2014/10/18 08:33:25 snj Exp $ */
+/* $NetBSD: viper.h,v 1.3 2023/05/06 22:17:28 andvar Exp $ */
/* $OpenBSD: viper.h,v 1.2 1999/06/29 20:56:10 mickey Exp $ */
@@ -144,7 +144,7 @@ struct vi_trs {
/*
** Viper also creates HPA registers for the graphics accelerator (Venom).
-** Venom has two sets of resisters; the User HPA contains registers that
+** Venom has two sets of registers; the User HPA contains registers that
** users are allowed to access, while the Supervisor HPA is only accessible
** by code running at the most priviliged level. Both sets of registers
** are defined below.
Index: src/sys/arch/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.67 src/sys/arch/sparc64/include/ctlreg.h:1.68
--- src/sys/arch/sparc64/include/ctlreg.h:1.67 Wed Nov 13 10:06:38 2019
+++ src/sys/arch/sparc64/include/ctlreg.h Sat May 6 22:17:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.67 2019/11/13 10:06:38 nakayama Exp $ */
+/* $NetBSD: ctlreg.h,v 1.68 2023/05/06 22:17:28 andvar Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -396,7 +396,7 @@
* Interrupt registers. This really gets hairy.
*/
-/* IRSR -- Interrupt Receive Status Ragister */
+/* IRSR -- Interrupt Receive Status Register */
#define ASI_IRSR 0x49
#define IRSR 0x00
#define IRSR_BUSY 0x020
Index: src/sys/dev/cardbus/cardbusreg.h
diff -u src/sys/dev/cardbus/cardbusreg.h:1.7 src/sys/dev/cardbus/cardbusreg.h:1.8
--- src/sys/dev/cardbus/cardbusreg.h:1.7 Mon Aug 1 11:20:27 2011
+++ src/sys/dev/cardbus/cardbusreg.h Sat May 6 22:17:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusreg.h,v 1.7 2011/08/01 11:20:27 drochner Exp $ */
+/* $NetBSD: cardbusreg.h,v 1.8 2023/05/06 22:17:28 andvar Exp $ */
/*
* Copyright (c) 2001
@@ -31,7 +31,7 @@
#include /* for pcitag_t */
-/* Base Resisters */
+/* Base Registers */
#define CARDBUS_CIS_REG0x28
#define CARDBUS_ROM_REG 0x30
# define CARDBUS_CIS_ASIMASK 0x07
Index: src/sys/dev/ic/cd18x
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Sat May 6 22:17:28 UTC 2023 Modified Files: src/sys/arch/arm/at91: at91pioreg.h src/sys/arch/arm/s3c2xx0: s3c2440_i2s.c src/sys/arch/hppa/dev: viper.h src/sys/arch/sparc64/include: ctlreg.h src/sys/dev/cardbus: cardbusreg.h src/sys/dev/ic: cd18xxreg.h src/sys/dev/pci: pccbbreg.h Log Message: few more typos in the word "register", mainly s/resister/register/. In one comment I assume that it was meant to be pull-up resistor. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91pioreg.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/viper.h cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc64/include/ctlreg.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/cardbus/cardbusreg.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/cd18xxreg.h cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/pccbbreg.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: andvar Date: Sat May 6 21:53:27 UTC 2023 Modified Files: src/sys/arch/aarch64/include: armreg.h src/sys/arch/mips/include: mipsNN.h src/sys/dev/mii: brgphyreg.h src/sys/dev/pci: hifn7751.c ubsec.c Log Message: s/Regiser/Register/ and s/regester/register/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/aarch64/include/armreg.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/include/mipsNN.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/brgphyreg.h cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/hifn7751.c cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/ubsec.c 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: andvar
Date: Sat May 6 21:53:27 UTC 2023
Modified Files:
src/sys/arch/aarch64/include: armreg.h
src/sys/arch/mips/include: mipsNN.h
src/sys/dev/mii: brgphyreg.h
src/sys/dev/pci: hifn7751.c ubsec.c
Log Message:
s/Regiser/Register/ and s/regester/register/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/aarch64/include/armreg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/include/mipsNN.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/brgphyreg.h
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/hifn7751.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/ubsec.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/aarch64/include/armreg.h
diff -u src/sys/arch/aarch64/include/armreg.h:1.63 src/sys/arch/aarch64/include/armreg.h:1.64
--- src/sys/arch/aarch64/include/armreg.h:1.63 Thu Dec 1 00:32:52 2022
+++ src/sys/arch/aarch64/include/armreg.h Sat May 6 21:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.63 2022/12/01 00:32:52 ryo Exp $ */
+/* $NetBSD: armreg.h,v 1.64 2023/05/06 21:53:26 andvar Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -619,7 +619,7 @@ AARCH64REG_WRITE_INLINE3(APGAKeyHi_EL1,
AARCH64REG_READ_INLINE3(pan, pan, ATTR_ARCH("armv8.1-a"))
AARCH64REG_WRITE_INLINE3(pan, pan, ATTR_ARCH("armv8.1-a"))
-AARCH64REG_READ_INLINE(cpacr_el1) // Coprocessor Access Control Regiser
+AARCH64REG_READ_INLINE(cpacr_el1) // Coprocessor Access Control Register
AARCH64REG_WRITE_INLINE(cpacr_el1)
#define CPACR_TTA __BIT(28) // System Register Access Traps
Index: src/sys/arch/mips/include/mipsNN.h
diff -u src/sys/arch/mips/include/mipsNN.h:1.13 src/sys/arch/mips/include/mipsNN.h:1.14
--- src/sys/arch/mips/include/mipsNN.h:1.13 Tue Nov 8 13:04:49 2022
+++ src/sys/arch/mips/include/mipsNN.h Sat May 6 21:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsNN.h,v 1.13 2022/11/08 13:04:49 simonb Exp $ */
+/* $NetBSD: mipsNN.h,v 1.14 2023/05/06 21:53:26 andvar Exp $ */
/*
* Copyright 2000, 2001
@@ -462,7 +462,7 @@
/* "LLB" (R): Load-Linked Bit (LLB) is present in COP0 LLAddr. */
#define MIPSNN_CFG5_LLB __BIT(4)
-/* "MRP" (R): COP0 Memory Accessibility Attributes Regisers are present. */
+/* "MRP" (R): COP0 Memory Accessibility Attributes Registers are present. */
#define MIPSNN_CFG5_MRP __BIT(3)
/* "UFR" (R): Allows user-mode access to Status[FR] using CTC1/CFC1. */
Index: src/sys/dev/mii/brgphyreg.h
diff -u src/sys/dev/mii/brgphyreg.h:1.12 src/sys/dev/mii/brgphyreg.h:1.13
--- src/sys/dev/mii/brgphyreg.h:1.12 Mon May 25 19:48:38 2020
+++ src/sys/dev/mii/brgphyreg.h Sat May 6 21:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphyreg.h,v 1.12 2020/05/25 19:48:38 jmcneill Exp $ */
+/* $NetBSD: brgphyreg.h,v 1.13 2023/05/06 21:53:26 andvar Exp $ */
/*
* Copyright (c) 2000
@@ -237,7 +237,7 @@
#define BRGPHY_5708S_BMCR_2500 0x20
-/* Autoneg Next Page Transmit 1 Regiser */
+/* Autoneg Next Page Transmit 1 Register */
#define BRGPHY_5708S_ANEG_NXT_PG_XMIT1 0x0B
#define BRGPHY_5708S_ANEG_NXT_PG_XMIT1_25G 0x0001
Index: src/sys/dev/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.80 src/sys/dev/pci/hifn7751.c:1.81
--- src/sys/dev/pci/hifn7751.c:1.80 Sun May 22 11:39:27 2022
+++ src/sys/dev/pci/hifn7751.c Sat May 6 21:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.80 2022/05/22 11:39:27 riastradh Exp $ */
+/* $NetBSD: hifn7751.c,v 1.81 2023/05/06 21:53:26 andvar Exp $ */
/* $OpenBSD: hifn7751.c,v 1.179 2020/01/11 21:34:03 cheloha Exp $ */
/*
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.80 2022/05/22 11:39:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.81 2023/05/06 21:53:26 andvar Exp $");
#include
#include
@@ -752,7 +752,7 @@ hifn_set_retry(struct hifn_softc *sc)
}
/*
- * Resets the board. Values in the regesters are left as is
+ * Resets the board. Values in the registers are left as is
* from the reset (i.e. initial values are assigned elsewhere).
*/
static void
Index: src/sys/dev/pci/ubsec.c
diff -u src/sys/dev/pci/ubsec.c:1.62 src/sys/dev/pci/ubsec.c:1.63
--- src/sys/dev/pci/ubsec.c:1.62 Sat Aug 27 05:35:17 2022
+++ src/sys/dev/pci/ubsec.c Sat May 6 21:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsec.c,v 1.62 2022/08/27 05:35:17 skrll Exp $ */
+/* $NetBSD: ubsec.c,v 1.63 2023/05/06 21:53:26 andvar Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.62 2022/08/27 05:35:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.63 2023/05/06 21:53:26 andvar Exp $");
#undef UBSEC_DEBUG
@@ -2168,7 +2168,7 @@ ubsec_dma_free(struct ubsec_softc *sc, s
}
/*
- * Resets the board. Values in the rege
CVS commit: src/sys/arch/arm/at91
Module Name:src Committed By: andvar Date: Sat May 6 21:37:37 UTC 2023 Modified Files: src/sys/arch/arm/at91: at91twireg.h Log Message: s/Registre/Register/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91twireg.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/at91/at91twireg.h diff -u src/sys/arch/arm/at91/at91twireg.h:1.2 src/sys/arch/arm/at91/at91twireg.h:1.3 --- src/sys/arch/arm/at91/at91twireg.h:1.2 Thu Jul 3 01:15:38 2008 +++ src/sys/arch/arm/at91/at91twireg.h Sat May 6 21:37:37 2023 @@ -1,5 +1,5 @@ -/* $Id: at91twireg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */ -/* $NetBSD: at91twireg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */ +/* $Id: at91twireg.h,v 1.3 2023/05/06 21:37:37 andvar Exp $ */ +/* $NetBSD: at91twireg.h,v 1.3 2023/05/06 21:37:37 andvar Exp $ */ /*- * Copyright (c) 2007 Embedtronics Oy. @@ -54,7 +54,7 @@ #define TWI_RHR 0x30U /* 0x30: Receive Holding Register */ #define TWI_THR 0x34U /* 0x34: Transmit Holding Register */ -/* Control Registre bits: */ +/* Control Register bits: */ #define TWI_CR_SWRST 0x80U /* 1 = do software reset */ #define TWI_CR_MSDIS 0x08U /* 1 = disable master mode */ #define TWI_CR_MSEN 0x04U /* 1 = enable master mode */
CVS commit: src/sys/arch/arm/at91
Module Name:src Committed By: andvar Date: Sat May 6 21:37:37 UTC 2023 Modified Files: src/sys/arch/arm/at91: at91twireg.h Log Message: s/Registre/Register/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91twireg.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: andvar
Date: Sat May 6 21:34:40 UTC 2023
Modified Files:
src/sys/arch/amiga/dev: efa.c
src/sys/arch/arc/jazz: oosiop_jazzio.c
src/sys/arch/atari/pci: pci_vga.c
src/sys/arch/hpcmips/vr: vr4181ecureg.h vrc4172gpio.c vrgiu.c
src/sys/arch/prep/stand/boot: vreset.c
src/sys/dev/acpi: acpi_wdrt.c
src/sys/dev/ic: vga_subr.c
Log Message:
s/regster/register/ in comments and error messages.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/jazz/oosiop_jazzio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/pci/pci_vga.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcmips/vr/vr4181ecureg.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/vr/vrc4172gpio.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hpcmips/vr/vrgiu.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/stand/boot/vreset.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_wdrt.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/vga_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/efa.c
diff -u src/sys/arch/amiga/dev/efa.c:1.15 src/sys/arch/amiga/dev/efa.c:1.16
--- src/sys/arch/amiga/dev/efa.c:1.15 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/amiga/dev/efa.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efa.c,v 1.15 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: efa.c,v 1.16 2023/05/06 21:34:39 andvar Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -147,7 +147,7 @@ efa_attach(device_t parent, device_t sel
return;
}
if (!efa_mapreg_native(sc)) {
- aprint_error_dev(self, "couldn't map FastATA regsters\n");
+ aprint_error_dev(self, "couldn't map FastATA registers\n");
return;
}
Index: src/sys/arch/arc/jazz/oosiop_jazzio.c
diff -u src/sys/arch/arc/jazz/oosiop_jazzio.c:1.7 src/sys/arch/arc/jazz/oosiop_jazzio.c:1.8
--- src/sys/arch/arc/jazz/oosiop_jazzio.c:1.7 Fri Jul 1 19:25:42 2011
+++ src/sys/arch/arc/jazz/oosiop_jazzio.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $ */
+/* $NetBSD: oosiop_jazzio.c,v 1.8 2023/05/06 21:34:39 andvar Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.8 2023/05/06 21:34:39 andvar Exp $");
#include
#include
@@ -83,7 +83,7 @@ oosiop_jazzio_attach(device_t parent, de
if (bus_space_map(sc->sc_bst, ja->ja_addr,
OOSIOP_NREGS, 0, &sc->sc_bsh) != 0) {
- aprint_error(": failed to map regsters\n");
+ aprint_error(": failed to map registers\n");
return;
}
Index: src/sys/arch/atari/pci/pci_vga.c
diff -u src/sys/arch/atari/pci/pci_vga.c:1.20 src/sys/arch/atari/pci/pci_vga.c:1.21
--- src/sys/arch/atari/pci/pci_vga.c:1.20 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/pci/pci_vga.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_vga.c,v 1.20 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: pci_vga.c,v 1.21 2023/05/06 21:34:39 andvar Exp $ */
/*
* Copyright (c) 1999 Leo Weppelman. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.20 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.21 2023/05/06 21:34:39 andvar Exp $");
#include
#include
@@ -81,7 +81,7 @@ static const uint8_t vga_atc[] = {
};
/* video DAC palette registers */
-/* XXX only set up 16 colors used by internal palette in ATC regsters */
+/* XXX only set up 16 colors used by internal palette in ATC registers */
static const uint8_t vga_dacpal[] = {
/* R G B */
0x00, 0x00, 0x00, /* BLACK*/
Index: src/sys/arch/hpcmips/vr/vr4181ecureg.h
diff -u src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.2 src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.3
--- src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.2 Mon Apr 28 20:23:22 2008
+++ src/sys/arch/hpcmips/vr/vr4181ecureg.h Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vr4181ecureg.h,v 1.2 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: vr4181ecureg.h,v 1.3 2023/05/06 21:34:40 andvar Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,6 +37,6 @@
#define ECU_SIZE 0x20 /* bus map size */
#define ECU_INTSTAT_REG_W 0x18 /* interrupt status */
#define ECU_INTMSK_REG_W 0x1a /* interrupt mask */
-#define ECU_CFG_REG_1_W 0x1e /* configuration regster 1 */
+#define ECU_CFG_REG_1_W 0x1e /* configuration register 1 */
#define ECU_MAX_INTR 16
Index: src/sys/arch/hpcmips/vr/vrc4172gpio.c
diff -u src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.17 src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.18
--- src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.17 Sat Aug 7 16:18:54 2021
+++ src/sys/arch/hpcmips/vr/vrc4172gpio.c Sat May 6 21:34:40
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Sat May 6 21:34:40 UTC 2023 Modified Files: src/sys/arch/amiga/dev: efa.c src/sys/arch/arc/jazz: oosiop_jazzio.c src/sys/arch/atari/pci: pci_vga.c src/sys/arch/hpcmips/vr: vr4181ecureg.h vrc4172gpio.c vrgiu.c src/sys/arch/prep/stand/boot: vreset.c src/sys/dev/acpi: acpi_wdrt.c src/sys/dev/ic: vga_subr.c Log Message: s/regster/register/ in comments and error messages. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/efa.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/jazz/oosiop_jazzio.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/pci/pci_vga.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcmips/vr/vr4181ecureg.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/vr/vrc4172gpio.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hpcmips/vr/vrgiu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/stand/boot/vreset.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_wdrt.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/vga_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: christos
Date: Sat May 6 17:21:51 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen
Log Message:
move the generator script here.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/gen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.23 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.24
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.23 Sat May 6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Sat May 6 13:21:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/05/06 17:07:22 christos Exp $
+# $NetBSD: Makefile,v 1.24 2023/05/06 17:21:51 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -295,7 +295,7 @@ x509v3.h
.for i in ${GENH}
$i: $i.in
${_MKTARGET_CREATE}
- ${.CURDIR}/../../gen ${.ALLSRC} > ${.TARGET}
+ ${.CURDIR}/gen ${.ALLSRC} > ${.TARGET}
.endfor
.include
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/gen
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.1
--- /dev/null Sat May 6 13:21:51 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/gen Sat May 6 13:21:51 2023
@@ -0,0 +1,231 @@
+#!/bin/sh
+
+awk '
+/- join\(/ {
+ printf(" * WARNING: do not edit!\n");
+ i = index(FILENAME, "/src/crypto/external");
+ s = substr(FILENAME, i);
+ printf(" * Generated by Makefile from /usr%s\n", s);
+ next;
+}
+/use OpenSSL/ {
+ next;
+}
+/^{-/ {
+ next;
+}
+/^-}/ {
+ next;
+}
+/generate_stack_string_macros\(/ {
+V="SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_STRING, char, char)\n"
+V=V"#define sk_OPENSSL_STRING_num(sk) OPENSSL_sk_num(ossl_check_const_OPENSSL_STRING_sk_type(sk))\n"
+V=V"#define sk_OPENSSL_STRING_value(sk, idx) ((char *)OPENSSL_sk_value(ossl_check_const_OPENSSL_STRING_sk_type(sk), (idx)))\n"
+V=V"#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_new(ossl_check_OPENSSL_STRING_compfunc_type(cmp)))\n"
+V=V"#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_new_null())\n"
+V=V"#define sk_OPENSSL_STRING_new_reserve(cmp, n) ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_new_reserve(ossl_check_OPENSSL_STRING_compfunc_type(cmp), (n)))\n"
+V=V"#define sk_OPENSSL_STRING_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OPENSSL_STRING_sk_type(sk), (n))\n"
+V=V"#define sk_OPENSSL_STRING_free(sk) OPENSSL_sk_free(ossl_check_OPENSSL_STRING_sk_type(sk))\n"
+V=V"#define sk_OPENSSL_STRING_zero(sk) OPENSSL_sk_zero(ossl_check_OPENSSL_STRING_sk_type(sk))\n"
+V=V"#define sk_OPENSSL_STRING_delete(sk, i) ((char *)OPENSSL_sk_delete(ossl_check_OPENSSL_STRING_sk_type(sk), (i)))\n"
+V=V"#define sk_OPENSSL_STRING_delete_ptr(sk, ptr) ((char *)OPENSSL_sk_delete_ptr(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr)))\n"
+V=V"#define sk_OPENSSL_STRING_push(sk, ptr) OPENSSL_sk_push(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr))\n"
+V=V"#define sk_OPENSSL_STRING_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr))\n"
+V=V"#define sk_OPENSSL_STRING_pop(sk) ((char *)OPENSSL_sk_pop(ossl_check_OPENSSL_STRING_sk_type(sk)))\n"
+V=V"#define sk_OPENSSL_STRING_shift(sk) ((char *)OPENSSL_sk_shift(ossl_check_OPENSSL_STRING_sk_type(sk)))\n"
+V=V"#define sk_OPENSSL_STRING_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OPENSSL_STRING_sk_type(sk),ossl_check_OPENSSL_STRING_freefunc_type(freefunc))\n"
+V=V"#define sk_OPENSSL_STRING_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr), (idx))\n"
+V=V"#define sk_OPENSSL_STRING_set(sk, idx, ptr) ((char *)OPENSSL_sk_set(ossl_check_OPENSSL_STRING_sk_type(sk), (idx), ossl_check_OPENSSL_STRING_type(ptr)))\n"
+V=V"#define sk_OPENSSL_STRING_find(sk, ptr) OPENSSL_sk_find(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr))\n"
+V=V"#define sk_OPENSSL_STRING_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr))\n"
+V=V"#define sk_OPENSSL_STRING_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr), pnum)\n"
+V=V"#define sk_OPENSSL_STRING_sort(sk) OPENSSL_sk_sort(ossl_check_OPENSSL_STRING_sk_type(sk))\n"
+V=V"#define sk_OPENSSL_STRING_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OPENSSL_STRING_sk_type(sk))\n"
+V=V"#define sk_OPENSSL_STRING_dup(sk) ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_dup(ossl_check_const_OPENSSL_ST
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src Committed By: christos Date: Sat May 6 17:21:51 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: Makefile Added Files: src/crypto/external/bsd/openssl/lib/libcrypto: gen Log Message: move the generator script here. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/gen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Sat May 6 17:07:24 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: Makefile aes.inc aria.inc asn1.inc async.inc bf.inc bio.inc blake2.inc bn.inc buffer.inc camellia.inc cast.inc chacha.inc cmac.inc cms.inc comp.inc conf.inc crypto.inc crypto.map ct.inc curve448.inc des.inc dh.inc dsa.inc dso.inc ec.inc engine.inc err.inc evp.inc hmac.inc idea.inc kdf.inc lhash.inc libc-sha256.c libc-sha2xx.c libc-sha512.c md4.inc md5.inc mdc2.inc modes.inc objects.inc ocsp.inc pem.inc pkcs12.inc pkcs7.inc poly1305.inc rand.inc rc2.inc rc4.inc ripemd.inc rsa.inc seed.inc sha.inc shlib_version siphash.inc sm2.inc sm3.inc sm4.inc srcs.inc srp.inc stack.inc store.inc ts.inc txt_db.inc ui.inc whrlpool.inc x509.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile aes-x86_64.S aesni-gcm-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S aesni-x86_64.S bn.inc bsaes-x86_64.S chacha-x86_64.S cmll-x86_64.S e_padlock-x86_64.S ecp_nistz256-x86_64.S ghash-x86_64.S keccak1600-x86_64.S md5-x86_64.S poly1305-x86_64.S rc4-md5-x86_64.S rc4-x86_64.S rsaz-avx2.S rsaz-x86_64.S sha1-mb-x86_64.S sha1-x86_64.S sha256-mb-x86_64.S sha512-x86_64.S vpaes-x86_64.S wp-x86_64.S x25519-x86_64.S x86_64-gf2m.S x86_64-mont.S x86_64-mont5.S x86_64cpuid.S src/crypto/external/bsd/openssl/lib/libcryptotest: Makefile src/crypto/external/bsd/openssl/lib/libdes: shlib_version src/crypto/external/bsd/openssl/lib/libssl: Makefile record.inc shlib_version ssl.inc ssl.map Added Files: src/crypto/external/bsd/openssl/lib/libcommon: Makefile PROTO.in der_digests_gen.c der_dsa_gen.c der_ec_gen.c der_ecx_gen.c der_rsa_gen.c der_wrap_gen.c mkinc providers_common.inc providers_common_der.inc providers_implementations_ciphers.inc providers_implementations_digests.inc srcs.inc ssl_record.inc src/crypto/external/bsd/openssl/lib/libcrypto: PROTO.in cmp.inc crmf.inc encode_decode.inc ess.inc ffc.inc http.inc libc-sha1.c mkinc property.inc providers.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: rsaz-avx512.S src/crypto/external/bsd/openssl/lib/libdefault: Makefile PROTO.in der_sm2_gen.c mkinc providers_common.inc providers_common_der.inc providers_implementations_asymciphers.inc providers_implementations_ciphers.inc providers_implementations_digests.inc providers_implementations_encode_decode.inc providers_implementations_exchange.inc providers_implementations_kdfs.inc providers_implementations_kem.inc providers_implementations_keymgmt.inc providers_implementations_macs.inc providers_implementations_rands.inc providers_implementations_rands_seeding.inc providers_implementations_signature.inc providers_implementations_storemgmt.inc srcs.inc ssl.inc src/crypto/external/bsd/openssl/lib/libdefault/prov: der_digests.h der_dsa.h der_ec.h der_ecx.h der_rsa.h der_sm2.h der_wrap.h Removed Files: src/crypto/external/bsd/openssl/lib/libcrypto: ecdh.inc ecdsa.inc krb5.inc md2.inc rc5.inc x509v3.inc Log Message: checkpoint To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcommon/Makefile \ src/crypto/external/bsd/openssl/lib/libcommon/PROTO.in \ src/crypto/external/bsd/openssl/lib/libcommon/der_digests_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/der_dsa_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/der_ec_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/der_ecx_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/der_rsa_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/der_wrap_gen.c \ src/crypto/external/bsd/openssl/lib/libcommon/mkinc \ src/crypto/external/bsd/openssl/lib/libcommon/providers_common.inc \ src/crypto/external/bsd/openssl/lib/libcommon/providers_common_der.inc \ src/crypto/external/bsd/openssl/lib/libcommon/providers_implementations_ciphers.inc \ src/crypto/external/bsd/openssl/lib/libcommon/providers_implementations_digests.inc \ src/crypto/external/bsd/openssl/lib/libcommon/srcs.inc \ src/crypto/external/bsd/openssl/lib/libcommon/ssl_record.inc cvs rdiff -u -r1.22 -r1.23 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/PROTO.in \ src/crypto/external/bsd/openssl/lib/libcrypto/cmp.inc \ src/crypto/external/bsd/openssl/lib/l
CVS commit: src/usr.bin/ktrace
Module Name:src Committed By: uwe Date: Sat May 6 10:45:14 UTC 2023 Modified Files: src/usr.bin/ktrace: ktrace.1 Log Message: ktrace(1): tweak -c wording for clarity To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/ktrace/ktrace.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ktrace/ktrace.1 diff -u src/usr.bin/ktrace/ktrace.1:1.47 src/usr.bin/ktrace/ktrace.1:1.48 --- src/usr.bin/ktrace/ktrace.1:1.47 Fri Sep 2 03:43:53 2022 +++ src/usr.bin/ktrace/ktrace.1 Sat May 6 10:45:14 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: ktrace.1,v 1.47 2022/09/02 03:43:53 gutteridge Exp $ +.\" $NetBSD: ktrace.1,v 1.48 2023/05/06 10:45:14 uwe Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -103,10 +103,14 @@ The options are as follows: .It Fl a Append to the trace file instead of truncating it. .It Fl C -Disable tracing on all user owned processes, and, if executed by root, all +Clear +.Pq disable +tracing on all user owned processes, and, if executed by root, all processes in the system. .It Fl c -Clear the trace points associated with the specified file or processes. +Clear +.Pq disable +the trace points associated with the specified file or processes. .It Fl d Descendants; perform the operation for all current children of the designated processes. @@ -124,9 +128,12 @@ Read the trace records from .Ar infile and print them in a human readable format to standard out. .It Fl g Ar pgid -Enable (disable) tracing on all processes in the process group (only one +Enable +.Pq disable with Fl c +tracing on all processes in the process group. +Only one .Fl g -flag is permitted). +flag is permitted. .It Fl i Inherit; pass the trace flags to all future children of the designated processes. @@ -161,9 +168,12 @@ Without this option will print its output in a human readable format to standard out. .It Fl p Ar pid -Enable (disable) tracing on the indicated process id (only one +Enable +.Pq disable with Fl c +tracing on the indicated process id. +Only one .Fl p -flag is permitted). +flag is permitted. .It Fl R Display relative time stamps to output. .It Fl s
CVS commit: src/usr.bin/ktrace
Module Name:src Committed By: uwe Date: Sat May 6 10:45:14 UTC 2023 Modified Files: src/usr.bin/ktrace: ktrace.1 Log Message: ktrace(1): tweak -c wording for clarity To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/ktrace/ktrace.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat May 6 09:45:20 UTC 2023 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: ChangeLog: import NetBSD ftp 20230505 To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.79 othersrc/usr.bin/tnftp/ChangeLog:1.80 --- othersrc/usr.bin/tnftp/ChangeLog:1.79 Sun Apr 9 06:49:34 2023 +++ othersrc/usr.bin/tnftp/ChangeLog Sat May 6 09:45:20 2023 @@ -1,4 +1,13 @@ -$NetBSD: ChangeLog,v 1.79 2023/04/09 06:49:34 lukem Exp $ +$NetBSD: ChangeLog,v 1.80 2023/05/06 09:45:20 lukem Exp $ + +Sat May 6 09:43:04 UTC 2023 + + * Merge NetBSD ftp from 20230226 to 20230505: + * Add timeout for SSL connection setup, defaulting to 60 + seconds. + * Consistently use poll(2) instead of select(2). + * Check EAGAIN as well as EINTR. + * Simplify includes. Sun Apr 9 06:45:06 UTC 2023
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat May 6 09:45:20 UTC 2023 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: ChangeLog: import NetBSD ftp 20230505 To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc
Committed By: lukem
Date: Sat May 6 09:32:18 UTC 2023
Modified Files:
othersrc/usr.bin/tnftp/src: ftp.c ssl.c util.c version.h
Log Message:
Merge from tag NetBSD-20230226 to tag NetBSD-20230505
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/ftp.c
diff -u othersrc/usr.bin/tnftp/src/ftp.c:1.24 othersrc/usr.bin/tnftp/src/ftp.c:1.25
--- othersrc/usr.bin/tnftp/src/ftp.c:1.24 Fri Aug 27 01:38:49 2021
+++ othersrc/usr.bin/tnftp/src/ftp.c Sat May 6 09:32:18 2023
@@ -1,5 +1,5 @@
-/* $NetBSD: ftp.c,v 1.24 2021/08/27 01:38:49 lukem Exp $ */
-/* from NetBSD: ftp.c,v 1.174 2021/08/26 06:23:24 lukem Exp */
+/* $NetBSD: ftp.c,v 1.25 2023/05/06 09:32:18 lukem Exp $ */
+/* from NetBSD: ftp.c,v 1.175 2023/05/05 15:46:06 lukem Exp */
/*-
* Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID(" NetBSD: ftp.c,v 1.174 2021/08/26 06:23:24 lukem Exp ");
+__RCSID(" NetBSD: ftp.c,v 1.175 2023/05/05 15:46:06 lukem Exp ");
#endif
#endif /* not lint */
@@ -1741,7 +1741,8 @@ dataconn(const char *lmode)
if (timeout < 0)
timeout = 0;
rv = ftp_poll(pfd, 1, timeout);
- } while (rv == -1 && errno == EINTR); /* loop until poll ! EINTR */
+ /* loop until poll !EINTR && !EAGAIN */
+ } while (rv == -1 && (errno == EINTR || errno == EAGAIN));
if (rv == -1) {
warn("Can't poll waiting before accept");
goto dataconn_failed;
@@ -1755,7 +1756,8 @@ dataconn(const char *lmode)
fromlen = myctladdr.su_len;
do {
s = accept(data, (struct sockaddr *) &from.si_su, &fromlen);
- } while (s == -1 && errno == EINTR); /* loop until accept ! EINTR */
+ /* loop until accept !EINTR && !EAGAIN */
+ } while (s == -1 && (errno == EINTR || errno == EAGAIN));
if (s == -1) {
warn("Can't accept data connection");
goto dataconn_failed;
Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.9 othersrc/usr.bin/tnftp/src/ssl.c:1.10
--- othersrc/usr.bin/tnftp/src/ssl.c:1.9 Sun Apr 9 06:17:55 2023
+++ othersrc/usr.bin/tnftp/src/ssl.c Sat May 6 09:32:18 2023
@@ -1,5 +1,5 @@
-/* $NetBSD: ssl.c,v 1.9 2023/04/09 06:17:55 lukem Exp $ */
-/* from NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp */
+/* $NetBSD: ssl.c,v 1.10 2023/05/06 09:32:18 lukem Exp $ */
+/* from NetBSD: ssl.c,v 1.15 2023/05/05 15:46:06 lukem Exp */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -40,9 +40,10 @@
#include
#ifndef lint
-__RCSID(" NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp ");
+__RCSID(" NetBSD: ssl.c,v 1.15 2023/05/05 15:46:06 lukem Exp ");
#endif
+#include
#include
#include
#include
@@ -53,7 +54,6 @@ __RCSID(" NetBSD: ssl.c,v 1.14 2023/04/0
#include
#include
-#include
#include
#include
@@ -103,38 +103,33 @@ struct fetch_connect {
static ssize_t
fetch_writev(struct fetch_connect *conn, struct iovec *iov, int iovcnt)
{
- struct timeval now, timeout, delta;
- fd_set writefds;
+ struct timeval timeout, now, delta;
ssize_t len, total;
int fd = conn->sd;
- int r;
+ int rv, timeout_secs;
+ struct pollfd pfd[1];
- if (quit_time > 0) {
- FD_ZERO(&writefds);
- gettimeofday(&timeout, NULL);
- timeout.tv_sec += quit_time;
- }
+ pfd[0].fd = fd;
+ pfd[0].events = POLLOUT;
+ gettimeofday(&timeout, NULL);
+ timeout.tv_sec += quit_time;
total = 0;
while (iovcnt > 0) {
- while (quit_time > 0 && !FD_ISSET(fd, &writefds)) {
- FD_SET(fd, &writefds);
- gettimeofday(&now, NULL);
- delta.tv_sec = timeout.tv_sec - now.tv_sec;
- delta.tv_usec = timeout.tv_usec - now.tv_usec;
- if (delta.tv_usec < 0) {
-delta.tv_usec += 100;
-delta.tv_sec--;
- }
- if (delta.tv_sec < 0) {
-errno = ETIMEDOUT;
+ if (quit_time > 0) { /* enforce timeout */
+ do {
+(void)gettimeofday(&now, NULL);
+timersub(&timeout, &now, &delta);
+timeout_secs = delta.tv_sec * 1000 + delta.tv_usec/1000;
+if (timeout_secs < 0)
+ timeout_secs = 0;
+rv = ftp_poll(pfd, 1, timeout_secs);
+ /* loop until poll !EINTR && !EAGAIN */
+ } while (rv == -1 && (errno == EINTR || errno == EAGAIN));
+ if (rv == -1)
return -1;
- }
- errno = 0;
- r = select(fd + 1, NULL, &writefds, NULL, &delta);
- if (r == -1) {
-if (errno == EINTR)
- continue;
+ if (rv == 0) {
+errno = ETIMEDOUT;
return -1;
}
}
@@ -337,7 +332,7 @@ fetch_nonssl_read(int sd, void *buf, siz
rlen = read(sd, buf, len);
if (rlen == -1) {
- if (errno == EAGAIN || errno == EINTR)
+ if (errno == EINTR || errno == EAGAIN)
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sat May 6 09:32:18 UTC 2023 Modified Files: othersrc/usr.bin/tnftp/src: ftp.c ssl.c util.c version.h Log Message: Merge from tag NetBSD-20230226 to tag NetBSD-20230505 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/ftp.c cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/ssl.c cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/util.c cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sat May 6 09:30:13 UTC 2023 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv2010 Log Message: Import NetBSD ftp 20230505 Notable changes since import NetBSD-20230226: * Add timeout for SSL connection setup, defaulting to 60 seconds. * Consistently use poll(2) instead of select(2). * Check EAGAIN as well as EINTR. * Simplify includes. Status: Vendor Tag: NetBSD Release Tags: NetBSD-20230505 U othersrc/usr.bin/tnftp/src/Makefile U othersrc/usr.bin/tnftp/src/domacro.c U othersrc/usr.bin/tnftp/src/ftp_var.h U othersrc/usr.bin/tnftp/src/ssl.h C othersrc/usr.bin/tnftp/src/version.h U othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/extern.h U othersrc/usr.bin/tnftp/src/complete.c C othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/progressbar.h C othersrc/usr.bin/tnftp/src/util.c U othersrc/usr.bin/tnftp/src/progressbar.c C othersrc/usr.bin/tnftp/src/ssl.c U othersrc/usr.bin/tnftp/src/cmds.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/ftp.1 U othersrc/usr.bin/tnftp/src/fetch.c U othersrc/usr.bin/tnftp/src/ruserpass.c 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sat May 6 09:30:13 UTC 2023 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv2010 Log Message: Import NetBSD ftp 20230505 Notable changes since import NetBSD-20230226: * Add timeout for SSL connection setup, defaulting to 60 seconds. * Consistently use poll(2) instead of select(2). * Check EAGAIN as well as EINTR. * Simplify includes. Status: Vendor Tag: NetBSD Release Tags: NetBSD-20230505 U othersrc/usr.bin/tnftp/src/Makefile U othersrc/usr.bin/tnftp/src/domacro.c U othersrc/usr.bin/tnftp/src/ftp_var.h U othersrc/usr.bin/tnftp/src/ssl.h C othersrc/usr.bin/tnftp/src/version.h U othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/extern.h U othersrc/usr.bin/tnftp/src/complete.c C othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/progressbar.h C othersrc/usr.bin/tnftp/src/util.c U othersrc/usr.bin/tnftp/src/progressbar.c C othersrc/usr.bin/tnftp/src/ssl.c U othersrc/usr.bin/tnftp/src/cmds.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/ftp.1 U othersrc/usr.bin/tnftp/src/fetch.c U othersrc/usr.bin/tnftp/src/ruserpass.c 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: skrll Date: Sat May 6 08:43:20 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7hfeb Log Message: Add imx6sx dtb files for BE too To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7hfeb 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/dtb/ad.earmv7hfeb diff -u src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.9 src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.10 --- src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.9 Sat Sep 10 15:54:11 2022 +++ src/distrib/sets/lists/dtb/ad.earmv7hfeb Sat May 6 08:43:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv7hfeb,v 1.9 2022/09/10 15:54:11 rillig Exp $ +# $NetBSD: ad.earmv7hfeb,v 1.10 2023/05/06 08:43:20 skrll Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb @@ -273,6 +273,16 @@ ./boot/dtb/imx6qp-wandboard-revd1.dtbdtb-base-boot dtb ./boot/dtb/imx6qp-zii-rdu2.dtb dtb-base-boot dtb ./boot/dtb/imx6s-dhcom-drc02.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-nitrogen6sx.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sabreauto.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-sdb-mqs.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sdb-reva.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-sdb-sai.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sdb.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-softing-vining-2000.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-basic.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-extended.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-full.dtb dtb-base-boot dtb ./boot/dtb/imx7d-cl-som-imx7.dtb dtb-base-boot dtb ./boot/dtb/imx7d-colibri-aster.dtb dtb-base-boot dtb ./boot/dtb/imx7d-colibri-emmc-aster.dtb dtb-base-boot dtb
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: skrll Date: Sat May 6 08:43:20 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7hfeb Log Message: Add imx6sx dtb files for BE too To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7hfeb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
