CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sat Dec 9 02:15:11 UTC 2023 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp(1): wording and formatting improvements Fix grammar issue with "Support values" reported in private mail. Document all file transfer types in "type" and cross-reference that. Consistency fixes in describing file transfer parameters and types. Fix some mandoc -Tlint issues (except "useless macro: Tn"). To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/usr.bin/ftp/ftp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sat Dec 9 02:15:11 UTC 2023 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp(1): wording and formatting improvements Fix grammar issue with "Support values" reported in private mail. Document all file transfer types in "type" and cross-reference that. Consistency fixes in describing file transfer parameters and types. Fix some mandoc -Tlint issues (except "useless macro: Tn"). To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/usr.bin/ftp/ftp.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/ftp/ftp.1 diff -u src/usr.bin/ftp/ftp.1:1.150 src/usr.bin/ftp/ftp.1:1.151 --- src/usr.bin/ftp/ftp.1:1.150 Sat Feb 25 17:37:09 2023 +++ src/usr.bin/ftp/ftp.1 Sat Dec 9 02:15:11 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.150 2023/02/25 17:37:09 uwe Exp $ +.\" $NetBSD: ftp.1,v 1.151 2023/12/09 02:15:11 lukem Exp $ .\" .\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,7 +57,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd February 25, 2023 +.Dd December 9, 2023 .Dt FTP 1 .Os .Sh NAME @@ -65,7 +65,7 @@ .Nd Internet file transfer program .Sh SYNOPSIS .Nm -.Op Fl 46AadefginpRtVv? +.Op Fl 46AadefginpRtVv\&? .Op Fl N Ar netrc .Op Fl o Ar output .Op Fl P Ar port @@ -289,7 +289,7 @@ Uses as the local IP address for all connections. .It Fl t Enables packet tracing. -.It Fl T Ar direction Ns Cm \&, Ns Ar maximum\| Ns Oo Cm \&, Ns Ar increment Oc +.It Fl T Ar direction Ns Cm \&, Ns Ar maximum Ns Oo Cm \&, Ns Ar increment Oc Set the maximum transfer rate for .Ar direction to @@ -392,24 +392,20 @@ or .Ic nmap setting. File transfer uses the current settings for -.Ic type , -.Ic format , -.Ic mode , +.Ic type , +.Ic form , +.Ic mode , and -.Ic structure . +.Ic struct . .It Ic ascii -Set the file transfer -.Ic type -to network -.Tn ASCII . -This is the default type. +A synonym for +.Ic type Cm ascii . .It Ic bell Arrange that a bell be sounded after each file transfer command is completed. .It Ic binary -Set the file transfer -.Ic type -to support binary image transfer. +A synonym for +.Ic type Cm binary . .It Ic bye Terminate the .Tn FTP @@ -450,9 +446,12 @@ return to the command interpreter. Any defined macros are erased. .It Ic \ Toggle carriage return stripping during -ascii type file retrieval. +.Ic type Cm ascii +file retrieval. Records are denoted by a carriage return/linefeed sequence -during ascii type file transfer. +during +.Ic type Cm ascii +file transfer. When .Ic \ is on (the default), carriage returns are stripped from this @@ -463,7 +462,9 @@ delimiter. Records on .Pf non\- Ux remote systems may contain single linefeeds; -when an ascii type transfer is made, these linefeeds may be +when a +.Ic type Cm ascii +transfer is made, these linefeeds may be distinguished from a record delimiter only when .Ic \ is off. @@ -541,12 +542,11 @@ Retrieve the files listed in .Ar localfile , which has one line per filename. .It Ic form Ar format -Set the file transfer -.Ic form -to +Set the file transfer format control to .Ar format . The default (and only supported) -format is +.Ar format +is .Ql non-print . .It Ic ftp Ar host Op Ar port A synonym for @@ -579,27 +579,27 @@ If the local file name is not specified, it is given the same name it has on the remote machine, subject to alteration by the current -.Ic case , +.Ic case , .Ic ntrans , and .Ic nmap settings. The current settings for -.Ic type , +.Ic type , .Ic form , -.Ic mode , +.Ic mode , and -.Ic structure +.Ic struct are used while transferring the file. .It Ic glob Toggle filename expansion for -.Ic mdelete , +.Ic mdelete , .Ic mget , .Ic mput , and .Ic mreget . If globbing is turned off with -.Ic glob , +.Ic glob , the file name arguments are taken literally and not expanded. Globbing for @@ -630,7 +630,9 @@ entire directory subtrees of files. That can be done by transferring a .Xr tar 1 -archive of the subtree (in binary mode). +archive of the subtree (in +.Ic type Cm binary +mode). .It Ic hash Op Ar size Toggle hash-sign .Pq Ql # @@ -658,7 +660,7 @@ If is omitted, the current inactivity timer is printed. .It Ic image A synonym for -.Ic binary . +.Ic type Cm binary . .It Ic lcd Op Ar directory Change the working directory on the local machine. If @@ -682,7 +684,7 @@ A synonym for .It Ic macdef Ar macro-name Define a macro. Subsequent lines are stored as the macro -.Ar macro-name ; +.Ar macro-name ; a null line .Po consecutive newline characters in a file or carriage @@ -740,7 +742,7 @@ Delete the on the remote machine. .It Ic mdir Ar remote-files local-file Like -.Ic dir , +.Ic dir , except multiple remote files may be specified. If interactive prompting is on, .Nm @@ -759,7 +761,7 @@ See .Ic glob for details on the filename
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Sat Dec 9 00:13:38 UTC 2023 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: varname-dot-shell.exp Log Message: make: Var_SetWithFlags set fromCmd for SCOPE_CMDLINE Set fromCmd true for SCOPE_CMDLINE regardless of the variable name. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.1075 -r1.1076 src/usr.bin/make/var.c cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varname-dot-shell.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Sat Dec 9 00:13:38 UTC 2023
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: varname-dot-shell.exp
Log Message:
make: Var_SetWithFlags set fromCmd for SCOPE_CMDLINE
Set fromCmd true for SCOPE_CMDLINE
regardless of the variable name.
Reviewed by: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.1075 -r1.1076 src/usr.bin/make/var.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varname-dot-shell.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1075 src/usr.bin/make/var.c:1.1076
--- src/usr.bin/make/var.c:1.1075 Sun Nov 19 22:50:11 2023
+++ src/usr.bin/make/var.c Sat Dec 9 00:13:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1075 2023/11/19 22:50:11 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1076 2023/12/09 00:13:38 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1075 2023/11/19 22:50:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1076 2023/12/09 00:13:38 sjg Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -994,25 +994,26 @@ Var_SetWithFlags(GNode *scope, const cha
* Any variables given on the command line are automatically exported
* to the environment (as per POSIX standard), except for internals.
*/
- if (scope == SCOPE_CMDLINE && !(flags & VAR_SET_NO_EXPORT) &&
- name[0] != '.') {
+ if (scope == SCOPE_CMDLINE) {
v->fromCmd = true;
+ if (!(flags & VAR_SET_NO_EXPORT) && name[0] != '.') {
- /*
- * If requested, don't export these in the environment
- * individually. We still put them in .MAKEOVERRIDES so
- * that the command-line settings continue to override
- * Makefile settings.
- */
- if (!opts.varNoExportEnv)
- setenv(name, val, 1);
- /* XXX: What about .MAKE.EXPORTED? */
- /*
- * XXX: Why not just mark the variable for needing export, as
- * in ExportVarPlain?
- */
-
- Global_Append(".MAKEOVERRIDES", name);
+ /*
+ * If requested, don't export these in the
+ * environment individually. We still put
+ * them in .MAKEOVERRIDES so that the
+ * command-line settings continue to override
+ * Makefile settings.
+ */
+ if (!opts.varNoExportEnv)
+setenv(name, val, 1);
+ /* XXX: What about .MAKE.EXPORTED? */
+ /*
+ * XXX: Why not just mark the variable for
+ * needing export, as in ExportVarPlain?
+ */
+ Global_Append(".MAKEOVERRIDES", name);
+ }
}
if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0)
Index: src/usr.bin/make/unit-tests/varname-dot-shell.exp
diff -u src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.16 src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.17
--- src/usr.bin/make/unit-tests/varname-dot-shell.exp:1.16 Sat Mar 26 14:34:07 2022
+++ src/usr.bin/make/unit-tests/varname-dot-shell.exp Sat Dec 9 00:13:38 2023
@@ -5,7 +5,7 @@ Global: delete .SHELL (not found)
Command: .SHELL = (details omitted)
Global: ORIG_SHELL = (details omitted)
Parsing line 12: .SHELL= overwritten
-Global: .SHELL = overwritten
+Global: .SHELL = overwritten ignored!
CondParser_Eval: ${.SHELL} != ${ORIG_SHELL}
Var_Parse: ${.SHELL} != ${ORIG_SHELL} (eval-defined)
Var_Parse: ${ORIG_SHELL} (eval-defined)
@@ -18,9 +18,9 @@ Var_Parse: ${.SHELL} != ${ORIG_SHELL} (e
Var_Parse: ${ORIG_SHELL} (eval-defined)
Comparing "(details omitted)" != "(details omitted)"
Parsing line 27: .undef .SHELL
-Global: delete .SHELL
+Global: delete .SHELL (not found)
Parsing line 28: .SHELL= newly overwritten
-Global: .SHELL = newly overwritten
+Global: .SHELL = newly overwritten ignored!
CondParser_Eval: ${.SHELL} != ${ORIG_SHELL}
Var_Parse: ${.SHELL} != ${ORIG_SHELL} (eval-defined)
Var_Parse: ${ORIG_SHELL} (eval-defined)
CVS commit: src/sys/arch/shark/isa
Module Name:src Committed By: andvar Date: Sat Dec 9 00:02:10 UTC 2023 Modified Files: src/sys/arch/shark/isa: clock.c Log Message: add static in from hatTest() and hatWedge() to fix TESTHAT option build. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/shark/isa/clock.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/shark/isa
Module Name:src
Committed By: andvar
Date: Sat Dec 9 00:02:10 UTC 2023
Modified Files:
src/sys/arch/shark/isa: clock.c
Log Message:
add static in from hatTest() and hatWedge() to fix TESTHAT option build.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/shark/isa/clock.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/shark/isa/clock.c
diff -u src/sys/arch/shark/isa/clock.c:1.19 src/sys/arch/shark/isa/clock.c:1.20
--- src/sys/arch/shark/isa/clock.c:1.19 Thu Apr 7 19:33:37 2022
+++ src/sys/arch/shark/isa/clock.c Sat Dec 9 00:02:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.19 2022/04/07 19:33:37 andvar Exp $ */
+/* $NetBSD: clock.c,v 1.20 2023/12/09 00:02:10 andvar Exp $ */
/*
* Copyright 1997
@@ -154,7 +154,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.19 2022/04/07 19:33:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.20 2023/12/09 00:02:10 andvar Exp $");
#include
#include
@@ -252,14 +252,14 @@ unsigned fiqReason = 0;
unsigned hatCount = 0;
unsigned hatCount2 = 0;
-void hatTest(int testReason)
+static void hatTest(int testReason)
{
fiqReason |= testReason;
nHats++;
}
-void hatWedge(int nFIQs)
+static void hatWedge(int nFIQs)
{
printf("Unwedging the HAT. fiqs_happened = %d\n", nFIQs);
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src
Committed By: andvar
Date: Fri Dec 8 22:11:15 UTC 2023
Modified Files:
src/sys/arch/hpcmips/dev: it8368.c plumiobusreg.h
Log Message:
fix triple t typos in comment and debug message.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/dev/it8368.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/dev/plumiobusreg.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/hpcmips/dev/it8368.c
diff -u src/sys/arch/hpcmips/dev/it8368.c:1.27 src/sys/arch/hpcmips/dev/it8368.c:1.28
--- src/sys/arch/hpcmips/dev/it8368.c:1.27 Sat Aug 7 16:18:54 2021
+++ src/sys/arch/hpcmips/dev/it8368.c Fri Dec 8 22:11:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: it8368.c,v 1.27 2021/08/07 16:18:54 thorpej Exp $ */
+/* $NetBSD: it8368.c,v 1.28 2023/12/08 22:11:15 andvar Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.27 2021/08/07 16:18:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.28 2023/12/08 22:11:15 andvar Exp $");
#undef WINCE_DEFAULT_SETTING /* for debug */
#undef IT8368DEBUG
@@ -577,7 +577,7 @@ it8368_mode(pcmcia_chipset_handle_t pch,
DPRINTF(("it8368_mode: I/O space (%dbit) enabled\n",
reg32 & TX39_MEMCONFIG3_PORT8SEL ? 8 : 16));
} else {
- DPRINTF(("it8368_mode: atttribute space enabled\n"));
+ DPRINTF(("it8368_mode: attribute space enabled\n"));
}
#endif /* IT8368DEBUG */
}
Index: src/sys/arch/hpcmips/dev/plumiobusreg.h
diff -u src/sys/arch/hpcmips/dev/plumiobusreg.h:1.3 src/sys/arch/hpcmips/dev/plumiobusreg.h:1.4
--- src/sys/arch/hpcmips/dev/plumiobusreg.h:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/dev/plumiobusreg.h Fri Dec 8 22:11:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: plumiobusreg.h,v 1.3 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: plumiobusreg.h,v 1.4 2023/12/08 22:11:15 andvar Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define PLUM_IOBUS_REGBASE 0x6000
#define PLUM_IOBUS_REGSIZE 0x1000
-/* I/O bus width settting */
+/* I/O bus width setting */
#define PLUM_IOBUS_IOXBSZ_REG 0x000
#define PLUM_IOBUS_IOXBSZ_IO5BE5 0x0020
#define PLUM_IOBUS_IOXBSZ_IO5BE4 0x0010
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: andvar Date: Fri Dec 8 22:11:15 UTC 2023 Modified Files: src/sys/arch/hpcmips/dev: it8368.c plumiobusreg.h Log Message: fix triple t typos in comment and debug message. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/dev/it8368.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/dev/plumiobusreg.h 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: andvar
Date: Fri Dec 8 21:46:02 UTC 2023
Modified Files:
src/include: fmtmsg.h
src/sys/arch/powerpc/oea: pmap.c
src/sys/arch/x86/x86: x86_tlb.c
src/sys/dev/hyperv: if_hvn.c
src/sys/netinet: sctp_header.h
Log Message:
fix triple s typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/include/fmtmsg.h
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/x86_tlb.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_header.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/fmtmsg.h
diff -u src/include/fmtmsg.h:1.3 src/include/fmtmsg.h:1.4
--- src/include/fmtmsg.h:1.3 Mon Apr 28 20:22:54 2008
+++ src/include/fmtmsg.h Fri Dec 8 21:46:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fmtmsg.h,v 1.3 2008/04/28 20:22:54 martin Exp $ */
+/* $NetBSD: fmtmsg.h,v 1.4 2023/12/08 21:46:02 andvar Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#define MM_INFO 4 /* Informative message */
/* `Null' values for message components. */
-#define MM_NULLMC 0L /* `Null' classsification component */
+#define MM_NULLMC 0L /* `Null' classification component */
#define MM_NULLLBL (char *)0 /* `Null' label component */
#define MM_NULLSEV 0 /* `Null' severity component */
#define MM_NULLTXT (char *)0 /* `Null' text component */
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.115 src/sys/arch/powerpc/oea/pmap.c:1.116
--- src/sys/arch/powerpc/oea/pmap.c:1.115 Mon Oct 9 13:01:58 2023
+++ src/sys/arch/powerpc/oea/pmap.c Fri Dec 8 21:46:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.115 2023/10/09 13:01:58 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.116 2023/12/08 21:46:02 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.115 2023/10/09 13:01:58 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.116 2023/12/08 21:46:02 andvar Exp $");
#define PMAP_NOOPNAMES
@@ -1905,7 +1905,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
/*
* Assume the page is cache inhibited and access is guarded unless
* it's in our available memory array. If it is in the memory array,
- * asssume it's in memory coherent memory.
+ * assume it's in memory coherent memory.
*/
if (flags & PMAP_MD_PREFETCHABLE) {
pte_lo = 0;
@@ -2005,7 +2005,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
/*
* Assume the page is cache inhibited and access is guarded unless
* it's in our available memory array. If it is in the memory array,
- * asssume it's in memory coherent memory.
+ * assume it's in memory coherent memory.
*/
pte_lo = PTE_IG;
if ((flags & PMAP_NOCACHE) == 0) {
Index: src/sys/arch/x86/x86/x86_tlb.c
diff -u src/sys/arch/x86/x86/x86_tlb.c:1.20 src/sys/arch/x86/x86/x86_tlb.c:1.21
--- src/sys/arch/x86/x86/x86_tlb.c:1.20 Sat Aug 20 23:48:51 2022
+++ src/sys/arch/x86/x86/x86_tlb.c Fri Dec 8 21:46:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_tlb.c,v 1.20 2022/08/20 23:48:51 riastradh Exp $ */
+/* $NetBSD: x86_tlb.c,v 1.21 2023/12/08 21:46:02 andvar Exp $ */
/*-
* Copyright (c) 2008-2020 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.20 2022/08/20 23:48:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.21 2023/12/08 21:46:02 andvar Exp $");
#include
#include
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v
*
* On i386 the packet is 64 bytes in size. On amd64 it's 128 bytes. This
* is sized in concert with UBC_WINSIZE, otherwise excessive shootdown
- * interrupts could be isssued.
+ * interrupts could be issued.
*/
#define TP_MAXVA 16 /* for individual mappings */
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.24 src/sys/dev/hyperv/if_hvn.c:1.25
--- src/sys/dev/hyperv/if_hvn.c:1.24 Sun Sep 18 16:59:35 2022
+++ src/sys/dev/hyperv/if_hvn.c Fri Dec 8 21:46:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.24 2022/09/18 16:59:35 thorpej Exp $ */
+/* $NetBSD: if_hvn.c,v 1.25 2023/12/08 21:46:02 andvar Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.24 2022/09/18 16:59:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.25 2023/12/08 21:46:02 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_hvn.h"
@@ -4089,7 +4089,7 @@ hvn_rndis_attach(struct hvn_softc *sc, i
if (sc->sc_rndis_agg_align < sizeof(uint32_t)) {
/*
- * The RNDIS packet messsage encap assumes that the RNDIS
+ * The RNDIS packet message encap assumes that the RNDIS
* packet message is at least 4 bytes aligned.
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Dec 8 21:46:02 UTC 2023 Modified Files: src/include: fmtmsg.h src/sys/arch/powerpc/oea: pmap.c src/sys/arch/x86/x86: x86_tlb.c src/sys/dev/hyperv: if_hvn.c src/sys/netinet: sctp_header.h Log Message: fix triple s typos in comments. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/include/fmtmsg.h cvs rdiff -u -r1.115 -r1.116 src/sys/arch/powerpc/oea/pmap.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/x86_tlb.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/hyperv/if_hvn.c cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_header.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: thorpej Date: Fri Dec 8 17:19:11 UTC 2023 Modified Files: src/sys/arch/sparc64/dev: iommu.c Log Message: Change one vmem_free() in an error path that should be vmem_xfree(). To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/arch/sparc64/dev/iommu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/dev/iommu.c diff -u src/sys/arch/sparc64/dev/iommu.c:1.117 src/sys/arch/sparc64/dev/iommu.c:1.118 --- src/sys/arch/sparc64/dev/iommu.c:1.117 Fri Dec 1 06:47:59 2023 +++ src/sys/arch/sparc64/dev/iommu.c Fri Dec 8 17:19:11 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.117 2023/12/01 06:47:59 thorpej Exp $ */ +/* $NetBSD: iommu.c,v 1.118 2023/12/08 17:19:11 thorpej Exp $ */ /* * Copyright (c) 1999, 2000 Matthew R. Green @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.117 2023/12/01 06:47:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.118 2023/12/08 17:19:11 thorpej Exp $"); #include "opt_ddb.h" @@ -1073,7 +1073,7 @@ iommu_dvmamap_load_raw(bus_dma_tag_t t, return (0); fail: - vmem_free(is->is_dvmamap, map->_dm_dvmastart, sgsize); + vmem_xfree(is->is_dvmamap, map->_dm_dvmastart, sgsize); map->_dm_dvmastart = 0; map->_dm_dvmasize = 0; return (EFBIG);
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: thorpej Date: Fri Dec 8 17:19:11 UTC 2023 Modified Files: src/sys/arch/sparc64/dev: iommu.c Log Message: Change one vmem_free() in an error path that should be vmem_xfree(). To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/arch/sparc64/dev/iommu.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/i386/stand/bootxx
Module Name:src Committed By: tsutsui Date: Fri Dec 8 16:29:04 UTC 2023 Modified Files: src/sys/arch/i386/stand/bootxx: pbr.S Log Message: Replace several magic numbers with macro to describe GPT's hybrid MBR boot. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/stand/bootxx/pbr.S 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/i386/stand/bootxx/pbr.S diff -u src/sys/arch/i386/stand/bootxx/pbr.S:1.23 src/sys/arch/i386/stand/bootxx/pbr.S:1.24 --- src/sys/arch/i386/stand/bootxx/pbr.S:1.23 Wed May 11 14:58:00 2022 +++ src/sys/arch/i386/stand/bootxx/pbr.S Fri Dec 8 16:29:04 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pbr.S,v 1.23 2022/05/11 14:58:00 andvar Exp $ */ +/* $NetBSD: pbr.S,v 1.24 2023/12/08 16:29:04 tsutsui Exp $ */ /*- * Copyright (c) 2003,2004 The NetBSD Foundation, Inc. @@ -71,6 +71,10 @@ #define MBR_AFTERBPB 62 /* BPB size in floppy master BR */ #endif +#define GPT_MAGIC 0x54504721 /* '!GPT' magic on hybrid MBR boot */ +#define GPT_ENTRY_OFF 20 /* GPT part entry in handover struct */ +#define GPT_ENT_LBA_OFF 32 /* ent_lba_start in struct gpt_ent */ + #ifdef TERSE_ERROR /* * Error codes. Done this way to save space. @@ -127,7 +131,7 @@ start0: mov %cx, %sp mov %cx, %es #ifndef BOOT_FROM_FAT - cmpl $0x54504721, %eax /* did a GPT hybrid MBR start us? */ + cmpl $GPT_MAGIC, %eax /* did a GPT hybrid MBR start us? */ je boot_gpt #endif mov %cx, %ds @@ -366,8 +370,9 @@ chs_read: #ifndef BOOT_FROM_FAT boot_gpt: - movl (20+32+0)(%si), %ebp - movl (20+32+4)(%si), %edi + /* DS:SI has a pointer to the hybrid MBR handover structure */ + movl (GPT_ENTRY_OFF+GPT_ENT_LBA_OFF+0)(%si), %ebp + movl (GPT_ENTRY_OFF+GPT_ENT_LBA_OFF+4)(%si), %edi movw %cx, %ds movl %ebp, lba_sector + 0 movl %edi, lba_sector + 4
CVS commit: src/sys/arch/i386/stand/bootxx
Module Name:src Committed By: tsutsui Date: Fri Dec 8 16:29:04 UTC 2023 Modified Files: src/sys/arch/i386/stand/bootxx: pbr.S Log Message: Replace several magic numbers with macro to describe GPT's hybrid MBR boot. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/stand/bootxx/pbr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
