CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Oct 3 23:19:26 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: std.generic64 Log Message: disable GIC_SPLFUNCS until remaining issues are sorted out To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.generic64 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/std.generic64 diff -u src/sys/arch/evbarm/conf/std.generic64:1.15 src/sys/arch/evbarm/conf/std.generic64:1.16 --- src/sys/arch/evbarm/conf/std.generic64:1.15 Sat Sep 18 12:25:07 2021 +++ src/sys/arch/evbarm/conf/std.generic64 Sun Oct 3 23:19:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.generic64,v 1.15 2021/09/18 12:25:07 jmcneill Exp $ +# $NetBSD: std.generic64,v 1.16 2021/10/03 23:19:26 jmcneill Exp $ # # generic NetBSD/evbarm64 with FDT support @@ -16,7 +16,7 @@ options DRAM_BLOCKS=256 options EVBARM_BOARDTYPE="FDT" options FDT# Flattened Device Tree support options FPU_VFP -options GIC_SPLFUNCS +#options GIC_SPLFUNCS options MODULAR options MODULAR_DEFAULT_AUTOLOAD options PCI_NETBSD_CONFIGURE
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Oct 3 23:19:26 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: std.generic64 Log Message: disable GIC_SPLFUNCS until remaining issues are sorted out To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.generic64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src
Committed By: rillig
Date: Sun Oct 3 20:35:59 UTC 2021
Modified Files:
src/usr.bin/indent: lexi.c
Log Message:
indent: fix lint warning about signed '>>'
Lint couldn't infer that indent's list of type names will practically
never contain more that 2 billion entries and that the result of '>>'
would be the same in all cases.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/indent/lexi.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/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.64 src/usr.bin/indent/lexi.c:1.65
--- src/usr.bin/indent/lexi.c:1.64 Mon Sep 27 18:21:47 2021
+++ src/usr.bin/indent/lexi.c Sun Oct 3 20:35:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.64 2021/09/27 18:21:47 rillig Exp $ */
+/* $NetBSD: lexi.c,v 1.65 2021/10/03 20:35:59 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lexi.c 8.1 (
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.64 2021/09/27 18:21:47 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.65 2021/10/03 20:35:59 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
#endif
@@ -670,7 +670,7 @@ insert_pos(const char *key, const char *
int hi = (int)len - 1;
while (lo <= hi) {
- int mid = (lo + hi) >> 1;
+ int mid = (int)((unsigned)(lo + hi) >> 1);
int cmp = strcmp(arr[mid], key);
if (cmp < 0)
lo = mid + 1;
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 3 20:35:59 UTC 2021 Modified Files: src/usr.bin/indent: lexi.c Log Message: indent: fix lint warning about signed '>>' Lint couldn't infer that indent's list of type names will practically never contain more that 2 billion entries and that the result of '>>' would be the same in all cases. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/usr.bin/indent/lexi.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/indent
Module Name:src
Committed By: rillig
Date: Sun Oct 3 19:09:59 UTC 2021
Modified Files:
src/usr.bin/indent: args.c
Log Message:
indent: clean up load_profile
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/indent/args.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/indent/args.c
diff -u src/usr.bin/indent/args.c:1.42 src/usr.bin/indent/args.c:1.43
--- src/usr.bin/indent/args.c:1.42 Sun Oct 3 18:53:37 2021
+++ src/usr.bin/indent/args.c Sun Oct 3 19:09:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.42 2021/10/03 18:53:37 rillig Exp $ */
+/* $NetBSD: args.c,v 1.43 2021/10/03 19:09:59 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.42 2021/10/03 18:53:37 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.43 2021/10/03 19:09:59 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -143,7 +143,7 @@ static void
load_profile(const char *fname)
{
FILE *f;
-int comment_index, i;
+int comment_index, ch;
char *p;
char buf[BUFSIZ];
@@ -154,26 +154,26 @@ load_profile(const char *fname)
for (;;) {
p = buf;
comment_index = 0;
- while ((i = getc(f)) != EOF) {
- if (i == '*' && comment_index == 0 && p > buf && p[-1] == '/') {
+ while ((ch = getc(f)) != EOF) {
+ if (ch == '*' && comment_index == 0 && p > buf && p[-1] == '/') {
comment_index = (int)(p - buf);
- *p++ = i;
- } else if (i == '/' && comment_index != 0 && p > buf && p[-1] == '*') {
+ *p++ = (char)ch;
+ } else if (ch == '/' && comment_index != 0 && p > buf && p[-1] == '*') {
p = buf + comment_index - 1;
comment_index = 0;
- } else if (isspace((unsigned char)i)) {
+ } else if (isspace((unsigned char)ch)) {
if (p > buf && comment_index == 0)
break;
} else {
- *p++ = i;
+ *p++ = (char)ch;
}
}
if (p != buf) {
- *p++ = 0;
+ *p++ = '\0';
if (opt.verbose)
printf("profile: %s\n", buf);
set_option(buf);
- } else if (i == EOF) {
+ } else if (ch == EOF) {
(void)fclose(f);
return;
}
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 3 19:09:59 UTC 2021 Modified Files: src/usr.bin/indent: args.c Log Message: indent: clean up load_profile No functional change. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/usr.bin/indent/args.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/indent
Module Name:src
Committed By: rillig
Date: Sun Oct 3 18:53:37 UTC 2021
Modified Files:
src/usr.bin/indent: args.c
Log Message:
indent: reduce duplicate code in load_profiles
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/indent/args.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/indent/args.c
diff -u src/usr.bin/indent/args.c:1.41 src/usr.bin/indent/args.c:1.42
--- src/usr.bin/indent/args.c:1.41 Sun Oct 3 18:44:51 2021
+++ src/usr.bin/indent/args.c Sun Oct 3 18:53:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.41 2021/10/03 18:44:51 rillig Exp $ */
+/* $NetBSD: args.c,v 1.42 2021/10/03 18:53:37 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.41 2021/10/03 18:44:51 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.42 2021/10/03 18:53:37 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -140,12 +140,17 @@ static const struct pro {
};
static void
-load_profile(FILE *f)
+load_profile(const char *fname)
{
+FILE *f;
int comment_index, i;
char *p;
char buf[BUFSIZ];
+if ((f = fopen(fname, "r")) == NULL)
+ return;
+option_source = fname;
+
for (;;) {
p = buf;
comment_index = 0;
@@ -168,30 +173,25 @@ load_profile(FILE *f)
if (opt.verbose)
printf("profile: %s\n", buf);
set_option(buf);
- } else if (i == EOF)
+ } else if (i == EOF) {
+ (void)fclose(f);
return;
+ }
}
}
void
load_profiles(const char *profile_name)
{
-FILE *f;
char fname[PATH_MAX];
-static char prof[] = ".indent.pro";
-if (profile_name == NULL)
- snprintf(fname, sizeof(fname), "%s/%s", getenv("HOME"), prof);
-else
- snprintf(fname, sizeof(fname), "%s", profile_name);
-if ((f = fopen(option_source = fname, "r")) != NULL) {
- load_profile(f);
- (void)fclose(f);
-}
-if ((f = fopen(option_source = prof, "r")) != NULL) {
- load_profile(f);
- (void)fclose(f);
+if (profile_name != NULL)
+ load_profile(profile_name);
+else {
+ snprintf(fname, sizeof(fname), "%s/.indent.pro", getenv("HOME"));
+ load_profile(fname);
}
+load_profile(".indent.pro");
option_source = "Command line";
}
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 3 18:53:37 UTC 2021 Modified Files: src/usr.bin/indent: args.c Log Message: indent: reduce duplicate code in load_profiles No functional change. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/usr.bin/indent/args.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/x86
Module Name:src Committed By: fcambus Date: Sun Oct 3 18:47:16 UTC 2021 Modified Files: src/sys/arch/x86/x86: multiboot2.c Log Message: Fix typo when erroring out on unknown ELF machine type. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/multiboot2.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/x86/multiboot2.c diff -u src/sys/arch/x86/x86/multiboot2.c:1.6 src/sys/arch/x86/x86/multiboot2.c:1.7 --- src/sys/arch/x86/x86/multiboot2.c:1.6 Thu Jun 25 17:24:31 2020 +++ src/sys/arch/x86/x86/multiboot2.c Sun Oct 3 18:47:16 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: multiboot2.c,v 1.6 2020/06/25 17:24:31 jdolecek Exp $ */ +/* $NetBSD: multiboot2.c,v 1.7 2021/10/03 18:47:16 fcambus Exp $ */ /*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: multiboot2.c,v 1.6 2020/06/25 17:24:31 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: multiboot2.c,v 1.7 2021/10/03 18:47:16 fcambus Exp $"); #include "opt_multiboot.h" @@ -1054,7 +1054,7 @@ multiboot2_ksyms_addsyms_elf(void) #elif __i386__ ehdr.e_machine = EM_386; #else - #error "Unknwo ELF machine type" + #error "Unknown ELF machine type" #endif ehdr.e_version = 1; ehdr.e_entry = (Elf_Addr)
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: fcambus Date: Sun Oct 3 18:47:16 UTC 2021 Modified Files: src/sys/arch/x86/x86: multiboot2.c Log Message: Fix typo when erroring out on unknown ELF machine type. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/multiboot2.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/indent
Module Name:src
Committed By: rillig
Date: Sun Oct 3 18:44:51 UTC 2021
Modified Files:
src/usr.bin/indent: args.c indent.c indent.h
Log Message:
indent: rename functions
There was no good reason for using the different verbs 'scan' and 'set'
for two functions that essentially do the same.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/indent/args.c
cvs rdiff -u -r1.97 -r1.98 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/indent/indent.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.40 src/usr.bin/indent/args.c:1.41
--- src/usr.bin/indent/args.c:1.40 Sun Oct 3 18:41:36 2021
+++ src/usr.bin/indent/args.c Sun Oct 3 18:44:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.40 2021/10/03 18:41:36 rillig Exp $ */
+/* $NetBSD: args.c,v 1.41 2021/10/03 18:44:51 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.40 2021/10/03 18:41:36 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.41 2021/10/03 18:44:51 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/
#define INDENT_VERSION "2.0"
-static void scan_profile(FILE *);
void add_typedefs_from_file(const char *);
static const char *option_source = "?";
@@ -140,34 +139,8 @@ static const struct pro {
bool_options("v", verbose),
};
-/*
- * set_profile reads $HOME/.indent.pro and ./.indent.pro and handles arguments
- * given in these files.
- */
-void
-set_profile(const char *profile_name)
-{
-FILE *f;
-char fname[PATH_MAX];
-static char prof[] = ".indent.pro";
-
-if (profile_name == NULL)
- snprintf(fname, sizeof(fname), "%s/%s", getenv("HOME"), prof);
-else
- snprintf(fname, sizeof(fname), "%s", profile_name);
-if ((f = fopen(option_source = fname, "r")) != NULL) {
- scan_profile(f);
- (void)fclose(f);
-}
-if ((f = fopen(option_source = prof, "r")) != NULL) {
- scan_profile(f);
- (void)fclose(f);
-}
-option_source = "Command line";
-}
-
static void
-scan_profile(FILE *f)
+load_profile(FILE *f)
{
int comment_index, i;
char *p;
@@ -200,6 +173,28 @@ scan_profile(FILE *f)
}
}
+void
+load_profiles(const char *profile_name)
+{
+FILE *f;
+char fname[PATH_MAX];
+static char prof[] = ".indent.pro";
+
+if (profile_name == NULL)
+ snprintf(fname, sizeof(fname), "%s/%s", getenv("HOME"), prof);
+else
+ snprintf(fname, sizeof(fname), "%s", profile_name);
+if ((f = fopen(option_source = fname, "r")) != NULL) {
+ load_profile(f);
+ (void)fclose(f);
+}
+if ((f = fopen(option_source = prof, "r")) != NULL) {
+ load_profile(f);
+ (void)fclose(f);
+}
+option_source = "Command line";
+}
+
static const char *
skip_over(const char *s, bool may_negate, const char *prefix)
{
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.97 src/usr.bin/indent/indent.c:1.98
--- src/usr.bin/indent/indent.c:1.97 Sun Oct 3 18:41:36 2021
+++ src/usr.bin/indent/indent.c Sun Oct 3 18:44:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.97 2021/10/03 18:41:36 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.98 2021/10/03 18:44:51 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.97 2021/10/03 18:41:36 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.98 2021/10/03 18:44:51 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -449,7 +449,7 @@ main_parse_command_line(int argc, char *
else if (argv[i][0] == '-' && argv[i][1] == 'P' && argv[i][2] != '\0')
profile_name = argv[i] + 2; /* non-empty -P (set profile) */
if (i >= argc)
- set_profile(profile_name);
+ load_profiles(profile_name);
for (i = 1; i < argc; ++i) {
if (argv[i][0] == '-') {
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.26 src/usr.bin/indent/indent.h:1.27
--- src/usr.bin/indent/indent.h:1.26 Mon Sep 27 18:21:47 2021
+++ src/usr.bin/indent/indent.h Sun Oct 3 18:44:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.26 2021/09/27 18:21:47 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.27 2021/10/03 18:44:51 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -64,7 +64,7 @@ void fill_buffer(void);
void parse(token_type);
void process_comment(void);
void set_option(const char *);
-void set_profile(const char *);
+void load_profiles(const char *);
void *xmalloc(size_t);
void
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 3 18:44:51 UTC 2021 Modified Files: src/usr.bin/indent: args.c indent.c indent.h Log Message: indent: rename functions There was no good reason for using the different verbs 'scan' and 'set' for two functions that essentially do the same. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.bin/indent/args.c cvs rdiff -u -r1.97 -r1.98 src/usr.bin/indent/indent.c cvs rdiff -u -r1.26 -r1.27 src/usr.bin/indent/indent.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src
Committed By: rillig
Date: Sun Oct 3 18:41:36 UTC 2021
Modified Files:
src/usr.bin/indent: args.c indent.c
Log Message:
indent: fix content of profile_name
Previously, profile_name included the leading "-P", which was confusing.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/indent/args.c
cvs rdiff -u -r1.96 -r1.97 src/usr.bin/indent/indent.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/indent/args.c
diff -u src/usr.bin/indent/args.c:1.39 src/usr.bin/indent/args.c:1.40
--- src/usr.bin/indent/args.c:1.39 Sun Sep 26 21:05:48 2021
+++ src/usr.bin/indent/args.c Sun Oct 3 18:41:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.39 2021/09/26 21:05:48 rillig Exp $ */
+/* $NetBSD: args.c,v 1.40 2021/10/03 18:41:36 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.39 2021/09/26 21:05:48 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.40 2021/10/03 18:41:36 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -154,7 +154,7 @@ set_profile(const char *profile_name)
if (profile_name == NULL)
snprintf(fname, sizeof(fname), "%s/%s", getenv("HOME"), prof);
else
- snprintf(fname, sizeof(fname), "%s", profile_name + 2);
+ snprintf(fname, sizeof(fname), "%s", profile_name);
if ((f = fopen(option_source = fname, "r")) != NULL) {
scan_profile(f);
(void)fclose(f);
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.96 src/usr.bin/indent/indent.c:1.97
--- src/usr.bin/indent/indent.c:1.96 Thu Sep 30 21:48:12 2021
+++ src/usr.bin/indent/indent.c Sun Oct 3 18:41:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.96 2021/09/30 21:48:12 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.97 2021/10/03 18:41:36 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.96 2021/09/30 21:48:12 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.97 2021/10/03 18:41:36 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -447,7 +447,7 @@ main_parse_command_line(int argc, char *
if (strcmp(argv[i], "-npro") == 0)
break;
else if (argv[i][0] == '-' && argv[i][1] == 'P' && argv[i][2] != '\0')
- profile_name = argv[i]; /* non-empty -P (set profile) */
+ profile_name = argv[i] + 2; /* non-empty -P (set profile) */
if (i >= argc)
set_profile(profile_name);
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 3 18:41:36 UTC 2021 Modified Files: src/usr.bin/indent: args.c indent.c Log Message: indent: fix content of profile_name Previously, profile_name included the leading "-P", which was confusing. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/indent/args.c cvs rdiff -u -r1.96 -r1.97 src/usr.bin/indent/indent.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: wiz Date: Sun Oct 3 18:20:13 UTC 2021 Modified Files: src/share/man/man4: sht4xtemp.4 Log Message: New sentence, new line. Fix Dd. Use more macros. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/sht4xtemp.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/sht4xtemp.4 diff -u src/share/man/man4/sht4xtemp.4:1.1 src/share/man/man4/sht4xtemp.4:1.2 --- src/share/man/man4/sht4xtemp.4:1.1 Sun Oct 3 17:27:02 2021 +++ src/share/man/man4/sht4xtemp.4 Sun Oct 3 18:20:13 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: sht4xtemp.4,v 1.1 2021/10/03 17:27:02 brad Exp $ +.\" $NetBSD: sht4xtemp.4,v 1.2 2021/10/03 18:20:13 wiz Exp $ .\" .\" Copyright (c) 2021 Brad Spencer .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 28th, 2021 +.Dd September 28, 2021 .Dt SHT4XTEMP 4 .Os .Sh NAME @@ -43,34 +43,38 @@ The following .Xr sysctl 3 variables are provided: .Bl -tag -width indent -.It hw.sht4xtemp0.resolutions +.It Li hw.sht4xtemp0.resolutions Lists the resolutions supported by the driver and chip. -.It hw.sht4xtemp0.resolution +.It Li hw.sht4xtemp0.resolution Set the resolution, or number of bits, used for %RH and temperature. -Use one of the strings listed in hw.sht4xtemp.resolutions. -.It hw.sht4xtemp0.ignorecrc +Use one of the strings listed in +.Li hw.sht4xtemp.resolutions . +.It Li hw.sht4xtemp0.ignorecrc If set, the crc calculation for %RH and temperature will be ignored. -.It hw.sht4xtemp0.heateron -Turn the heater on and off. Please note that the heater is turned on right -before the measurement and runs for a pulse width of time. Then the measurement -is taken and the heater is turned off. There is no way to keep the heater running -with this chip. -.It hw.sht4xtemp0.heaterstrength +.It Li hw.sht4xtemp0.heateron +Turn the heater on and off. +Please note that the heater is turned on right +before the measurement and runs for a pulse width of time. +Then the measurement is taken and the heater is turned off. +There is no way to keep the heater running with this chip. +.It Li hw.sht4xtemp0.heaterstrength From 1 to 3, the amount of energy put into the heater. The higher the number, the more power used. -.It hw.sht4xtemp0.heaterpulses +.It Li hw.sht4xtemp0.heaterpulses Lists the valid heater pulses supported by the driver and chip. -.It hw.sht4xtemp0.heaterpulse -Set the heater pulse length. Use one of the strings listed in -hw.sht4xtemp.heaterpulses -.It hw.sht4xtemp0.debug +.It Li hw.sht4xtemp0.heaterpulse +Set the heater pulse length. +Use one of the strings listed in +.Li hw.sht4xtemp.heaterpulses . +.It Li hw.sht4xtemp0.debug If the driver is compiled with .Dv SI70XX_DEBUG , this node will appear and can be used to set the debugging level. -.It hw.sht4xtemp0.readattempts +.It Li hw.sht4xtemp0.readattempts To read %RH or temperature the chip requires that the command be sent, then a delay must be observed before a read can be done to get the values -back. The delays are documented in the datasheet for the chip. +back. +The delays are documented in the datasheet for the chip. The driver will attempt to read back the values readattempts number of times. The default is 10 which should be more than enough for most purposes.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Oct 3 18:20:13 UTC 2021 Modified Files: src/share/man/man4: sht4xtemp.4 Log Message: New sentence, new line. Fix Dd. Use more macros. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/sht4xtemp.4 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: brad Date: Sun Oct 3 17:27:02 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi src/distrib/sets/lists/modules: mi src/share/man/man4: Makefile src/sys/dev/i2c: files.i2c src/sys/modules: Makefile Added Files: src/share/man/man4: sht4xtemp.4 src/sys/dev/i2c: sht4x.c sht4xreg.h sht4xvar.h src/sys/modules/sht4xtemp: Makefile sht4xtemp.ioconf Log Message: A driver for the Sensirion SHT40/SHT41/SHT45 temperature and humidity sensor. An example of this chip is: https://www.adafruit.com/product/4885 This is a lower cost chip that provides higher then usual precision according to the data sheet. This driver supports all of the published functions that the chip has. To generate a diff of this commit: cvs rdiff -u -r1.1725 -r1.1726 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.715 -r1.716 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/sht4xtemp.4 cvs rdiff -u -r1.116 -r1.117 src/sys/dev/i2c/files.i2c cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/sht4x.c src/sys/dev/i2c/sht4xreg.h \ src/sys/dev/i2c/sht4xvar.h cvs rdiff -u -r1.256 -r1.257 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/sht4xtemp/Makefile \ src/sys/modules/sht4xtemp/sht4xtemp.ioconf 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1725 src/distrib/sets/lists/man/mi:1.1726 --- src/distrib/sets/lists/man/mi:1.1725 Sun Aug 1 21:56:26 2021 +++ src/distrib/sets/lists/man/mi Sun Oct 3 17:27:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1725 2021/08/01 21:56:26 andvar Exp $ +# $NetBSD: mi,v 1.1726 2021/10/03 17:27:02 brad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1723,6 +1723,7 @@ ./usr/share/man/cat4/shb.0 man-sys-catman .cat ./usr/share/man/cat4/shmif.0 man-sys-catman .cat ./usr/share/man/cat4/shpcic.0 man-sys-catman .cat +./usr/share/man/cat4/sht4xtemp.0 man-sys-catman .cat ./usr/share/man/cat4/si.0 man-sys-catman .cat ./usr/share/man/cat4/si70xxtemp.0 man-sys-catman .cat ./usr/share/man/cat4/siisata.0 man-sys-catman .cat @@ -4896,6 +4897,7 @@ ./usr/share/man/html4/shb.html man-sys-htmlman html ./usr/share/man/html4/shmif.html man-sys-htmlman html ./usr/share/man/html4/shpcic.html man-sys-htmlman html +./usr/share/man/html4/sht4xtemp.html man-sys-htmlman html ./usr/share/man/html4/si.html man-sys-htmlman html ./usr/share/man/html4/si70xxtemp.html man-sys-htmlman html ./usr/share/man/html4/siisata.html man-sys-htmlman html @@ -7975,6 +7977,7 @@ ./usr/share/man/man4/shb.4 man-sys-man .man ./usr/share/man/man4/shmif.4 man-sys-man .man ./usr/share/man/man4/shpcic.4 man-sys-man .man +./usr/share/man/man4/sht4xtemp.4 man-sys-man .man ./usr/share/man/man4/si.4 man-sys-man .man ./usr/share/man/man4/si70xxtemp.4 man-sys-man .man ./usr/share/man/man4/siisata.4 man-sys-man .man Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.146 src/distrib/sets/lists/modules/mi:1.147 --- src/distrib/sets/lists/modules/mi:1.146 Sat Sep 11 16:10:37 2021 +++ src/distrib/sets/lists/modules/mi Sun Oct 3 17:27:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.146 2021/09/11 16:10:37 pgoyette Exp $ +# $NetBSD: mi,v 1.147 2021/10/03 17:27:02 brad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -397,6 +397,8 @@ ./@MODULEDIR@/securelevel/securelevel.kmod modules-base-kernel kmod ./@MODULEDIR@/sequencermodules-base-kernel kmod ./@MODULEDIR@/sequencer/sequencer.kmod modules-base-kernel kmod +./@MODULEDIR@/sht4xtempmodules-base-kernel kmod +./@MODULEDIR@/sht4xtemp/sht4xtemp.kmod modules-base-kernel kmod ./@MODULEDIR@/si70xxtemp modules-base-kernel kmod ./@MODULEDIR@/si70xxtemp/si70xxtemp.kmod modules-base-kernel kmod ./@MODULEDIR@/skipjackmodules-base-kernel kmod Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.715 src/share/man/man4/Makefile:1.716 --- src/share/man/man4/Makefile:1.715 Sun Aug 1 21:56:27 2021 +++ src/share/man/man4/Makefile Sun Oct 3 17:27:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.715 2021/08/01 21:56:27 andvar Exp $ +# $NetBSD: Makefile,v 1.716 2021/10/03 17:27:02 brad Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -56,7 +56,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a rnd.4 route.4 rs5c372rtc.4 rtk.4 rtsx.4 rtw.4 rtwn.4 rum.4 run.4 \ s390rtc.4 satalink.4 sbus.4 schide.4 \ scsi.4 sctp.4 sd.4 se.4 seeprom.4 sem.4 \ - ses.4 sf.4 sfb.4 sgsmix.4 shb.4 shmif.4 shpcic.4 si70xxtemp.4 \ + ses.4 sf.4 sfb.4 sgsmix.4 shb.4 shmif.4 shpcic.4 sht4xtemp.4 si70xxtemp.4 \ siisata.4 siop.4 sip.4
CVS commit: src
Module Name:src Committed By: brad Date: Sun Oct 3 17:27:02 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi src/distrib/sets/lists/modules: mi src/share/man/man4: Makefile src/sys/dev/i2c: files.i2c src/sys/modules: Makefile Added Files: src/share/man/man4: sht4xtemp.4 src/sys/dev/i2c: sht4x.c sht4xreg.h sht4xvar.h src/sys/modules/sht4xtemp: Makefile sht4xtemp.ioconf Log Message: A driver for the Sensirion SHT40/SHT41/SHT45 temperature and humidity sensor. An example of this chip is: https://www.adafruit.com/product/4885 This is a lower cost chip that provides higher then usual precision according to the data sheet. This driver supports all of the published functions that the chip has. To generate a diff of this commit: cvs rdiff -u -r1.1725 -r1.1726 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.715 -r1.716 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/sht4xtemp.4 cvs rdiff -u -r1.116 -r1.117 src/sys/dev/i2c/files.i2c cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/sht4x.c src/sys/dev/i2c/sht4xreg.h \ src/sys/dev/i2c/sht4xvar.h cvs rdiff -u -r1.256 -r1.257 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/sht4xtemp/Makefile \ src/sys/modules/sht4xtemp/sht4xtemp.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
