CVS commit: src/sys/external/bsd/common/include/asm
Module Name:src Committed By: jmcneill Date: Fri Oct 16 22:39:21 UTC 2020 Modified Files: src/sys/external/bsd/common/include/asm: barrier.h Log Message: Fix mb/wmb/rmb on aarch64 to use dsb instead of dmb. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/common/include/asm/barrier.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/asm
Module Name:src
Committed By: jmcneill
Date: Fri Oct 16 22:39:21 UTC 2020
Modified Files:
src/sys/external/bsd/common/include/asm: barrier.h
Log Message:
Fix mb/wmb/rmb on aarch64 to use dsb instead of dmb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/common/include/asm/barrier.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/external/bsd/common/include/asm/barrier.h
diff -u src/sys/external/bsd/common/include/asm/barrier.h:1.4 src/sys/external/bsd/common/include/asm/barrier.h:1.5
--- src/sys/external/bsd/common/include/asm/barrier.h:1.4 Tue Aug 28 15:04:58 2018
+++ src/sys/external/bsd/common/include/asm/barrier.h Fri Oct 16 22:39:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: barrier.h,v 1.4 2018/08/28 15:04:58 riastradh Exp $ */
+/* $NetBSD: barrier.h,v 1.5 2020/10/16 22:39:21 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,9 +40,15 @@
#define MULTIPROCESSOR 1 /* safer to assume multiprocessor */
#endif
+#if defined(__aarch64__)
+#define mb() __asm __volatile ("dsb sy" ::: "memory")
+#define wmb() __asm __volatile ("dsb st" ::: "memory")
+#define rmb() __asm __volatile ("dsb ld" ::: "memory")
+#else
#define mb membar_sync
#define wmb membar_producer
#define rmb membar_consumer
+#endif
#ifdef __alpha__ /* XXX As if... */
# define read_barrier_depends membar_sync
@@ -51,9 +57,9 @@
#endif
#ifdef MULTIPROCESSOR
-# define smp_mbmb
-# define smp_wmbwmb
-# define smp_rmbrmb
+# define smp_mbmembar_sync
+# define smp_wmbmembar_producer
+# define smp_rmbmembar_consumer
# define smp_read_barrier_depends read_barrier_depends
#else
# define smp_mb() do {} while (0)
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 20:51:54 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: note this is most/all of ossv3 and some of ossv4 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libossaudio/ossaudio.3 diff -u src/lib/libossaudio/ossaudio.3:1.22 src/lib/libossaudio/ossaudio.3:1.23 --- src/lib/libossaudio/ossaudio.3:1.22 Fri Oct 16 16:48:07 2020 +++ src/lib/libossaudio/ossaudio.3 Fri Oct 16 20:51:54 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ossaudio.3,v 1.22 2020/10/16 16:48:07 nia Exp $ +.\" $NetBSD: ossaudio.3,v 1.23 2020/10/16 20:51:54 nia Exp $ .\" .\" Copyright (c) 1997, 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -98,7 +98,7 @@ It remains the preferred API in FreeBSD of code exists supporting it. .Sh BUGS .Pp -The emulation is incomplete. +The emulation is incomplete, covering most of OSSv3 and some of OSSv4. Some obscure features are not included, but the essential ioctls used by the majority of software are covered. .Pp
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 20:51:54 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: note this is most/all of ossv3 and some of ossv4 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 20:24:35 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.c soundcard.h Log Message: ossaudio(3): Add SNDCTL_DSP_COOKEDMODE, SNDCTL_DSP_GETERROR SNDCTL_DSP_COOKEDMODE simply always returns 1. "Cooked mode" is a silly way the OSSv4 authors chose to refer to allowing for reprocessed streams. The NetBSD kernel always performs format conversion and it can't be turned off. SNDCTL_DSP_GETERROR provides access to the read/write over/underrun counters. There are other things it might return, but they don't make sense for our implementation. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/lib/libossaudio/ossaudio.c cvs rdiff -u -r1.24 -r1.25 src/lib/libossaudio/soundcard.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Fri Oct 16 20:24:35 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c soundcard.h
Log Message:
ossaudio(3): Add SNDCTL_DSP_COOKEDMODE, SNDCTL_DSP_GETERROR
SNDCTL_DSP_COOKEDMODE simply always returns 1.
"Cooked mode" is a silly way the OSSv4 authors chose to refer to allowing
for reprocessed streams. The NetBSD kernel always performs format
conversion and it can't be turned off.
SNDCTL_DSP_GETERROR provides access to the read/write over/underrun
counters. There are other things it might return, but they don't make
sense for our implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libossaudio/soundcard.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.47 src/lib/libossaudio/ossaudio.c:1.48
--- src/lib/libossaudio/ossaudio.c:1.47 Fri Oct 16 15:40:16 2020
+++ src/lib/libossaudio/ossaudio.c Fri Oct 16 20:24:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.47 2020/10/16 15:40:16 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.48 2020/10/16 20:24:35 nia Exp $ */
/*-
* Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.47 2020/10/16 15:40:16 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.48 2020/10/16 20:24:35 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@@ -106,6 +106,7 @@ audio_ioctl(int fd, unsigned long com, v
struct audio_offset tmpoffs;
struct audio_buf_info bufinfo;
struct audio_format_query fmtq;
+ struct audio_errinfo *tmperrinfo;
struct count_info cntinfo;
struct audio_encoding tmpenc;
struct oss_sysinfo tmpsysinfo;
@@ -118,6 +119,9 @@ audio_ioctl(int fd, unsigned long com, v
u_int u;
u_int encoding;
u_int precision;
+ int perrors, rerrors;
+ static int totalperrors = 0;
+ static int totalrerrors = 0;
int idat, idata;
int props;
int retval;
@@ -136,6 +140,39 @@ audio_ioctl(int fd, unsigned long com, v
if (retval < 0)
return retval;
break;
+ case SNDCTL_DSP_GETERROR:
+ tmperrinfo = (struct audio_errinfo *)argp;
+ if (tmperrinfo == NULL)
+ return EINVAL;
+ memset(tmperrinfo, 0, sizeof(struct audio_errinfo));
+ if ((retval = ioctl(fd, AUDIO_GETBUFINFO, )) < 0)
+ return retval;
+ /*
+ * OSS requires that we return counters that are relative to
+ * the last call. We must maintain state here...
+ */
+ if (ioctl(fd, AUDIO_PERROR, ) != -1) {
+ perrors /= ((tmpinfo.play.precision / NBBY) *
+ tmpinfo.play.channels);
+ tmperrinfo->play_underruns =
+ (perrors / tmpinfo.blocksize) - totalperrors;
+ totalperrors += tmperrinfo->play_underruns;
+ }
+ if (ioctl(fd, AUDIO_RERROR, ) != -1) {
+ rerrors /= ((tmpinfo.record.precision / NBBY) *
+ tmpinfo.record.channels);
+ tmperrinfo->rec_overruns =
+ (rerrors / tmpinfo.blocksize) - totalrerrors;
+ totalrerrors += tmperrinfo->rec_overruns;
+ }
+ break;
+ case SNDCTL_DSP_COOKEDMODE:
+ /*
+ * NetBSD is always running in "cooked mode" - the kernel
+ * always performs format conversions.
+ */
+ INTARG = 1;
+ break;
case SNDCTL_DSP_POST:
/* This call is merely advisory, and may be a nop. */
break;
Index: src/lib/libossaudio/soundcard.h
diff -u src/lib/libossaudio/soundcard.h:1.24 src/lib/libossaudio/soundcard.h:1.25
--- src/lib/libossaudio/soundcard.h:1.24 Tue Sep 9 10:45:18 2014
+++ src/lib/libossaudio/soundcard.h Fri Oct 16 20:24:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: soundcard.h,v 1.24 2014/09/09 10:45:18 nat Exp $ */
+/* $NetBSD: soundcard.h,v 1.25 2020/10/16 20:24:35 nia Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -327,6 +327,22 @@ typedef struct buffmem_desc {
#define SNDCTL_DSP_SETRECVOL _IOW ('P',30, uint)
#define SNDCTL_DSP_SKIP _IO ('P',31)
#define SNDCTL_DSP_SILENCE _IO ('P',32)
+#define SNDCTL_DSP_COOKEDMODE _IOW ('P',33, int)
+#define SNDCTL_DSP_GETERROR _IOR ('P',34, struct audio_errinfo)
+
+typedef struct audio_errinfo {
+ int play_underruns;
+ int rec_overruns;
+ unsigned int play_ptradjust; /* Obsolete */
+ unsigned int rec_ptradjust; /* Obsolete */
+ int play_errorcount; /* Unused */
+ int rec_errorcount; /* Unused */
+ int play_lasterror; /* Unused */
+ int rec_lasterror; /* Unused */
+ int play_errorparm; /* Unused */
+ int rec_errorparm; /* Unused */
+ int filler[16]; /* Unused */
+} audio_errinfo;
typedef struct oss_sysinfo {
char product[32];
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Fri Oct 16 18:27:34 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: Remove trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/dev/dino.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/hppa/dev/dino.c diff -u src/sys/arch/hppa/dev/dino.c:1.8 src/sys/arch/hppa/dev/dino.c:1.9 --- src/sys/arch/hppa/dev/dino.c:1.8 Fri Oct 16 18:27:02 2020 +++ src/sys/arch/hppa/dev/dino.c Fri Oct 16 18:27:34 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.8 2020/10/16 18:27:02 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.9 2020/10/16 18:27:34 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.8 2020/10/16 18:27:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.9 2020/10/16 18:27:34 skrll Exp $"); /* #include "cardbus.h" */ @@ -356,7 +356,7 @@ dino_conf_read(void *v, pcitag_t tag, in /* fix arbitration errata by disabling all pci devs on config read */ pamr = r->pamr; r->pamr = 0; - + r->pci_addr = tag | reg; data = r->pci_conf_data;
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Fri Oct 16 18:27:34 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: Remove trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/dev/dino.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/hppa/dev
Module Name:src Committed By: skrll Date: Fri Oct 16 18:27:02 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/dev/dino.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/hppa/dev/dino.c diff -u src/sys/arch/hppa/dev/dino.c:1.7 src/sys/arch/hppa/dev/dino.c:1.8 --- src/sys/arch/hppa/dev/dino.c:1.7 Fri Oct 16 17:59:46 2020 +++ src/sys/arch/hppa/dev/dino.c Fri Oct 16 18:27:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $ */ +/* $NetBSD: dino.c,v 1.8 2020/10/16 18:27:02 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.8 2020/10/16 18:27:02 skrll Exp $"); /* #include "cardbus.h" */ @@ -350,7 +350,8 @@ dino_conf_read(void *v, pcitag_t tag, in * accessing dev 1f / func 7 on the 2nd Dino causes a machine check * exception on my C200 */ - if ((tag & 0xff00) == 0xff00) return -1; + if ((tag & 0xff00) == 0xff00) + return -1; /* fix arbitration errata by disabling all pci devs on config read */ pamr = r->pamr;
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Fri Oct 16 18:27:02 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/dev/dino.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/hppa/dev
Module Name:src Committed By: macallan Date: Fri Oct 16 17:59:46 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: config space accesses to device 15 function 7 cause a machine check exception on my C200, so weed them out. Now we can scan the PCI buses without crashing. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/dev/dino.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/hppa/dev
Module Name:src Committed By: macallan Date: Fri Oct 16 17:59:46 UTC 2020 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: config space accesses to device 15 function 7 cause a machine check exception on my C200, so weed them out. Now we can scan the PCI buses without crashing. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/dev/dino.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/hppa/dev/dino.c diff -u src/sys/arch/hppa/dev/dino.c:1.6 src/sys/arch/hppa/dev/dino.c:1.7 --- src/sys/arch/hppa/dev/dino.c:1.6 Sun Jun 14 01:40:04 2020 +++ src/sys/arch/hppa/dev/dino.c Fri Oct 16 17:59:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $ */ +/* $NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.7 2020/10/16 17:59:46 macallan Exp $"); /* #include "cardbus.h" */ @@ -345,10 +345,17 @@ dino_conf_read(void *v, pcitag_t tag, in if ((unsigned int)reg >= PCI_CONF_SIZE) return (pcireg_t) -1; + /* + * XXX + * accessing dev 1f / func 7 on the 2nd Dino causes a machine check + * exception on my C200 + */ + if ((tag & 0xff00) == 0xff00) return -1; + /* fix arbitration errata by disabling all pci devs on config read */ pamr = r->pamr; r->pamr = 0; - + r->pci_addr = tag | reg; data = r->pci_conf_data; @@ -368,6 +375,13 @@ dino_conf_write(void *v, pcitag_t tag, i if ((unsigned int)reg >= PCI_CONF_SIZE) return; + /* + * XXX + * accessing dev 1f / func 7 on the 2nd Dino causes a machine check + * exception on my C200 + */ + if ((tag & 0xff00) == 0xff00) return; + /* fix arbitration errata by disabling all pci devs on config read */ pamr = r->pamr; r->pamr = 0;
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: macallan
Date: Fri Oct 16 17:50:44 UTC 2020
Modified Files:
src/sys/arch/hppa/hppa: mainbus.c
Log Message:
support *_mmap()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/mainbus.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/hppa/hppa/mainbus.c
diff -u src/sys/arch/hppa/hppa/mainbus.c:1.4 src/sys/arch/hppa/hppa/mainbus.c:1.5
--- src/sys/arch/hppa/hppa/mainbus.c:1.4 Fri Apr 26 18:37:24 2019
+++ src/sys/arch/hppa/hppa/mainbus.c Fri Oct 16 17:50:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2019/04/26 18:37:24 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.5 2020/10/16 17:50:44 macallan Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2019/04/26 18:37:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2020/10/16 17:50:44 macallan Exp $");
#include "locators.h"
#include "power.h"
@@ -354,8 +354,7 @@ mbus_vaddr(void *v, bus_space_handle_t h
paddr_t
mbus_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
{
-
- return -1;
+ return btop(addr + off);
}
uint8_t
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: macallan Date: Fri Oct 16 17:50:44 UTC 2020 Modified Files: src/sys/arch/hppa/hppa: mainbus.c Log Message: support *_mmap() To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 16:48:07 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libossaudio/ossaudio.3 diff -u src/lib/libossaudio/ossaudio.3:1.21 src/lib/libossaudio/ossaudio.3:1.22 --- src/lib/libossaudio/ossaudio.3:1.21 Fri Oct 16 16:30:53 2020 +++ src/lib/libossaudio/ossaudio.3 Fri Oct 16 16:48:07 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ossaudio.3,v 1.21 2020/10/16 16:30:53 nia Exp $ +.\" $NetBSD: ossaudio.3,v 1.22 2020/10/16 16:48:07 nia Exp $ .\" .\" Copyright (c) 1997, 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -69,6 +69,17 @@ device names to OSS mixer controls. .It *.fmsynth Ta SOUND_MIXER_SYNTH .It *.midi Ta SOUND_MIXER_SYNTH .El +.Sh COMPATIBILITY +The +.Nm +interface aims to be compatible with the Open Sound System version 4, as +described in: +.Pp +.Rs +.%A 4Front Technologies +.%T OSS 4.x Programmer's Guide +.%U http://manuals.opensound.com/developer/ +.%D 2007 .Sh SEE ALSO .Xr ioctl 2 , .Xr audio 4 , @@ -85,17 +96,6 @@ API for writing audio code under Linux u in Linux 2.6. It remains the preferred API in FreeBSD and Solaris, and a large body of code exists supporting it. -.Sh COMPATIBILITY -The -.Nm -interface aims to be compatible with the Open Sound System version 4, as -described in: -.Pp -.Rs -.%A 4Front Technologies -.%T OSS 4.x Programmer's Guide -.%U http://manuals.opensound.com/developer/ -.%D 2007 .Sh BUGS .Pp The emulation is incomplete.
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 16:48:07 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 16:30:53 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: More information about the history and status of this API To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 16:30:53 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.3 Log Message: ossaudio.3: More information about the history and status of this API To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libossaudio/ossaudio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libossaudio/ossaudio.3 diff -u src/lib/libossaudio/ossaudio.3:1.20 src/lib/libossaudio/ossaudio.3:1.21 --- src/lib/libossaudio/ossaudio.3:1.20 Thu Mar 12 12:33:46 2009 +++ src/lib/libossaudio/ossaudio.3 Fri Oct 16 16:30:53 2020 @@ -1,6 +1,6 @@ -.\" $NetBSD: ossaudio.3,v 1.20 2009/03/12 12:33:46 joerg Exp $ +.\" $NetBSD: ossaudio.3,v 1.21 2020/10/16 16:30:53 nia Exp $ .\" -.\" Copyright (c) 1997 The NetBSD Foundation, Inc. +.\" Copyright (c) 1997, 2020 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation @@ -27,12 +27,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 3, 2009 +.Dd October 16, 2020 .Dt OSSAUDIO 3 .Os .Sh NAME .Nm ossaudio -.Nd OSS audio emulation +.Nd Open Sound System emulation .Sh LIBRARY .Lb libossaudio .Sh SYNOPSIS @@ -40,11 +40,14 @@ .Sh DESCRIPTION The .Nm -library provides an emulation of the OSS (Linux) audio -interface. +library provides an emulation of the Open Sound System audio interface. .Pp -Use the native interface for new programs and the emulation -library only for porting programs. +Use the native +.Xr audio 4 +and +.Xr mixer 4 +interfaces for new programs, and this emulation library only for +building code written for other operating systems. .Ss Mixer Control Map The following table summarizes the mappings from native interface device names to OSS mixer controls. @@ -67,20 +70,53 @@ device names to OSS mixer controls. .It *.midi Ta SOUND_MIXER_SYNTH .El .Sh SEE ALSO +.Xr ioctl 2 , .Xr audio 4 , -.Xr midi 4 +.Xr midi 4 , +.Xr mixer 4 .Sh HISTORY The .Nm library first appeared in .Nx 1.3 . +.Pp +The Open Sound System up to version 3 was originally the preferred +API for writing audio code under Linux until ALSA became the new default +in Linux 2.6. +It remains the preferred API in FreeBSD and Solaris, and a large body +of code exists supporting it. +.Sh COMPATIBILITY +The +.Nm +interface aims to be compatible with the Open Sound System version 4, as +described in: +.Pp +.Rs +.%A 4Front Technologies +.%T OSS 4.x Programmer's Guide +.%U http://manuals.opensound.com/developer/ +.%D 2007 .Sh BUGS +.Pp +The emulation is incomplete. +Some obscure features are not included, but the essential ioctls used +by the majority of software are covered. +.Pp The emulation uses a #define for .Fn ioctl so some obscure programs can fail to compile. .Pp -The emulation is incomplete. +Linux, FreeBSD, and Solaris provide +.Pa /dev/dsp +and +.Pa /dev/mixer +devices in place of the +.Pa /dev/audio +and +.Pa /dev/mixer +devices this compatibility layer must be accessed through on NetBSD. +However, changing this is typically trivial when porting programs. .Pp The emulation only covers .Fn ioctl ,
CVS commit: src/tests/net/if_wg
Module Name:src Committed By: roy Date: Fri Oct 16 16:17:23 UTC 2020 Modified Files: src/tests/net/if_wg: t_basic.sh t_misc.sh Log Message: wg: Fix tests by sprinkling ifconfig -w 10 So protocols have time to finish setup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_wg/t_basic.sh cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_wg/t_misc.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/if_wg/t_basic.sh diff -u src/tests/net/if_wg/t_basic.sh:1.1 src/tests/net/if_wg/t_basic.sh:1.2 --- src/tests/net/if_wg/t_basic.sh:1.1 Wed Aug 26 16:03:42 2020 +++ src/tests/net/if_wg/t_basic.sh Fri Oct 16 16:17:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_basic.sh,v 1.1 2020/08/26 16:03:42 riastradh Exp $ +# $NetBSD: t_basic.sh,v 1.2 2020/10/16 16:17:23 roy Exp $ # # Copyright (c) 2018 Ryota Ozaki # All rights reserved. @@ -92,16 +92,14 @@ test_common() export RUMP_SERVER=$SOCK_LOCAL setup_common shmif0 $outer_proto $ip_local $outer_prefix setup_wg_common wg0 $inner_proto $ip_wg_local $inner_prefix $port "$key_priv_local" + add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/$inner_prefixall + $ifconfig -w 10 export RUMP_SERVER=$SOCK_PEER setup_common shmif0 $outer_proto $ip_peer $outer_prefix setup_wg_common wg0 $inner_proto $ip_wg_peer $inner_prefix $port "$key_priv_peer" - - export RUMP_SERVER=$SOCK_LOCAL - add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/$inner_prefixall - - export RUMP_SERVER=$SOCK_PEER add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/$inner_prefixall + $ifconfig -w 10 if [ $type = basic ]; then export RUMP_SERVER=$SOCK_LOCAL @@ -327,24 +325,21 @@ wg_multiple_interfaces_body() setup_common shmif1 inet $ip_local2 24 setup_wg_common wg0 inet $ip_wg_local 24 $port "$key_priv_local" setup_wg_common wg1 inet $ip_wg_local2 24 $port2 "$key_priv_local" + add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32 + add_peer wg1 peer0 $key_pub_peer2 $ip_peer2:$port2 $ip_wg_peer2/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_PEER setup_common shmif0 inet $ip_peer 24 setup_wg_common wg0 inet $ip_wg_peer 24 $port "$key_priv_peer" + add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_PEER2 setup_common shmif0 inet $ip_peer2 24 setup_wg_common wg0 inet $ip_wg_peer2 24 $port2 "$key_priv_peer2" - - export RUMP_SERVER=$SOCK_LOCAL - add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32 - add_peer wg1 peer0 $key_pub_peer2 $ip_peer2:$port2 $ip_wg_peer2/32 - - export RUMP_SERVER=$SOCK_PEER - add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32 - - export RUMP_SERVER=$SOCK_PEER2 add_peer wg0 peer0 $key_pub_local $ip_local2:$port2 $ip_wg_local2/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_LOCAL @@ -415,24 +410,21 @@ wg_multiple_peers_body() export RUMP_SERVER=$SOCK_LOCAL setup_common shmif0 inet $ip_local 24 setup_wg_common wg0 inet $ip_wg_local 24 $port "$key_priv_local" + add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32 + add_peer wg0 peer1 $key_pub_peer2 $ip_peer2:$port $ip_wg_peer2/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_PEER setup_common shmif0 inet $ip_peer 24 setup_wg_common wg0 inet $ip_wg_peer 24 $port "$key_priv_peer" + add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_PEER2 setup_common shmif0 inet $ip_peer2 24 setup_wg_common wg0 inet $ip_wg_peer2 24 $port "$key_priv_peer2" - - export RUMP_SERVER=$SOCK_LOCAL - add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32 - add_peer wg0 peer1 $key_pub_peer2 $ip_peer2:$port $ip_wg_peer2/32 - - export RUMP_SERVER=$SOCK_PEER - add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32 - - export RUMP_SERVER=$SOCK_PEER2 add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32 + $ifconfig -w 10 export RUMP_SERVER=$SOCK_LOCAL Index: src/tests/net/if_wg/t_misc.sh diff -u src/tests/net/if_wg/t_misc.sh:1.5 src/tests/net/if_wg/t_misc.sh:1.6 --- src/tests/net/if_wg/t_misc.sh:1.5 Mon Aug 31 20:32:58 2020 +++ src/tests/net/if_wg/t_misc.sh Fri Oct 16 16:17:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_misc.sh,v 1.5 2020/08/31 20:32:58 riastradh Exp $ +# $NetBSD: t_misc.sh,v 1.6 2020/10/16 16:17:23 roy Exp $ # # Copyright (c) 2018 Ryota Ozaki # All rights reserved. @@ -65,16 +65,14 @@ wg_rekey_body() export RUMP_SERVER=$SOCK_LOCAL setup_common shmif0 inet $ip_local 24 setup_wg_common wg0 inet $ip_wg_local 24 $port "$key_priv_local" + add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32 + $fconfig -w 10 export RUMP_SERVER=$SOCK_PEER setup_common shmif0 inet $ip_peer 24 setup_wg_common wg0 inet $ip_wg_peer 24 $port "$key_priv_peer" - - export RUMP_SERVER=$SOCK_LOCAL - add_peer wg0 peer0 $key_pub_peer $ip_peer:$port
CVS commit: src/tests/net/if_wg
Module Name:src Committed By: roy Date: Fri Oct 16 16:17:23 UTC 2020 Modified Files: src/tests/net/if_wg: t_basic.sh t_misc.sh Log Message: wg: Fix tests by sprinkling ifconfig -w 10 So protocols have time to finish setup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_wg/t_basic.sh cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_wg/t_misc.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: ryo Date: Fri Oct 16 15:40:40 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi Log Message: in my previous commit, entries before the move must be obsolete rather than removed pointed out by nonaka@, thanks To generate a diff of this commit: cvs rdiff -u -r1.1705 -r1.1706 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: ryo Date: Fri Oct 16 15:40:40 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi Log Message: in my previous commit, entries before the move must be obsolete rather than removed pointed out by nonaka@, thanks To generate a diff of this commit: cvs rdiff -u -r1.1705 -r1.1706 src/distrib/sets/lists/man/mi 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.1705 src/distrib/sets/lists/man/mi:1.1706 --- src/distrib/sets/lists/man/mi:1.1705 Wed Oct 14 10:19:10 2020 +++ src/distrib/sets/lists/man/mi Fri Oct 16 15:40:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1705 2020/10/14 10:19:10 ryo Exp $ +# $NetBSD: mi,v 1.1706 2020/10/16 15:40:40 ryo Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2090,6 +2090,7 @@ ./usr/share/man/cat4/x86/tprof_amdpmi.0 man-obsolete obsolete ./usr/share/man/cat4/x86/tprof_pmi.0 man-obsolete obsolete ./usr/share/man/cat4/x86/vmt.0 man-sys-catman .cat +./usr/share/man/cat4/x86/vmx.0 man-obsolete obsolete ./usr/share/man/cat4/xbd.0 man-sys-catman .cat ./usr/share/man/cat4/xbdback.0 man-sys-catman .cat ./usr/share/man/cat4/xbox.0 man-sys-catman .cat @@ -5229,6 +5230,7 @@ ./usr/share/man/html4/x86/tprof_amdpmi.html man-obsolete obsolete ./usr/share/man/html4/x86/tprof_pmi.html man-obsolete obsolete ./usr/share/man/html4/x86/vmt.html man-sys-htmlman html +./usr/share/man/html4/x86/vmx.html man-obsolete obsolete ./usr/share/man/html4/xbd.html man-sys-htmlman html ./usr/share/man/html4/xbdback.html man-sys-htmlman html ./usr/share/man/html4/xbox.html man-sys-htmlman html @@ -8300,6 +8302,7 @@ ./usr/share/man/man4/x86/tprof_amdpmi.4 man-obsolete obsolete ./usr/share/man/man4/x86/tprof_pmi.4 man-obsolete obsolete ./usr/share/man/man4/x86/vmt.4 man-sys-man .man +./usr/share/man/man4/x86/vmx.4 man-obsolete obsolete ./usr/share/man/man4/xbd.4 man-sys-man .man ./usr/share/man/man4/xbdback.4 man-sys-man .man ./usr/share/man/man4/xbox.4 man-sys-man .man
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Fri Oct 16 15:40:16 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio: Bump copyright date and improve description.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.46 src/lib/libossaudio/ossaudio.c:1.47
--- src/lib/libossaudio/ossaudio.c:1.46 Fri Oct 16 12:36:01 2020
+++ src/lib/libossaudio/ossaudio.c Fri Oct 16 15:40:16 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: ossaudio.c,v 1.46 2020/10/16 12:36:01 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.47 2020/10/16 15:40:16 nia Exp $ */
/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,15 +27,17 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.46 2020/10/16 12:36:01 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.47 2020/10/16 15:40:16 nia Exp $");
/*
- * This is an OSS (Linux) sound API emulator.
- * It provides the essentials of the API.
- */
-
-/* XXX This file is essentially the same as sys/compat/ossaudio.c.
- * With some preprocessor magic it could be the same file.
+ * This is an Open Sound System compatibility layer, which provides
+ * fairly complete ioctl emulation for OSSv3 and some of OSSv4.
+ *
+ * The canonical OSS specification is available at
+ * http://manuals.opensound.com/developer/
+ *
+ * This file is similar to sys/compat/ossaudio.c with additional OSSv4
+ * compatibility - with some preprocessor magic it could be the same file.
*/
#include
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 15:40:16 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.c Log Message: ossaudio: Bump copyright date and improve description. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libossaudio/ossaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kim
Date: Fri Oct 16 15:31:04 UTC 2020
Modified Files:
src/etc/rc.d: network
Log Message:
network: Update rtsol options
- Use "-6" instead of "--noipv4" as it seems more appropriate based on
the dhcpcd(8) manual page.
- Remove "-f /dev/null" as it seems unnecessary with "-6".
- Remove "--persistent" as it is in the default /etc/dhcpcd.conf,
and this way the user can change it, if they would like to (either
through dhcpcd_flags or by editing /etc/dhcpcd.conf).
The "-b" (or "--background") option is needed to avoid a timeout error
message (and a delay in booting), so it is still left in place.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/etc/rc.d/network
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.84 src/etc/rc.d/network:1.85
--- src/etc/rc.d/network:1.84 Thu Oct 15 07:05:27 2020
+++ src/etc/rc.d/network Fri Oct 16 15:31:04 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.84 2020/10/15 07:05:27 kim Exp $
+# $NetBSD: network,v 1.85 2020/10/16 15:31:04 kim Exp $
#
# PROVIDE: network
@@ -325,9 +325,7 @@ network_start_interfaces()
;;
rtsol)
if ! checkyesno dhcpcd; then
- /sbin/dhcpcd -n -f /dev/null \
- --background --persistent \
- --noipv4 \
+ /sbin/dhcpcd -n6b \
${dhcpcd_flags} $int
fi
;;
CVS commit: src/etc/rc.d
Module Name:src Committed By: kim Date: Fri Oct 16 15:31:04 UTC 2020 Modified Files: src/etc/rc.d: network Log Message: network: Update rtsol options - Use "-6" instead of "--noipv4" as it seems more appropriate based on the dhcpcd(8) manual page. - Remove "-f /dev/null" as it seems unnecessary with "-6". - Remove "--persistent" as it is in the default /etc/dhcpcd.conf, and this way the user can change it, if they would like to (either through dhcpcd_flags or by editing /etc/dhcpcd.conf). The "-b" (or "--background") option is needed to avoid a timeout error message (and a delay in booting), so it is still left in place. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/etc/rc.d/network Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Oct 16 14:38:14 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ammend ticket #1603 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.44 src/doc/CHANGES-8.3:1.1.2.45 --- src/doc/CHANGES-8.3:1.1.2.44 Mon Oct 12 10:25:09 2020 +++ src/doc/CHANGES-8.3 Fri Oct 16 14:38:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.44 2020/10/12 10:25:09 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.45 2020/10/16 14:38:13 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1039,7 +1039,7 @@ sys/netinet/tcp_input.c1.419 1 byte every 5 or even 60 seconds. [kardel, ticket #1602] -etc/defaults/rc.conf1.159 +etc/defaults/rc.conf1.159 (patch) etc/rc.d/motd 1.10,1.11 share/man/man5/rc.conf.5 1.186,1.187 @@ -1128,3 +1128,9 @@ external/bsd/ntp/bin/sntp/sntp.1 delete ntpd(8): PR 55710: install the correct man pages. [kim, ticket #1616] +sys/dev/pci/if_wm.c1.691 + + Fix SGMII code to not to print error message. This problem was added + when SFP support was added. + [msaitoh, ticket #1617] +
CVS commit: [netbsd-8] src/etc/defaults
Module Name:src Committed By: martin Date: Fri Oct 16 14:37:31 UTC 2020 Modified Files: src/etc/defaults [netbsd-8]: rc.conf Log Message: Pull up the following revision, requested by kim in ticket #1603 and accidently lost during initial commit: etc/defaults/rc.conf: revision 1.159 Add optional release info in /etc/motd. To generate a diff of this commit: cvs rdiff -u -r1.139.6.1 -r1.139.6.2 src/etc/defaults/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.139.6.1 src/etc/defaults/rc.conf:1.139.6.2 --- src/etc/defaults/rc.conf:1.139.6.1 Tue May 14 11:33:42 2019 +++ src/etc/defaults/rc.conf Fri Oct 16 14:37:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.139.6.1 2019/05/14 11:33:42 martin Exp $ +# $NetBSD: rc.conf,v 1.139.6.2 2020/10/16 14:37:31 martin Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -125,6 +125,7 @@ per_user_tmp=NO # per-user /tmp dire per_user_tmp_dir="/private/tmp" # real storage for /tmp clear_tmp=YES # clear /tmp after reboot update_motd=YES # updates /etc/motd +update_motd_release=NO motd_release_tag="" # release info in /etc/motd dmesg=YES dmesg_flags="" # write /var/run/dmesg.boot accounting=NO # uses /var/account/acct newsyslog=NO newsyslog_flags="" # trim log files
CVS commit: [netbsd-8] src/etc/defaults
Module Name:src Committed By: martin Date: Fri Oct 16 14:37:31 UTC 2020 Modified Files: src/etc/defaults [netbsd-8]: rc.conf Log Message: Pull up the following revision, requested by kim in ticket #1603 and accidently lost during initial commit: etc/defaults/rc.conf: revision 1.159 Add optional release info in /etc/motd. To generate a diff of this commit: cvs rdiff -u -r1.139.6.1 -r1.139.6.2 src/etc/defaults/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Oct 16 14:38:14 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ammend ticket #1603 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS import: src/external/bsd/dhcpcd/dist
Hi,
Roy Marples writes:
> Hi Ryo
>
> On 15/10/2020 02:23, Ryo ONODERA wrote:
>> dhcpcd-9.3.1 do not detect carrier with cdce(4) and urndis(4) devices.
>> dhcpcd-9.2.0 from pkgsrc-2020Q3 branch works without problems.
>> (Maybe 9.3.0 in NetBSD base worked for me.)
>>
>> cdce and urndis have no "status" line in ifconfig command output.
>> Is this related to my problem?
>
> Does this fix it?
This patch fixes my problem.
Thank you very much!
> diff --git a/src/if.c b/src/if.c
> index 5f4edb86..deb5280b 100644
> --- a/src/if.c
> +++ b/src/if.c
> @@ -198,10 +198,8 @@ if_is_link_up(const struct interface *ifp)
> {
>
> return ifp->flags & IFF_UP &&
> - (ifp->carrier == LINK_UP ||
> - (ifp->carrier == LINK_UNKNOWN &&
> - !(ifp->options == NULL ||
> - ifp->options->options & DHCPCD_LINK)));
> + (ifp->carrier != LINK_DOWN ||
> + (ifp->options != NULL && !(ifp->options->options & DHCPCD_LINK)));
> }
>
> int
--
Ryo ONODERA // r...@tetera.org
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Fri Oct 16 12:36:01 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio: Add comments for the more obscure parts of SNDCTL_AUDIOINFO
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.45 src/lib/libossaudio/ossaudio.c:1.46
--- src/lib/libossaudio/ossaudio.c:1.45 Fri Oct 16 12:23:34 2020
+++ src/lib/libossaudio/ossaudio.c Fri Oct 16 12:36:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.45 2020/10/16 12:23:34 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.46 2020/10/16 12:36:01 nia Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.45 2020/10/16 12:23:34 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.46 2020/10/16 12:36:01 nia Exp $");
/*
* This is an OSS (Linux) sound API emulator.
@@ -574,6 +574,15 @@ audio_ioctl(int fd, unsigned long com, v
tmpaudioinfo = (struct oss_audioinfo*)argp;
if (tmpaudioinfo == NULL)
return EINVAL;
+
+ /*
+ * Takes the audio dev node as input, since this ioctl is
+ * supposed to work on the OSS /dev/mixer to query all
+ * all available audio devices.
+ *
+ * If the input device is -1, guess the device related to
+ * the open mixer device.
+ */
if (tmpaudioinfo->dev < 0) {
fstat(fd, );
if ((tmpstat.st_rdev & 0xff00) == 0x2a00)
@@ -619,7 +628,7 @@ audio_ioctl(int fd, unsigned long com, v
tmpaudioinfo->caps = idat;
ioctl(newfd, SNDCTL_DSP_GETFMTS, >iformats);
tmpaudioinfo->oformats = tmpaudioinfo->iformats;
- tmpaudioinfo->magic = -1;
+ tmpaudioinfo->magic = -1; /* reserved for "internal use" */
memset(tmpaudioinfo->cmd, 0, sizeof(tmpaudioinfo->cmd));
tmpaudioinfo->card_number = -1;
memset(tmpaudioinfo->song_name, 0,
@@ -627,10 +636,10 @@ audio_ioctl(int fd, unsigned long com, v
memset(tmpaudioinfo->label, 0, sizeof(tmpaudioinfo->label));
tmpaudioinfo->port_number = 0;
tmpaudioinfo->mixer_dev = tmpaudioinfo->dev;
- tmpaudioinfo->legacy_device = -1;
+ tmpaudioinfo->legacy_device = tmpaudioinfo->dev;
tmpaudioinfo->enabled = 1;
- tmpaudioinfo->flags = -1;
- tmpaudioinfo->min_rate = 8000;
+ tmpaudioinfo->flags = -1; /* reserved for "future versions" */
+ tmpaudioinfo->min_rate = 1000;
tmpaudioinfo->max_rate = 192000;
tmpaudioinfo->nrates = 0;
tmpaudioinfo->min_channels = 1;
@@ -639,8 +648,12 @@ audio_ioctl(int fd, unsigned long com, v
if (fmtq.fmt.channels > (unsigned)tmpaudioinfo->max_channels)
tmpaudioinfo->max_channels = fmtq.fmt.channels;
}
- tmpaudioinfo->binding = -1;
+ tmpaudioinfo->binding = -1; /* reserved for "future versions" */
tmpaudioinfo->rate_source = -1;
+ /*
+ * 'handle' is supposed to be globally unique. The closest
+ * we have to that is probably device nodes.
+ */
strlcpy(tmpaudioinfo->handle, tmpaudioinfo->devnode,
sizeof(tmpaudioinfo->handle));
tmpaudioinfo->next_play_engine = 0;
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 12:36:01 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.c Log Message: ossaudio: Add comments for the more obscure parts of SNDCTL_AUDIOINFO To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/lib/libossaudio/ossaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Fri Oct 16 12:23:34 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio: Various OSSv4 fixes for SNDCTL_AUDIOINFO
- Per OSSv4, make this ioctl work on the main mixer device.
Since the native NetBSD API uses queries on individual audio devices,
we have to reopen the correct audio device specified in the input to the
ioctl and fetch information from that.
- Correctly return whether the device is for playback, capture, or both.
- Return the full name of the device in the name field.
- The "handle" has to be a globally unique identifier. The closest thing
we have to that is device numbers, so use device numbers.
- Return reasonable values in min_rate/max_rate and min_channels/max_channels.
This should allow Mumble's device enumeration to work with a lot less
patching.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.44 src/lib/libossaudio/ossaudio.c:1.45
--- src/lib/libossaudio/ossaudio.c:1.44 Mon Apr 20 12:01:44 2020
+++ src/lib/libossaudio/ossaudio.c Fri Oct 16 12:23:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.44 2020/04/20 12:01:44 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.45 2020/10/16 12:23:34 nia Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.44 2020/04/20 12:01:44 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.45 2020/10/16 12:23:34 nia Exp $");
/*
* This is an OSS (Linux) sound API emulator.
@@ -103,6 +103,7 @@ audio_ioctl(int fd, unsigned long com, v
struct audio_info tmpinfo, hwfmt;
struct audio_offset tmpoffs;
struct audio_buf_info bufinfo;
+ struct audio_format_query fmtq;
struct count_info cntinfo;
struct audio_encoding tmpenc;
struct oss_sysinfo tmpsysinfo;
@@ -116,8 +117,9 @@ audio_ioctl(int fd, unsigned long com, v
u_int encoding;
u_int precision;
int idat, idata;
+ int props;
int retval;
- int i;
+ int newfd;
idat = 0;
@@ -583,53 +585,68 @@ audio_ioctl(int fd, unsigned long com, v
tmpaudioinfo->dev = 0;
snprintf(tmpaudioinfo->devnode, OSS_DEVNODE_SIZE,
- "/dev/audio%d", tmpaudioinfo->dev);
+ "/dev/audio%d", tmpaudioinfo->dev);
- retval = ioctl(fd, AUDIO_GETDEV, );
- if (retval < 0)
- return retval;
- retval = ioctl(fd, AUDIO_GETINFO, );
- if (retval < 0)
+ if ((newfd = open(tmpaudioinfo->devnode, O_WRONLY)) < 0) {
+ if ((newfd = open(tmpaudioinfo->devnode, O_RDONLY)) < 0) {
+return newfd;
+ }
+ }
+
+ retval = ioctl(newfd, AUDIO_GETDEV, );
+ if (retval < 0) {
+ close(newfd);
return retval;
- retval = ioctl(fd, AUDIO_GETPROPS, );
- if (retval < 0)
+ }
+ retval = ioctl(newfd, AUDIO_GETPROPS, );
+ if (retval < 0) {
+ close(newfd);
return retval;
+ }
idat = DSP_CAP_TRIGGER;
- if (idata & AUDIO_PROP_FULLDUPLEX)
+ if (props & AUDIO_PROP_FULLDUPLEX)
idat |= DSP_CAP_DUPLEX;
- if (idata & AUDIO_PROP_MMAP)
+ if (props & AUDIO_PROP_MMAP)
idat |= DSP_CAP_MMAP;
- idat = PCM_CAP_INPUT | PCM_CAP_OUTPUT;
- strlcpy(tmpaudioinfo->name, tmpaudiodev.name,
- sizeof tmpaudioinfo->name);
- tmpaudioinfo->busy = tmpinfo.play.open;
+ if (props & AUDIO_PROP_CAPTURE)
+ idat |= PCM_CAP_INPUT;
+ if (props & AUDIO_PROP_PLAYBACK)
+ idat |= PCM_CAP_OUTPUT;
+ snprintf(tmpaudioinfo->name, sizeof(tmpaudioinfo->name),
+ "%s %s", tmpaudiodev.name, tmpaudiodev.version);
+ tmpaudioinfo->busy = 0;
tmpaudioinfo->pid = -1;
tmpaudioinfo->caps = idat;
- ioctl(fd, SNDCTL_DSP_GETFMTS, >iformats);
+ ioctl(newfd, SNDCTL_DSP_GETFMTS, >iformats);
tmpaudioinfo->oformats = tmpaudioinfo->iformats;
tmpaudioinfo->magic = -1;
- memset(tmpaudioinfo->cmd, 0, 64);
+ memset(tmpaudioinfo->cmd, 0, sizeof(tmpaudioinfo->cmd));
tmpaudioinfo->card_number = -1;
- memset(tmpaudioinfo->song_name, 0, 64);
- memset(tmpaudioinfo->label, 0, 16);
- tmpaudioinfo->port_number = tmpinfo.play.port;
+ memset(tmpaudioinfo->song_name, 0,
+ sizeof(tmpaudioinfo->song_name));
+ memset(tmpaudioinfo->label, 0, sizeof(tmpaudioinfo->label));
+ tmpaudioinfo->port_number = 0;
tmpaudioinfo->mixer_dev = tmpaudioinfo->dev;
tmpaudioinfo->legacy_device = -1;
tmpaudioinfo->enabled = 1;
tmpaudioinfo->flags = -1;
- tmpaudioinfo->min_rate = tmpinfo.play.sample_rate;
- tmpaudioinfo->max_rate = tmpinfo.play.sample_rate;
- tmpaudioinfo->nrates = 2;
- for (i = 0; i < tmpaudioinfo->nrates; i++)
- tmpaudioinfo->rates[i] = tmpinfo.play.sample_rate;
- tmpaudioinfo->min_channels = tmpinfo.play.channels;
- tmpaudioinfo->max_channels = tmpinfo.play.channels;
+ tmpaudioinfo->min_rate = 8000;
+ tmpaudioinfo->max_rate = 192000;
+ tmpaudioinfo->nrates = 0;
+ tmpaudioinfo->min_channels
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nia Date: Fri Oct 16 12:23:34 UTC 2020 Modified Files: src/lib/libossaudio: ossaudio.c Log Message: ossaudio: Various OSSv4 fixes for SNDCTL_AUDIOINFO - Per OSSv4, make this ioctl work on the main mixer device. Since the native NetBSD API uses queries on individual audio devices, we have to reopen the correct audio device specified in the input to the ioctl and fetch information from that. - Correctly return whether the device is for playback, capture, or both. - Return the full name of the device in the name field. - The "handle" has to be a globally unique identifier. The closest thing we have to that is device numbers, so use device numbers. - Return reasonable values in min_rate/max_rate and min_channels/max_channels. This should allow Mumble's device enumeration to work with a lot less patching. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libossaudio/ossaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Oct 16 11:17:54 UTC 2020 Modified Files: src/doc: 3RDPARTY Log Message: lua 5.3.6/5.4.1 out. To generate a diff of this commit: cvs rdiff -u -r1.1752 -r1.1753 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Oct 16 11:17:54 UTC 2020 Modified Files: src/doc: 3RDPARTY Log Message: lua 5.3.6/5.4.1 out. To generate a diff of this commit: cvs rdiff -u -r1.1752 -r1.1753 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1752 src/doc/3RDPARTY:1.1753 --- src/doc/3RDPARTY:1.1752 Mon Oct 12 14:10:37 2020 +++ src/doc/3RDPARTY Fri Oct 16 11:17:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1752 2020/10/12 14:10:37 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1753 2020/10/16 11:17:54 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -831,7 +831,7 @@ into inetd. The provided libwrap2netbsd Package: Lua Version: Lua 5.3.5 -Current Vers: Lua 5.4.0 +Current Vers: Lua 5.3.6/5.4.1 Maintainer: PUC Rio Home Page: https://www.lua.org/ Date: 2020-06-30
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Fri Oct 16 11:09:33 UTC 2020 Modified Files: src/distrib/sets/lists/debug: md.amd64 md.i386 Log Message: Add missig t_convert_xmm_s87.debug to fix build with MKDEBUG=yes. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/md.i386 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/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.112 src/distrib/sets/lists/debug/md.amd64:1.113 --- src/distrib/sets/lists/debug/md.amd64:1.112 Sat Sep 26 17:49:50 2020 +++ src/distrib/sets/lists/debug/md.amd64 Fri Oct 16 11:09:32 2020 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.112 2020/09/26 17:49:50 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.113 2020/10/16 11:09:32 rin Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete @@ -23,3 +23,4 @@ ./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf,nvmm ./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf,nvmm ./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug debug,atf,rump +./usr/libdata/debug/usr/tests/sys/x86/t_convert_xmm_s87.debug tests-sys-debug debug,atf Index: src/distrib/sets/lists/debug/md.i386 diff -u src/distrib/sets/lists/debug/md.i386:1.19 src/distrib/sets/lists/debug/md.i386:1.20 --- src/distrib/sets/lists/debug/md.i386:1.19 Sat Sep 12 15:25:42 2020 +++ src/distrib/sets/lists/debug/md.i386 Fri Oct 16 11:09:32 2020 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.19 2020/09/12 15:25:42 jmcneill Exp $ +# $NetBSD: md.i386,v 1.20 2020/10/16 11:09:32 rin Exp $ ./usr/lib/libi386_g.acomp-c-debuglib debuglib ./usr/lib/libm387_g.acomp-c-debuglib debuglib ./usr/lib/libpmc_g.acomp-obsolete obsolete @@ -20,3 +20,4 @@ ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete +./usr/libdata/debug/usr/tests/sys/x86/t_convert_xmm_s87.debug tests-sys-debug debug,atf
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Fri Oct 16 11:09:33 UTC 2020 Modified Files: src/distrib/sets/lists/debug: md.amd64 md.i386 Log Message: Add missig t_convert_xmm_s87.debug to fix build with MKDEBUG=yes. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: nia Date: Fri Oct 16 10:32:52 UTC 2020 Modified Files: src/distrib/sets/lists/xdebug: mi Log Message: Add xcompmgr To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xdebug/mi 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/xdebug/mi diff -u src/distrib/sets/lists/xdebug/mi:1.35 src/distrib/sets/lists/xdebug/mi:1.36 --- src/distrib/sets/lists/xdebug/mi:1.35 Thu Nov 14 02:27:18 2019 +++ src/distrib/sets/lists/xdebug/mi Fri Oct 16 10:32:52 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.35 2019/11/14 02:27:18 uki Exp $ +# $NetBSD: mi,v 1.36 2020/10/16 10:32:52 nia Exp $ ./etc/mtree/set.xdebug comp-sys-root ./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir ./usr/X11R7/lib/libEGL_g.axdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor @@ -164,6 +164,7 @@ ./usr/libdata/debug/usr/X11R7/bin/xclipboard.debug xdebug-xclipboard-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/xclock.debug xdebug-xclock-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/xcmsdb.debug xdebug-xcmsdb-debug xorg,debug +./usr/libdata/debug/usr/X11R7/bin/xcompmgr.debug xdebug-xcompmgr-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/xconsole.debug xdebug-xconsole-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/xcutsel.debug xdebug-xcutsel-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/xditview.debug xdebug-xditview-debug xorg,debug
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: nia Date: Fri Oct 16 10:32:52 UTC 2020 Modified Files: src/distrib/sets/lists/xdebug: mi Log Message: Add xcompmgr To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xdebug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/gpl3/gcc/dist/gcc/config/aarch64
Date:Fri, 16 Oct 2020 04:07:31 + From:"Thomas Mueller" Message-ID: <20201016052422.e063084...@mail.netbsd.org> | Should I add ,linux to the end of the procfs line? You can, but it isn't needed these days -- I used to mount procfs twice, once without the linux option, on /proc, and once with, on /emul/linux/proc) but there seems to be little point in that any more (even though the linux /proc has a whole bunch of trash that has nothing to do with processes, and should be, and generally is, available from /kern ... /proc/cpuinfo is an example of that, though that one is missing from kernfs and should be added there). I do add "hidden" to the mount option list though, there's essentially no point in including /proc /kern /dev/pts (or anything else like those) in default df output (which is the only thing "hidden" generally affects). kre
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: mgorny Date: Fri Oct 16 08:51:12 UTC 2020 Modified Files: src/tests/lib/libc/sys: t_ptrace_x86_wait.h Log Message: Remove leftover commented out #if 0 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/sys/t_ptrace_x86_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/sys/t_ptrace_x86_wait.h diff -u src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.28 src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.29 --- src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.28 Thu Oct 15 17:43:09 2020 +++ src/tests/lib/libc/sys/t_ptrace_x86_wait.h Fri Oct 16 08:51:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: t_ptrace_x86_wait.h,v 1.28 2020/10/15 17:43:09 mgorny Exp $ */ +/* $NetBSD: t_ptrace_x86_wait.h,v 1.29 2020/10/16 08:51:12 mgorny Exp $ */ /*- * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc. @@ -3551,9 +3551,7 @@ x86_register_test(enum x86_test_regset r /* SETFPREGS on i386 */ fpr.fstate.s87_cw = expected_fpu.cw; fpr.fstate.s87_sw = expected_fpu.sw; -//#if 0 /* TODO: translation from FXSAVE is broken */ fpr.fstate.s87_tw = expected_fpu.tw; -//#endif fpr.fstate.s87_opcode = expected_fpu.opcode; fpr.fstate.s87_ip = expected_fpu.ip; fpr.fstate.s87_dp = expected_fpu.dp;
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: mgorny Date: Fri Oct 16 08:51:12 UTC 2020 Modified Files: src/tests/lib/libc/sys: t_ptrace_x86_wait.h Log Message: Remove leftover commented out #if 0 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/sys/t_ptrace_x86_wait.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: nia
Date: Fri Oct 16 08:28:17 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/bin: Makefile
Added Files:
src/external/mit/xorg/bin/xcompmgr: Makefile
Log Message:
Hook up xcompmgr to the build
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xcompmgr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.158 src/distrib/sets/lists/xbase/mi:1.159
--- src/distrib/sets/lists/xbase/mi:1.158 Mon Oct 12 11:07:23 2020
+++ src/distrib/sets/lists/xbase/mi Fri Oct 16 08:28:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2020/10/12 11:07:23 nia Exp $
+# $NetBSD: mi,v 1.159 2020/10/16 08:28:17 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -75,6 +75,7 @@
./usr/X11R7/bin/xclipboardxbase-xclipboard-bin xorg
./usr/X11R7/bin/xclock xbase-xclock-bin xorg
./usr/X11R7/bin/xcmsdb xbase-xcmsdb-bin xorg
+./usr/X11R7/bin/xcompmgrxbase-xcompmgr-bin xorg
./usr/X11R7/bin/xconsolexbase-xconsole-bin xorg
./usr/X11R7/bin/xcutsel xbase-xcutsel-bin xorg
./usr/X11R7/bin/xditviewxbase-xditview-bin xorg
@@ -1328,6 +1329,7 @@
./usr/X11R7/man/cat1/xclipboard.0 xbase-xclipboard-catman .cat,xorg
./usr/X11R7/man/cat1/xclock.0xbase-xclock-catman .cat,xorg
./usr/X11R7/man/cat1/xcmsdb.0xbase-xcmsdb-catman .cat,xorg
+./usr/X11R7/man/cat1/xcompmgr.0xbase-xcompmgr-catman .cat,xorg
./usr/X11R7/man/cat1/xconsole.0xbase-xconsole-catman .cat,xorg
./usr/X11R7/man/cat1/xcutsel.0xbase-xcutsel-catman .cat,xorg
./usr/X11R7/man/cat1/xditview.0xbase-xditview-catman .cat,xorg
@@ -1475,6 +1477,7 @@
./usr/X11R7/man/html1/xclipboard.html xbase-xclipboard-htmlman html,xorg
./usr/X11R7/man/html1/xclock.html xbase-xclock-htmlman html,xorg
./usr/X11R7/man/html1/xcmsdb.html xbase-xcmsdb-htmlman html,xorg
+./usr/X11R7/man/html1/xcompmgr.html xbase-xcompmgr-htmlman html,xorg
./usr/X11R7/man/html1/xconsole.html xbase-xconsole-htmlman html,xorg
./usr/X11R7/man/html1/xcutsel.html xbase-xcutsel-htmlman html,xorg
./usr/X11R7/man/html1/xditview.html xbase-xditview-htmlman html,xorg
@@ -1623,6 +1626,7 @@
./usr/X11R7/man/man1/xclipboard.1 xbase-xclipboard-man .man,xorg
./usr/X11R7/man/man1/xclock.1xbase-xclock-man .man,xorg
./usr/X11R7/man/man1/xcmsdb.1xbase-xcmsdb-man .man,xorg
+./usr/X11R7/man/man1/xcompmgr.1xbase-xcompmgr-man .man,xorg
./usr/X11R7/man/man1/xconsole.1xbase-xconsole-man .man,xorg
./usr/X11R7/man/man1/xcutsel.1xbase-xcutsel-man .man,xorg
./usr/X11R7/man/man1/xditview.1xbase-xditview-man .man,xorg
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.15 src/external/mit/xorg/bin/Makefile:1.16
--- src/external/mit/xorg/bin/Makefile:1.15 Mon Mar 11 09:20:13 2019
+++ src/external/mit/xorg/bin/Makefile Fri Oct 16 08:28:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2020/10/16 08:28:17 nia Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
@@ -17,7 +17,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
xsetroot xsm xstdcmap xterm xtrap xvidtune \
- xvinfo xwd xwininfo xwud xdriinfo sessreg
+ xvinfo xwd xwininfo xwud xdriinfo sessreg xcompmgr
SUBDIR+=ssh-askpass
SUBDIR+=xsetwallpaper
Added files:
Index: src/external/mit/xorg/bin/xcompmgr/Makefile
diff -u /dev/null src/external/mit/xorg/bin/xcompmgr/Makefile:1.1
--- /dev/null Fri Oct 16 08:28:17 2020
+++ src/external/mit/xorg/bin/xcompmgr/Makefile Fri Oct 16 08:28:17 2020
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2020/10/16 08:28:17 nia Exp $
+
+.include
+
+PROG= xcompmgr
+
+LDADD+= -lm -lXcomposite -lXdamage -lXfixes -lXrender
+DPADD+= ${LIBM} ${LIBXCOMPOSITE} ${LIBXDAMAGE} ${LIBXFIXES} ${LIBXRENDER}
+LDADD+= -lX11 -lXext
+DPADD+= ${LIBX11} ${LIBXEXT}
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
+
+.include
+.include
CVS commit: src
Module Name:src Committed By: nia Date: Fri Oct 16 08:28:17 UTC 2020 Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/xorg/bin: Makefile Added Files: src/external/mit/xorg/bin/xcompmgr: Makefile Log Message: Hook up xcompmgr to the build To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xcompmgr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Oct 16 08:17:09 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.1! To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.1 cvs rdiff -u -r1.5.6.5 -r1.5.6.6 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.6 -r1.599.2.7 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.124 src/doc/CHANGES-9.1:1.1.2.125 --- src/doc/CHANGES-9.1:1.1.2.124 Thu Oct 15 19:39:02 2020 +++ src/doc/CHANGES-9.1 Fri Oct 16 08:17:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.124 2020/10/15 19:39:02 bouyer Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.125 2020/10/16 08:17:09 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -5291,3 +5291,16 @@ usr.sbin/sysinst/util.c1.43,1.44,1.4 - Miscelaneous machine dependent fixes. [martin, ticket #1113] +sys/dev/pci/if_wm.c1.691 + + Fix SGMII code to not to print error message. This problem was added + when SFP support was added. + [msaitoh, ticket #1114] + + +external/gpl2/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 9.1! + [martin] + Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.5 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.6 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.5 Sun Feb 16 12:16:28 2020 +++ src/external/gpl2/groff/tmac/mdoc.local Fri Oct 16 08:17:09 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.5 2020/02/16 12:16:28 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.6 2020/10/16 08:17:09 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~9.0_STABLE +.ds doc-operating-system NetBSD\~9.1 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.0_STABLE +.ds doc-default-operating-system NetBSD\~9.1 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -64,6 +64,7 @@ .ds doc-operating-system-NetBSD-7.17.1 .ds doc-operating-system-NetBSD-8.08.0 .ds doc-operating-system-NetBSD-9.09.0 +.ds doc-operating-system-NetBSD-9.19.1 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.6 src/sys/sys/param.h:1.599.2.7 --- src/sys/sys/param.h:1.599.2.6 Sun Feb 16 12:16:28 2020 +++ src/sys/sys/param.h Fri Oct 16 08:17:09 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.6 2020/02/16 12:16:28 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.7 2020/10/16 08:17:09 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 9 /* NetBSD 9.0_STABLE */ +#define __NetBSD_Version__ 90100 /* NetBSD 9.1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Oct 16 08:17:09 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.1! To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.1 cvs rdiff -u -r1.5.6.5 -r1.5.6.6 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.6 -r1.599.2.7 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Oct 16 08:06:02 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1617):
sys/dev/pci/if_wm.c: revision 1.691
Fixes a problem that the attach function reported
"wm_gmii_setup_phytype: Unknown PHY model. OUI=00, model=" and
"PHY type is still unknown." Don't call wm_gmii_setup_phytype() three times if
the interface uses SGMII with internal MDIO.
Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)).
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.39 -r1.508.4.40 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.39 src/sys/dev/pci/if_wm.c:1.508.4.40
--- src/sys/dev/pci/if_wm.c:1.508.4.39 Wed Aug 5 17:22:45 2020
+++ src/sys/dev/pci/if_wm.c Fri Oct 16 08:06:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.39 2020/08/05 17:22:45 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.40 2020/10/16 08:06:02 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.39 2020/08/05 17:22:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.40 2020/10/16 08:06:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2847,7 +2847,8 @@ alloc_retry:
reg &= ~CTRL_EXT_I2C_ENA;
CSR_WRITE(sc, WMREG_CTRL_EXT, reg);
if ((sc->sc_flags & WM_F_SGMII) != 0) {
- wm_gmii_setup_phytype(sc, 0, 0);
+ if (!wm_sgmii_uses_mdio(sc))
+wm_gmii_setup_phytype(sc, 0, 0);
wm_reset_mdicnfg_82580(sc);
}
} else if (sc->sc_type < WM_T_82543 ||
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Oct 16 08:06:02 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1617): sys/dev/pci/if_wm.c: revision 1.691 Fixes a problem that the attach function reported "wm_gmii_setup_phytype: Unknown PHY model. OUI=00, model=" and "PHY type is still unknown." Don't call wm_gmii_setup_phytype() three times if the interface uses SGMII with internal MDIO. Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)). To generate a diff of this commit: cvs rdiff -u -r1.508.4.39 -r1.508.4.40 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Oct 16 08:03:36 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1114):
sys/dev/pci/if_wm.c: revision 1.691
Fixes a problem that the attach function reported
"wm_gmii_setup_phytype: Unknown PHY model. OUI=00, model=" and
"PHY type is still unknown." Don't call wm_gmii_setup_phytype() three times if
the interface uses SGMII with internal MDIO.
Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)).
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.7 -r1.645.2.8 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.7 src/sys/dev/pci/if_wm.c:1.645.2.8
--- src/sys/dev/pci/if_wm.c:1.645.2.7 Wed Sep 23 08:46:54 2020
+++ src/sys/dev/pci/if_wm.c Fri Oct 16 08:03:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.7 2020/09/23 08:46:54 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.8 2020/10/16 08:03:36 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.7 2020/09/23 08:46:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.8 2020/10/16 08:03:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2860,7 +2860,8 @@ alloc_retry:
reg &= ~CTRL_EXT_I2C_ENA;
CSR_WRITE(sc, WMREG_CTRL_EXT, reg);
if ((sc->sc_flags & WM_F_SGMII) != 0) {
- wm_gmii_setup_phytype(sc, 0, 0);
+ if (!wm_sgmii_uses_mdio(sc))
+wm_gmii_setup_phytype(sc, 0, 0);
wm_reset_mdicnfg_82580(sc);
}
} else if (sc->sc_type < WM_T_82543 ||
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Oct 16 08:03:36 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1114): sys/dev/pci/if_wm.c: revision 1.691 Fixes a problem that the attach function reported "wm_gmii_setup_phytype: Unknown PHY model. OUI=00, model=" and "PHY type is still unknown." Don't call wm_gmii_setup_phytype() three times if the interface uses SGMII with internal MDIO. Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)). To generate a diff of this commit: cvs rdiff -u -r1.645.2.7 -r1.645.2.8 src/sys/dev/pci/if_wm.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/sparc64
Module Name:src
Committed By: jdc
Date: Fri Oct 16 07:35:16 UTC 2020
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
src/sys/arch/sparc64/sparc64: autoconf.c
Added Files:
src/sys/arch/sparc64/sparc64: ofw_patch.c ofw_patch.h
Log Message:
Move OFW patching routines into their own file.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.223 -r1.224 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/sparc64/ofw_patch.c \
src/sys/arch/sparc64/sparc64/ofw_patch.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/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.160 src/sys/arch/sparc64/conf/files.sparc64:1.161
--- src/sys/arch/sparc64/conf/files.sparc64:1.160 Sun Oct 11 19:39:22 2020
+++ src/sys/arch/sparc64/conf/files.sparc64 Fri Oct 16 07:35:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.160 2020/10/11 19:39:22 jdc Exp $
+# $NetBSD: files.sparc64,v 1.161 2020/10/16 07:35:16 jdc Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -142,7 +142,7 @@ file dev/ebus/cs4231_ebus.c audiocs_eb
include "dev/sdmmc/files.sdmmc"
attach wb at ebus with wb_ebus
-file arch/sparc64/dev/wb_ebus.c wb_ebus
+file arch/sparc64/dev/wb_ebus.c wb_ebus
# PCMCIA bus (references fdc)
include "dev/pcmcia/files.pcmcia"
@@ -255,6 +255,7 @@ file arch/sparc64/sparc64/kobj_machdep.c
# sparc64/sparc64/locore.s is handled specially in the makefile,
# because it must come first in the "ld" command line.
file arch/sparc64/sparc64/machdep.c
+file arch/sparc64/sparc64/ofw_patch.c
file arch/sparc64/sparc64/process_machdep.c
file arch/sparc64/sparc64/procfs_machdep.c procfs
file arch/sparc64/sparc64/static_edid.c
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.223 src/sys/arch/sparc64/sparc64/autoconf.c:1.224
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.223 Sun Oct 11 19:39:22 2020
+++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Oct 16 07:35:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.223 2020/10/11 19:39:22 jdc Exp $ */
+/* $NetBSD: autoconf.c,v 1.224 2020/10/16 07:35:16 jdc Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.223 2020/10/11 19:39:22 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.224 2020/10/16 07:35:16 jdc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#include
#include
-#include
+#include
#include
#include
@@ -180,16 +180,6 @@ struct intrmap intrmap[] = {
{ NULL, 0 }
};
-#ifdef DEBUG
-#define ACDB_BOOTDEV 0x1
-#define ACDB_PROBE 0x2
-#define ACDB_BOOTARGS 0x4
-int autoconf_debug = 0x0;
-#define DPRINTF(l, s) do { if (autoconf_debug & l) printf s; } while (0)
-#else
-#define DPRINTF(l, s)
-#endif
-
int console_node, console_instance;
struct genfb_colormap_callback gfb_cb;
static void of_set_palette(void *, int, int, int, int);
@@ -1047,180 +1037,6 @@ device_setofnode(device_t dev, int node)
device_xname(dev), node));
}
-static void
-add_gpio_LED(prop_array_t pins, const char *name, int num, int act, int def)
-{
- prop_dictionary_t pin = prop_dictionary_create();
- prop_dictionary_set_string(pin, "name", name);
- prop_dictionary_set_uint32(pin, "type", 0); /* 0 for LED, for now */
- prop_dictionary_set_uint32(pin, "pin", num);
- prop_dictionary_set_bool(pin, "active_high", act);
- if (def != -1)
- prop_dictionary_set_int32(pin, "default_state", def);
- prop_array_add(pins, pin);
- prop_object_release(pin);
-}
-
-static void
-add_gpio_props_v210(device_t dev, void *aux)
-{
- struct i2c_attach_args *ia = aux;
- prop_dictionary_t dict = device_properties(dev);
- prop_array_t pins;
-
- switch (ia->ia_addr) {
- case 0x38: /* front panel LEDs */
- pins = prop_array_create();
- add_gpio_LED(pins, "indicator", 7, 0, -1);
- add_gpio_LED(pins, "fault", 5, 0, 0);
- add_gpio_LED(pins, "power", 4, 0, 1);
- prop_dictionary_set(dict, "pins", pins);
- prop_object_release(pins);
- break;
- case 0x23: /* drive bay LEDs */
- pins = prop_array_create();
- add_gpio_LED(pins, "bay0_fault", 10, 0, 0);
- add_gpio_LED(pins, "bay1_fault", 11, 0, 0);
- add_gpio_LED(pins, "bay0_remove", 12, 0, 0);
- add_gpio_LED(pins, "bay1_remove", 13, 0, 0);
- prop_dictionary_set(dict, "pins", pins);
- prop_object_release(pins);
- break;
- }
-}
-
-static void
-add_drivebay_props_v210(device_t dev, int ofnode, void *aux)
-{
- struct scsipibus_attach_args *sa = aux;
- int target = sa->sa_periph->periph_target;
- char path[256]= "";
-
- OF_package_to_path(ofnode, path, sizeof(path));
-
- /* see if we're on the onboard controller's 1st channel */
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: jdc Date: Fri Oct 16 07:35:16 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 src/sys/arch/sparc64/sparc64: autoconf.c Added Files: src/sys/arch/sparc64/sparc64: ofw_patch.c ofw_patch.h Log Message: Move OFW patching routines into their own file. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/arch/sparc64/conf/files.sparc64 cvs rdiff -u -r1.223 -r1.224 src/sys/arch/sparc64/sparc64/autoconf.c cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/sparc64/ofw_patch.c \ src/sys/arch/sparc64/sparc64/ofw_patch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Fri, 2020-10-16 at 04:59 +, Martin Husemann wrote: > On Thu, Oct 15, 2020 at 05:44:45PM +, Micha? G?rny wrote: > > Module Name:src > > Committed By: mgorny > > Date: Thu Oct 15 17:44:45 UTC 2020 > > > > Modified Files: > > src/distrib/sets/lists/tests: mi > > src/etc/mtree: NetBSD.dist.tests > > src/tests/sys: Makefile > > Added Files: > > src/tests/sys/x86: Makefile t_convert_xmm_s87.c > > > > Log Message: > > Add tests for process_xmm_to_s87() and process_s87_to_xmm() > > This breaks all non-x86 builds, you need to consistently use the same > conditions for the makefiles, set lists and mtree files. > > Probably easiest way out: create the directories always (but leave empty > on non-x86). Alternative: do not use arch specific sub dirs. > Thanks for the suggestion. I've moved the dirs to mi, and hopefully that'll resolve it for now. -- Best regards, Michał Górny
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: mgorny Date: Fri Oct 16 07:12:26 UTC 2020 Modified Files: src/distrib/sets/lists/tests: md.amd64 md.i386 mi Log Message: Try to fix tests/sys/x86 again Thank to Martin Husemann for the suggestion. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/tests/md.amd64 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/tests/md.i386 cvs rdiff -u -r1.941 -r1.942 src/distrib/sets/lists/tests/mi 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/tests/md.amd64 diff -u src/distrib/sets/lists/tests/md.amd64:1.14 src/distrib/sets/lists/tests/md.amd64:1.15 --- src/distrib/sets/lists/tests/md.amd64:1.14 Thu Oct 15 22:15:08 2020 +++ src/distrib/sets/lists/tests/md.amd64 Fri Oct 16 07:12:26 2020 @@ -1,5 +1,4 @@ -# $NetBSD: md.amd64,v 1.14 2020/10/15 22:15:08 mgorny Exp $ -./usr/libdata/debug/usr/tests/sys/x86 tests-sys-debug compattestfile,atf +# $NetBSD: md.amd64,v 1.15 2020/10/16 07:12:26 mgorny Exp $ ./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete @@ -16,7 +15,6 @@ ./usr/tests/modules/t_x86_pte tests-sys-tests atf,kmod,rump ./usr/tests/modules/x86_pte_tester tests-sys-tests atf,kmod,rump ./usr/tests/modules/x86_pte_tester/x86_pte_tester.kmod tests-sys-tests atf,kmod,rump -./usr/tests/sys/x86tests-sys-tests compattestfile,atf ./usr/tests/sys/x86/Atffile tests-sys-tests compattestfile,atf ./usr/tests/sys/x86/Kyuafile tests-sys-tests compattestfile,atf,kyua ./usr/tests/sys/x86/t_convert_xmm_s87 tests-sys-tests compattestfile,atf Index: src/distrib/sets/lists/tests/md.i386 diff -u src/distrib/sets/lists/tests/md.i386:1.6 src/distrib/sets/lists/tests/md.i386:1.7 --- src/distrib/sets/lists/tests/md.i386:1.6 Thu Oct 15 22:15:08 2020 +++ src/distrib/sets/lists/tests/md.i386 Fri Oct 16 07:12:26 2020 @@ -1,5 +1,4 @@ -# $NetBSD: md.i386,v 1.6 2020/10/15 22:15:08 mgorny Exp $ -./usr/libdata/debug/usr/tests/sys/x86 tests-sys-debug compattestfile,atf +# $NetBSD: md.i386,v 1.7 2020/10/16 07:12:26 mgorny Exp $ ./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete @@ -8,7 +7,6 @@ ./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete -./usr/tests/sys/x86tests-sys-tests compattestfile,atf ./usr/tests/sys/x86/Atffile tests-sys-tests compattestfile,atf ./usr/tests/sys/x86/Kyuafile tests-sys-tests compattestfile,atf,kyua ./usr/tests/sys/x86/t_convert_xmm_s87 tests-sys-tests compattestfile,atf Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.941 src/distrib/sets/lists/tests/mi:1.942 --- src/distrib/sets/lists/tests/mi:1.941 Thu Oct 15 22:15:08 2020 +++ src/distrib/sets/lists/tests/mi Fri Oct 16 07:12:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.941 2020/10/15 22:15:08 mgorny Exp $ +# $NetBSD: mi,v 1.942 2020/10/16 07:12:26 mgorny Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -191,6 +191,7 @@ ./usr/libdata/debug/usr/tests/sys/netatalk tests-sys-debug compattestfile,atf ./usr/libdata/debug/usr/tests/sys/netinet tests-sys-debug compattestfile,atf ./usr/libdata/debug/usr/tests/sys/netinet6 tests-sys-debug compattestfile,atf +./usr/libdata/debug/usr/tests/sys/x86 tests-sys-debug compattestfile,atf ./usr/libdata/debug/usr/tests/syscall tests-obsolete obsolete ./usr/libdata/debug/usr/tests/usr.bin tests-usr.bin-debug compattestfile,atf ./usr/libdata/debug/usr/tests/usr.bin/cpio tests-usr.bin-debug compattestfile,atf @@ -4137,6 +4138,7 @@ ./usr/tests/sys/rc/h_argstests-sys-tests compattestfile,atf ./usr/tests/sys/rc/h_simpletests-sys-tests compattestfile,atf ./usr/tests/sys/rc/t_rc_d_clitests-sys-tests compattestfile,atf +./usr/tests/sys/x86 tests-sys-tests compattestfile,atf ./usr/tests/syscall tests-obsolete obsolete ./usr/tests/syscall/Atffiletests-obsolete obsolete ./usr/tests/syscall/t_accesstests-obsolete obsolete
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: mgorny Date: Fri Oct 16 07:12:26 UTC 2020 Modified Files: src/distrib/sets/lists/tests: md.amd64 md.i386 mi Log Message: Try to fix tests/sys/x86 again Thank to Martin Husemann for the suggestion. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/tests/md.amd64 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/tests/md.i386 cvs rdiff -u -r1.941 -r1.942 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: nia
Date: Fri Oct 16 06:55:36 UTC 2020
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
Log Message:
share/mk: Define some missing X11 libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/share/mk/bsd.README
cvs rdiff -u -r1.1225 -r1.1226 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.331 -r1.332 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.411 src/share/mk/bsd.README:1.412
--- src/share/mk/bsd.README:1.411 Sun Jul 26 09:22:43 2020
+++ src/share/mk/bsd.README Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.411 2020/07/26 09:22:43 rillig Exp $
+# $NetBSD: bsd.README,v 1.412 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1803,8 +1803,11 @@ DPADD Additional dependencies for the p
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
LIBXCB?= ${DESTDIR}/usr/X11R7/lib/libxcb.a
+ LIBXCOMPOSITE?= ${DESTDIR}/usr/X11R7/lib/libXcomposite.a
+ LIBXDAMAGE?= ${DESTDIR}/usr/X11R7/lib/libXdamage.a
LIBXDMCP?= ${DESTDIR}/usr/X11R7/lib/libXdmcp.a
LIBXEXT?= ${DESTDIR}/usr/X11R7/lib/libXext.a
+ LIBXFIXES?= ${DESTDIR}/usr/X11R7/lib/libXfixes.a
LIBXFONT2?= ${DESTDIR}/usr/X11R7/lib/libXfont2.a
LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFT?= ${DESTDIR}/usr/X11R7/lib/libXft.a
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1225 src/share/mk/bsd.own.mk:1.1226
--- src/share/mk/bsd.own.mk:1.1225 Fri Oct 9 23:58:50 2020
+++ src/share/mk/bsd.own.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1225 2020/10/09 23:58:50 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1226 2020/10/16 06:55:36 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1572,7 +1572,7 @@ HAVE_XORG_GLAMOR?= no
.for _dir in \
xtrans fontconfig freetype evieext mkfontscale bdftopcf \
xorg-cf-files imake xbiff xkeyboard-config \
- xbitmaps appres xeyes xev xedit sessreg pixman \
+ xcompmgr xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
glu glw mesa-demos MesaGLUT MesaLib MesaLib.old MesaLib7 \
ico iceauth listres lndir \
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.331 src/share/mk/bsd.prog.mk:1.332
--- src/share/mk/bsd.prog.mk:1.331 Mon Jun 15 01:57:31 2020
+++ src/share/mk/bsd.prog.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.331 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -259,7 +259,7 @@ PAM_STATIC_DPADD=
_X11LIBLIST= dps fntstubs fontcache fontconfig fontenc freetype FS GL GLU \
ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
-Xxf86misc Xxf86vm
+Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
.for _lib in ${_X11LIBLIST}
.ifndef LIB${_lib:tu}
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Fri Oct 16 06:55:36 UTC 2020 Modified Files: src/share/mk: bsd.README bsd.own.mk bsd.prog.mk Log Message: share/mk: Define some missing X11 libraries. To generate a diff of this commit: cvs rdiff -u -r1.411 -r1.412 src/share/mk/bsd.README cvs rdiff -u -r1.1225 -r1.1226 src/share/mk/bsd.own.mk cvs rdiff -u -r1.331 -r1.332 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/pci
On 2020/10/16 14:53, SAITOH Masanobu wrote: Module Name:src Committed By: msaitoh Date: Fri Oct 16 05:53:40 UTC 2020 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Fixes a problem that the attach function reported "wm_gmii_setup_phytype: Unknown PHY model. OUI=00, model=" and "PHY type is still unknown." This was dmesg only problem. The SGMII read/write functions were correctly set even though error message was printed. This problem was added in if_wm.c rev. 1.656 which added SFP support. Don't call wm_gmii_setup_phytype() three times if the interface uses SGMII with internal MDIO. Tested with I354(Rangeley(SGMII(MDIO))) and I350(SERDES(SFP), SGMII(SFP)). To generate a diff of this commit: cvs rdiff -u -r1.690 -r1.691 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. -- --- SAITOH Masanobu (msai...@execsw.org msai...@netbsd.org)
