CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src
Module Name:xsrc Committed By: jdc Date: Sun Nov 5 17:06:15 UTC 2023 Modified Files: xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c Log Message: Add NetBSD keyword. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.6 --- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5 Sun Nov 5 17:01:05 2023 +++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c Sun Nov 5 17:06:14 2023 @@ -29,6 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +/* $NetBSD: pnozz_exa.c,v 1.6 2023/11/05 17:06:14 jdc Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h"
CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src
Module Name:xsrc Committed By: jdc Date: Sun Nov 5 17:06:15 UTC 2023 Modified Files: xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c Log Message: Add NetBSD keyword. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src
Module Name:xsrc Committed By: jdc Date: Sun Nov 5 17:01:05 UTC 2023 Modified Files: xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c Log Message: Revert r1.4. The changes are minimal and they cause redraw problems (as reported by Maxim Devaev on port-sparc). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src
Module Name:xsrc
Committed By: jdc
Date: Sun Nov 5 17:01:05 UTC 2023
Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c
Log Message:
Revert r1.4.
The changes are minimal and they cause redraw problems (as reported by
Maxim Devaev on port-sparc).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.4 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.4 Wed Jun 9 07:25:57 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c Sun Nov 5 17:01:05 2023
@@ -1,6 +1,7 @@
/*
* SBus Weitek P9100 EXA support
- *
+ */
+/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -78,9 +79,11 @@ static CARD32 PnozzDrawROP[] = {
#define waitReady(pPnozz) while((pnozz_read_4(pPnozz, ENGINE_STATUS) & \
(ENGINE_BUSY | BLITTER_BUSY)) !=0 )
-/* From pnozz_accel.c */
+void PnozzInitEngine(PnozzPtr);
void pnozz_write_colour(PnozzPtr pPnozz, int reg, CARD32 colour);
+extern CARD32 MaxClip, junk;
+
static void
PnozzWaitMarker(ScreenPtr pScreen, int Marker)
{
@@ -107,10 +110,8 @@ PnozzPrepareCopy
waitReady(pPnozz);
pnozz_write_4(pPnozz, RASTER_OP, (PnozzCopyROP[alu] & 0xff));
pnozz_write_4(pPnozz, PLANE_MASK, planemask);
-pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap);
+pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap) / pPnozz->width;
-if (exaGetPixmapPitch(pSrcPixmap) != exaGetPixmapPitch(pDstPixmap))
- return FALSE;
return TRUE;
}
@@ -129,25 +130,24 @@ PnozzCopy
ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
CARD32 src, dst, srcw, dstw;
-int soff = pPnozz->srcoff / exaGetPixmapPitch(pDstPixmap);
-int doff = exaGetPixmapOffset(pDstPixmap) / exaGetPixmapPitch(pDstPixmap);
+int doff = exaGetPixmapOffset(pDstPixmap) / pPnozz->width;
src = (((xSrc << pPnozz->depthshift) & 0x1fff) << 16) |
- ((ySrc + soff) & 0x1fff);
+ ((ySrc + pPnozz->srcoff) & 0x1fff);
dst = (((xDst << pPnozz->depthshift) & 0x1fff) << 16) |
((yDst + doff) & 0x1fff);
-srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) |
- ((ySrc + soff + h) & 0x1fff);
+srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) |
+((ySrc + pPnozz->srcoff + h - 1) & 0x1fff);
dstw = xDst + w) << pPnozz->depthshift) - 1) << 16) |
- ((yDst + doff + h) & 0x1fff);
+((yDst + doff + h - 1) & 0x1fff);
waitReady(pPnozz);
+
pnozz_write_4(pPnozz, ABS_XY0, src);
pnozz_write_4(pPnozz, ABS_XY1, srcw);
pnozz_write_4(pPnozz, ABS_XY2, dst);
pnozz_write_4(pPnozz, ABS_XY3, dstw);
-pnozz_read_4(pPnozz, COMMAND_BLIT);
-
+junk = pnozz_read_4(pPnozz, COMMAND_BLIT);
exaMarkSync(pDstPixmap->drawable.pScreen);
}
@@ -172,8 +172,7 @@ PnozzPrepareSolid(
waitReady(pPnozz);
pnozz_write_colour(pPnozz, FOREGROUND_COLOR, fg);
-pnozz_write_colour(pPnozz, BACKGROUND_COLOR, fg);
-pnozz_write_4(pPnozz, RASTER_OP, ROP_PAT);
+pnozz_write_4(pPnozz, RASTER_OP, PnozzDrawROP[alu] & 0xff);
pnozz_write_4(pPnozz, PLANE_MASK, planemask);
pnozz_write_4(pPnozz, COORD_INDEX, 0);
@@ -190,18 +189,15 @@ PnozzSolid(
{
ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
-int doff = exaGetPixmapOffset(pPixmap);
+int w = x2 - x - 1;
+int h = y2 - y - 1;
waitReady(pPnozz);
-pnozz_write_4(pPnozz, ABS_XY0, (((x + doff) & 0x1fff) << 16) |
- (y & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY1, (((x + doff) & 0x1fff) << 16) |
- (y2 & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY2, (((x2 + doff) & 0x1fff) << 16) |
- (y2 & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY3, (((x2 + doff) & 0x1fff) << 16) |
- (y & 0x1fff));
-pnozz_read_4(pPnozz, COMMAND_QUAD);
+pnozz_write_4(pPnozz, RECT_RTW_XY, ((x & 0x1fff) << 16) |
+(y & 0x1fff));
+pnozz_write_4(pPnozz, RECT_RTP_XY, (((w & 0x1fff) << 16) |
+(h & 0x1fff)));
+junk = pnozz_read_4(pPnozz, COMMAND_QUAD);
exaMarkSync(pPixmap->drawable.pScreen);
}
@@ -212,6 +208,8 @@ PnozzEXAInit(ScreenPtr pScreen)
PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
ExaDriverPtr pExa;
+PnozzInitEngine(pPnozz);
+
pExa = exaDriverAlloc();
if (!pExa)
return FALSE;
@@ -225,8 +223,7 @@ PnozzEXAInit(ScreenPtr pScreen)
/* round to multiple of pixmap pitch */
pExa->memorySize = (pPnozz->vidmem / pPnozz->width) * pPnozz->width;
-pExa->offScreenBase = pPnozz->width * pPnozz->height *
-
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: jdc Date: Sat Sep 2 05:51:57 UTC 2023 Modified Files: src/sys/arch/sparc64/dev: fdc.c src/sys/arch/sparc64/include: intr.h psl.h src/sys/arch/sparc64/sparc64: autoconf.c Log Message: sparc64: fix interrupt level mapping for disk and and parallel devices on SBUS-based machines Change the mapping from PIL_SCSI to PIL_BIO, so that they interrupt above the highest soft interrupt (softserial) Remove unused PIL_SCSI, PIL_FDSOFT, PIL_AUSOFT and fix the printf in fdc.c Add "socal" and "SUNW,bpp" to the interrupt map. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/dev/fdc.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/include/intr.h cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc64/include/psl.h cvs rdiff -u -r1.238 -r1.239 src/sys/arch/sparc64/sparc64/autoconf.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: Sat Sep 2 05:51:57 UTC 2023
Modified Files:
src/sys/arch/sparc64/dev: fdc.c
src/sys/arch/sparc64/include: intr.h psl.h
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
sparc64: fix interrupt level mapping for disk and and parallel devices
on SBUS-based machines
Change the mapping from PIL_SCSI to PIL_BIO, so that they interrupt above
the highest soft interrupt (softserial)
Remove unused PIL_SCSI, PIL_FDSOFT, PIL_AUSOFT and fix the printf in fdc.c
Add "socal" and "SUNW,bpp" to the interrupt map.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/include/intr.h
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc64/include/psl.h
cvs rdiff -u -r1.238 -r1.239 src/sys/arch/sparc64/sparc64/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.51 src/sys/arch/sparc64/dev/fdc.c:1.52
--- src/sys/arch/sparc64/dev/fdc.c:1.51 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/fdc.c Sat Sep 2 05:51:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.51 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: fdc.c,v 1.52 2023/09/02 05:51:57 jdc Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.51 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.52 2023/09/02 05:51:57 jdc Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -825,7 +825,7 @@ fdcattach(struct fdc_softc *fdc, int pri
#ifdef SUN4
printf(" softpri %d: chip 8207%c\n", IPL_SOFTFDC, code);
#elif SUN4U
- printf(" softpri %d: chip 8207%c", PIL_FDSOFT, code);
+ printf(" softpri %d: chip 8207%c", IPL_BIO, code);
if (fdc->sc_flags & FDC_NOEJECT)
printf(": manual eject");
printf("\n");
Index: src/sys/arch/sparc64/include/intr.h
diff -u src/sys/arch/sparc64/include/intr.h:1.31 src/sys/arch/sparc64/include/intr.h:1.32
--- src/sys/arch/sparc64/include/intr.h:1.31 Fri Jul 27 05:36:12 2012
+++ src/sys/arch/sparc64/include/intr.h Sat Sep 2 05:51:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.31 2012/07/27 05:36:12 matt Exp $ */
+/* $NetBSD: intr.h,v 1.32 2023/09/02 05:51:57 jdc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,6 @@
#define IPL_HIGH PIL_HIGH /* everything */
#define IPL_HALT 5 /* cpu stop-self */
#define IPL_PAUSE 13 /* pause cpu */
-#define IPL_FDSOFT PIL_FDSOFT /* floppy */
/*
* IPL_SAFEPRI is a safe priority for sleep to set for a spin-wait
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.63 src/sys/arch/sparc64/include/psl.h:1.64
--- src/sys/arch/sparc64/include/psl.h:1.63 Tue Jul 11 11:02:07 2023
+++ src/sys/arch/sparc64/include/psl.h Sat Sep 2 05:51:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.63 2023/07/11 11:02:07 martin Exp $ */
+/* $NetBSD: psl.h,v 1.64 2023/09/02 05:51:57 jdc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -73,9 +73,6 @@
#define PSR_BITS "\20\16EC\15EF\10S\7PS\6ET"
/* Interesting spl()s */
-#define PIL_SCSI 3
-#define PIL_FDSOFT 4
-#define PIL_AUSOFT 4
#define PIL_BIO 5
#define PIL_VIDEO 5
#define PIL_TTY 6
@@ -514,12 +511,6 @@ SPLHOLD(splsoftint, 1)
SPLHOLD(splsoftserial, 4)
-/* audio software interrupts are at software level 4 */
-SPLHOLD(splausoft, PIL_AUSOFT)
-
-/* floppy software interrupts are at software level 4 too */
-SPLHOLD(splfdsoft, PIL_FDSOFT)
-
/*
* Memory allocation (must be as high as highest network, tty, or disk device)
*/
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.238 src/sys/arch/sparc64/sparc64/autoconf.c:1.239
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.238 Sat Jan 22 11:49:17 2022
+++ src/sys/arch/sparc64/sparc64/autoconf.c Sat Sep 2 05:51:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.238 2022/01/22 11:49:17 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.239 2023/09/02 05:51:57 jdc Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.238 2022/01/22 11:49:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.239 2023/09/02 05:51:57 jdc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -165,19 +165,22 @@ int kernel_dtlb_slots;
int kernel_itlb_slots;
/* Global interrupt mappings for all device types. Match against the OBP
- * 'device_type' property.
+ * 'device_type' property. Note, that the resulting PIL must be higher than
+ * the highest soft interrupt level (IPL_SOFTSERIAL).
*/
struct intrmap intrmap[] = {
{ "block", PIL_FD }, /* Floppy disk */
{ "serial", PIL_SER }, /* zs */
- { "scsi", PIL_SCSI },
- { "scsi-2", PIL_SCSI },
+ { "scsi", PIL_BIO },
+ { "scsi-2", PIL_BIO },
{ "network",
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: jdc
Date: Tue Aug 29 20:17:02 UTC 2023
Modified Files:
src/sys/arch/sparc64/sparc64: static_edid.c
Log Message:
Update the horizontal sync offset based on the Naturetech video timing.
While here, correct the spelling of "Naturetech" in the data.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/static_edid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/static_edid.c
diff -u src/sys/arch/sparc64/sparc64/static_edid.c:1.1 src/sys/arch/sparc64/sparc64/static_edid.c:1.2
--- src/sys/arch/sparc64/sparc64/static_edid.c:1.1 Sun Oct 11 19:39:22 2020
+++ src/sys/arch/sparc64/sparc64/static_edid.c Tue Aug 29 20:17:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: static_edid.c,v 1.1 2020/10/11 19:39:22 jdc Exp $ */
+/* $NetBSD: static_edid.c,v 1.2 2023/08/29 20:17:02 jdc Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: static_edid.c,v 1.1 2020/10/11 19:39:22 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: static_edid.c,v 1.2 2023/08/29 20:17:02 jdc Exp $");
#include
/* EDID blocks for some known hardware that doesn't provide its own */
@@ -46,13 +46,13 @@ uint8_t edid_meso999[128] = {
/* 20 */ 0x16, 0x50, 0x54, 0xa5, 0x4a, 0x80, 0x81, 0x40,
/* 28 */ 0x81, 0x80, 0x81, 0x8f, 0x95, 0x00, 0x01, 0x01,
/* 30 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xab, 0x22,
-/* 38 */ 0xa0, 0xa0, 0x50, 0x84, 0x1a, 0x30, 0x38, 0x20,
+/* 38 */ 0xa0, 0xa0, 0x50, 0x84, 0x1a, 0x30, 0x30, 0x20,
/* 40 */ 0x36, 0x00, 0x9a, 0x01, 0x11, 0x00, 0x00, 0x1a,
/* 48 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* 50 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* 58 */ 0x00, 0x01, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x4e,
-/* 60 */ 0x41, 0x74, 0x75, 0x72, 0x65, 0x74, 0x65, 0x63,
+/* 60 */ 0x61, 0x74, 0x75, 0x72, 0x65, 0x74, 0x65, 0x63,
/* 68 */ 0x68, 0x0a, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfe,
/* 70 */ 0x00, 0x4d, 0x65, 0x73, 0x6f, 0x20, 0x39, 0x39,
-/* 78 */ 0x39, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x00, 0xed
+/* 78 */ 0x39, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x00, 0xd5
};
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: jdc Date: Tue Aug 29 20:17:02 UTC 2023 Modified Files: src/sys/arch/sparc64/sparc64: static_edid.c Log Message: Update the horizontal sync offset based on the Naturetech video timing. While here, correct the spelling of "Naturetech" in the data. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/static_edid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: jdc Date: Sat Apr 15 12:09:08 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #127 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: jdc Date: Sat Apr 15 12:09:08 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #127 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.53 src/doc/CHANGES-10.0:1.1.2.54 --- src/doc/CHANGES-10.0:1.1.2.53 Mon Apr 3 18:36:09 2023 +++ src/doc/CHANGES-10.0 Sat Apr 15 12:09:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.53 2023/04/03 18:36:09 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.54 2023/04/15 12:09:07 jdc Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -1523,6 +1523,12 @@ sys/dev/fss.c 1.114 this flag and may trigger an assertion. [hannken, ticket #126] +src/tests/sbin/envstat/t_envstat.sh 1.2 + PR 57284: rewrite test to extract all temperaturs from all local sensors + and test them (instead of only one temperature from a tiny list of hard + coded possible devices). + [martin, ticket #127] + sys/dev/pci/if_vioif.c1.83-1.102,1.105-1.107 sys/arch/mips/include/bus_space_defs.h 1.5 sys/arch/mips/include/types.h 1.78
CVS commit: [netbsd-10] src/tests/sbin/envstat
Module Name:src Committed By: jdc Date: Sat Apr 15 12:08:42 UTC 2023 Modified Files: src/tests/sbin/envstat [netbsd-10]: t_envstat.sh Log Message: Pull up the following revision (requested by martin in ticket #127): tests/sbin/envstat/t_envstat.sh: revision 1.2 PR 57284: rewrite test to extract all temperaturs from all local sensors and test them (instead of only one temperature from a tiny list of hard coded possible devices). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.6.1 src/tests/sbin/envstat/t_envstat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/tests/sbin/envstat
Module Name:src
Committed By: jdc
Date: Sat Apr 15 12:08:42 UTC 2023
Modified Files:
src/tests/sbin/envstat [netbsd-10]: t_envstat.sh
Log Message:
Pull up the following revision (requested by martin in ticket #127):
tests/sbin/envstat/t_envstat.sh: revision 1.2
PR 57284: rewrite test to extract all temperaturs from all local sensors
and test them (instead of only one temperature from a tiny list of hard
coded possible devices).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/tests/sbin/envstat/t_envstat.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/sbin/envstat/t_envstat.sh
diff -u src/tests/sbin/envstat/t_envstat.sh:1.1 src/tests/sbin/envstat/t_envstat.sh:1.1.6.1
--- src/tests/sbin/envstat/t_envstat.sh:1.1 Thu Jun 25 15:01:35 2020
+++ src/tests/sbin/envstat/t_envstat.sh Sat Apr 15 12:08:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_envstat.sh,v 1.1 2020/06/25 15:01:35 jruoho Exp $
+# $NetBSD: t_envstat.sh,v 1.1.6.1 2023/04/15 12:08:42 jdc Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,9 +36,8 @@ zerotemp_head() {
zerotemp_body() {
- devices="amdtemp0 coretemp0 acpitz0" # XXX: What else?
-
- for dev in $devices; do
+ for dev in $( envstat -D | awk '{print $1}' )
+ do
envstat -d $dev >/dev/null 2>&1
@@ -47,18 +46,23 @@ zerotemp_body() {
continue
fi
- if [ $dev = "amdtemp0" ]; then
- atf_expect_fail "PR kern/53410"
- fi
-
- tempf=$(envstat -d $dev | awk '/Current/{getline;print $3}')
- tempi=$(printf "%.0f" $tempf)
-
- echo "$dev = $tempf =~ $tempi"
-
- if [ $tempi -eq 0 ]; then
- atf_fail "Zero-temperature from $dev"
- fi
+ # extract all temperatures from $dev
+ for tempf in $(envstat -d $dev | \
+ awk -F: '/degC$/{print $2}' | \
+ awk '{print $1}' )
+ do
+ tempi=$(printf "%.0f" $tempf)
+
+ echo "$dev = $tempf =~ $tempi"
+
+ if [ $tempi -eq 0 ]; then
+
+if [ $dev = "amdtemp0" ]; then
+ atf_expect_fail "PR kern/53410"
+fi
+atf_fail "Zero-temperature from $dev"
+ fi
+ done
done
}
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:40:40 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #117 To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.42 src/doc/CHANGES-10.0:1.1.2.43 --- src/doc/CHANGES-10.0:1.1.2.42 Sun Mar 12 17:53:01 2023 +++ src/doc/CHANGES-10.0 Mon Mar 13 21:40:40 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.42 2023/03/12 17:53:01 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.43 2023/03/13 21:40:40 jdc Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -1457,3 +1457,9 @@ sys/dev/acpi/igpio_acpi.c 1.2 igpio(4): PR 57225: disable Baytrail and Lynxpoint support. [msaitoh, ticket #116] +build.sh 1.366 + Avoid the dependency on a populated tooldir (or building the tools) + when simply doing mkrepro-timestamp and the current repository setups + does not actually require it. + [martin, ticket #1807] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:40:40 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #117 To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:40:24 UTC 2023 Modified Files: src [netbsd-10]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #117): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.365.2.1 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.365 src/build.sh:1.365.2.1 --- src/build.sh:1.365 Sun Aug 21 07:57:50 2022 +++ src/build.sh Mon Mar 13 21:40:24 2023 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.365 2022/08/21 07:57:50 lukem Exp $ +# $NetBSD: build.sh,v 1.365.2.1 2023/03/13 21:40:24 jdc Exp $ # # Copyright (c) 2001-2022 The NetBSD Foundation, Inc. # All rights reserved. @@ -2010,7 +2010,7 @@ createmakewrapper() eval cat <
CVS commit: [netbsd-10] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:40:24 UTC 2023 Modified Files: src [netbsd-10]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #117): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.365.2.1 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:38:46 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1611 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:38:46 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1611 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.56 src/doc/CHANGES-9.4:1.1.2.57 --- src/doc/CHANGES-9.4:1.1.2.56 Tue Mar 7 20:02:04 2023 +++ src/doc/CHANGES-9.4 Mon Mar 13 21:38:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.56 2023/03/07 20:02:04 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.57 2023/03/13 21:38:46 jdc Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -1271,3 +1271,10 @@ sys/kern/vfs_syscalls.c1.557 open(2): PR 57260: don't map ERESTART to EINTR. [riastradh, ticket #1610] +build.sh 1.366 via patch + + Avoid the dependency on a populated tooldir (or building the tools) + when simply doing mkrepro-timestamp and the current repository setups + does not actually require it. + [martin, ticket #1611] +
CVS commit: [netbsd-9] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:38:13 UTC 2023 Modified Files: src [netbsd-9]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #1611): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.333.2.2 -r1.333.2.3 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.333.2.2 src/build.sh:1.333.2.3 --- src/build.sh:1.333.2.2 Wed Feb 2 14:23:11 2022 +++ src/build.sh Mon Mar 13 21:38:13 2023 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.333.2.2 2022/02/02 14:23:11 martin Exp $ +# $NetBSD: build.sh,v 1.333.2.3 2023/03/13 21:38:13 jdc Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -1953,7 +1953,7 @@ createmakewrapper() eval cat <
CVS commit: [netbsd-9] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:38:13 UTC 2023 Modified Files: src [netbsd-9]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #1611): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.333.2.2 -r1.333.2.3 src/build.sh 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: jdc Date: Mon Mar 13 21:36:56 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1807 To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 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.168 src/doc/CHANGES-8.3:1.1.2.169 --- src/doc/CHANGES-8.3:1.1.2.168 Mon Mar 13 21:06:01 2023 +++ src/doc/CHANGES-8.3 Mon Mar 13 21:36:56 2023 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.168 2023/03/13 21:06:01 jdc Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.169 2023/03/13 21:36:56 jdc Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -3219,3 +3219,10 @@ sys/kern/vfs_syscalls.c1.557 open(2): PR 57260: don't map ERESTART to EINTR. [riastradh, ticket #1806] +build.sh 1.366 via patch + + Avoid the dependency on a populated tooldir (or building the tools) + when simply doing mkrepro-timestamp and the current repository setups + does not actually require it. + [martin, ticket #1807] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:36:56 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1807 To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:36:29 UTC 2023 Modified Files: src [netbsd-8]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #1807): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.316.4.3 -r1.316.4.4 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: jdc Date: Mon Mar 13 21:36:29 UTC 2023 Modified Files: src [netbsd-8]: build.sh Log Message: Pull up the following revision (requested by martin in ticket #1807): build.sh: revision 1.366 via patch Avoid the dependency on a populated tooldir (or building the tools) when simply doing mkrepro-timestamp and the current repository setups does not actually require it. To generate a diff of this commit: cvs rdiff -u -r1.316.4.3 -r1.316.4.4 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.316.4.3 src/build.sh:1.316.4.4 --- src/build.sh:1.316.4.3 Wed Sep 15 05:07:42 2021 +++ src/build.sh Mon Mar 13 21:36:29 2023 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.316.4.3 2021/09/15 05:07:42 msaitoh Exp $ +# $NetBSD: build.sh,v 1.316.4.4 2023/03/13 21:36:29 jdc Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -1914,7 +1914,7 @@ createmakewrapper() eval cat <
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:06:02 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1806 To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 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.167 src/doc/CHANGES-8.3:1.1.2.168 --- src/doc/CHANGES-8.3:1.1.2.167 Fri Feb 24 14:21:22 2023 +++ src/doc/CHANGES-8.3 Mon Mar 13 21:06:01 2023 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.167 2023/02/24 14:21:22 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.168 2023/03/13 21:06:01 jdc Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -3214,3 +3214,8 @@ sys/dev/ata/satavar.h1.10 sata: do not consider "PHY offline" conditions an error. [msaitoh, ticket #1805] +sys/kern/vfs_syscalls.c1.557 + + open(2): PR 57260: don't map ERESTART to EINTR. + [riastradh, ticket #1806] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: jdc Date: Mon Mar 13 21:06:02 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1806 To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: jdc Date: Fri Sep 30 14:32:45 UTC 2022 Modified Files: src/sys/arch/sparc/sparc: autoconf.c Log Message: Make this compile for SUN4-only kernels (move namebuf inside the SUN4C/SUN4M/SUN4D ifdef to match where it's used). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/arch/sparc/sparc/autoconf.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/sparc/sparc/autoconf.c diff -u src/sys/arch/sparc/sparc/autoconf.c:1.270 src/sys/arch/sparc/sparc/autoconf.c:1.271 --- src/sys/arch/sparc/sparc/autoconf.c:1.270 Sat Jan 22 11:49:16 2022 +++ src/sys/arch/sparc/sparc/autoconf.c Fri Sep 30 14:32:45 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.270 2022/01/22 11:49:16 thorpej Exp $ */ +/* $NetBSD: autoconf.c,v 1.271 2022/09/30 14:32:45 jdc Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.270 2022/01/22 11:49:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.271 2022/09/30 14:32:45 jdc Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -1119,8 +1119,8 @@ mainbus_attach(device_t parent, device_t }; struct mainbus_attach_args ma; - char namebuf[32]; #if defined(SUN4C) || defined(SUN4M) || defined(SUN4D) + char namebuf[32]; const char *sp = NULL; int node0, node; const struct boot_special *openboot_special, *ssp;
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: jdc Date: Fri Sep 30 14:32:45 UTC 2022 Modified Files: src/sys/arch/sparc/sparc: autoconf.c Log Message: Make this compile for SUN4-only kernels (move namebuf inside the SUN4C/SUN4M/SUN4D ifdef to match where it's used). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/arch/sparc/sparc/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/amlogic
Module Name:src
Committed By: jdc
Date: Fri Nov 19 07:04:27 UTC 2021
Modified Files:
src/sys/arch/arm/amlogic: meson_dwmac.c
Log Message:
PR port-evbarm/50416
Redo the previous change. The "snps,..." properties are on the ethernet
node and the "reset-..." properties are on the phy node. Handle this by
creating a separate reset routine for each case. Idea from Jared.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/amlogic/meson_dwmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.13 src/sys/arch/arm/amlogic/meson_dwmac.c:1.14
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.13 Wed Nov 17 11:57:27 2021
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Fri Nov 19 07:04:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.13 2021/11/17 11:57:27 jdc Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.14 2021/11/19 07:04:27 jdc Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.13 2021/11/17 11:57:27 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.14 2021/11/19 07:04:27 jdc Exp $");
#include
#include
@@ -66,72 +66,69 @@ static const struct device_compatible_en
};
static int
-meson_dwmac_reset(const int phandle)
+meson_dwmac_reset_eth(const int phandle)
{
struct fdtbus_gpio_pin *pin_reset;
const u_int *reset_delay_us;
- const u_int *reset_assert_us, *reset_deassert_us, *reset_gpios;
bool reset_active_low;
int len, val;
- /*
- * Depending on the DTS, we need to check either the "snps,...",
- * or the "reset-..." properties for the MAC reset information.
- */
-
pin_reset = fdtbus_gpio_acquire(phandle, "snps,reset-gpio",
GPIO_PIN_OUTPUT);
- if (pin_reset != NULL) {
+ if (pin_reset == NULL)
+ return ENXIO;
- reset_delay_us = fdtbus_get_prop(phandle,
- "snps,reset-delays-us", );
- if (reset_delay_us == NULL || len != 12)
- return ENXIO;
+ reset_delay_us = fdtbus_get_prop(phandle, "snps,reset-delays-us", );
+ if (reset_delay_us == NULL || len != 12)
+ return ENXIO;
- reset_active_low = of_hasprop(phandle, "snps,reset-active-low");
+ reset_active_low = of_hasprop(phandle, "snps,reset-active-low");
- val = reset_active_low ? 1 : 0;
+ val = reset_active_low ? 1 : 0;
- fdtbus_gpio_write(pin_reset, val);
- delay(be32toh(reset_delay_us[0]));
- fdtbus_gpio_write(pin_reset, !val);
- delay(be32toh(reset_delay_us[1]));
- fdtbus_gpio_write(pin_reset, val);
- delay(be32toh(reset_delay_us[2]));
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_delay_us[0]));
+ fdtbus_gpio_write(pin_reset, !val);
+ delay(be32toh(reset_delay_us[1]));
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_delay_us[2]));
- return 0;
- }
+ return 0;
+}
+
+static int
+meson_dwmac_reset_phy(const int phandle)
+{
+ struct fdtbus_gpio_pin *pin_reset;
+ const u_int *reset_assert_us, *reset_deassert_us, *reset_gpios;
+ bool reset_active_low;
+ int len, val;
pin_reset = fdtbus_gpio_acquire(phandle, "reset-gpios",
GPIO_PIN_OUTPUT);
- if (pin_reset != NULL) {
- reset_assert_us = fdtbus_get_prop(phandle,
- "reset-assert-us", );
- if (reset_assert_us == NULL || len != 4)
- return ENXIO;
- reset_deassert_us = fdtbus_get_prop(phandle,
- "reset-deassert-us", );
- if (reset_deassert_us == NULL || len != 4)
- return ENXIO;
- reset_gpios = fdtbus_get_prop(phandle,
- "reset-gpios", );
- if (reset_gpios == NULL || len != 12)
- return ENXIO;
-
- reset_active_low = be32toh(reset_gpios[2]);
-
- val = reset_active_low ? 1 : 0;
-
-
- fdtbus_gpio_write(pin_reset, val);
- delay(be32toh(reset_assert_us[0]));
- fdtbus_gpio_write(pin_reset, !val);
- delay(be32toh(reset_deassert_us[0]));
+ if (pin_reset == NULL)
+ return ENXIO;
- return 0;
- }
+ reset_assert_us = fdtbus_get_prop(phandle, "reset-assert-us", );
+ if (reset_assert_us == NULL || len != 4)
+ return ENXIO;
+ reset_deassert_us = fdtbus_get_prop(phandle, "reset-deassert-us", );
+ if (reset_deassert_us == NULL || len != 4)
+ return ENXIO;
+ reset_gpios = fdtbus_get_prop(phandle, "reset-gpios", );
+ if (reset_gpios == NULL || len != 12)
+ return ENXIO;
+
+ reset_active_low = be32toh(reset_gpios[2]);
+
+ val = reset_active_low ? 1 : 0;
+
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_assert_us[0]));
+ fdtbus_gpio_write(pin_reset, !val);
+ delay(be32toh(reset_deassert_us[0]));
- return ENXIO;
+ return 0;
}
static void
@@ -276,8 +273,19 @@ meson_dwmac_attach(device_t parent, devi
}
aprint_normal_dev(self, "interrupting on %s\n", intrstr);
- if (meson_dwmac_reset(phandle_phy) != 0)
- aprint_error_dev(self, "PHY reset failed\n");
+ /*
+ * Depending on the DTS, we need to check either the "snps,...",
+ * properties on the ethernet node, or the "reset-..."
+ *
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jdc Date: Fri Nov 19 07:04:27 UTC 2021 Modified Files: src/sys/arch/arm/amlogic: meson_dwmac.c Log Message: PR port-evbarm/50416 Redo the previous change. The "snps,..." properties are on the ethernet node and the "reset-..." properties are on the phy node. Handle this by creating a separate reset routine for each case. Idea from Jared. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/amlogic/meson_dwmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jdc Date: Wed Nov 17 11:57:27 UTC 2021 Modified Files: src/sys/arch/arm/amlogic: meson_dwmac.c Log Message: PR port-evbarm/50416 Also check the "reset_gpios", "reset-assert-us", and "reset-deassert-us" properties for ethernet MAC reset information. Makes the built-in ethernet work on Odroid C1 and Odroid C2 (with mesongxbb_pinctrl.c >= r1.3). Based on a hint from Jared. C2 tested by Martin. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/amlogic/meson_dwmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/amlogic
Module Name:src
Committed By: jdc
Date: Wed Nov 17 11:57:27 UTC 2021
Modified Files:
src/sys/arch/arm/amlogic: meson_dwmac.c
Log Message:
PR port-evbarm/50416
Also check the "reset_gpios", "reset-assert-us", and "reset-deassert-us"
properties for ethernet MAC reset information. Makes the built-in ethernet
work on Odroid C1 and Odroid C2 (with mesongxbb_pinctrl.c >= r1.3).
Based on a hint from Jared. C2 tested by Martin.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/amlogic/meson_dwmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.12 src/sys/arch/arm/amlogic/meson_dwmac.c:1.13
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.12 Sun Nov 7 19:21:32 2021
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Wed Nov 17 11:57:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.12 2021/11/07 19:21:32 jmcneill Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.13 2021/11/17 11:57:27 jdc Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.12 2021/11/07 19:21:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.13 2021/11/17 11:57:27 jdc Exp $");
#include
#include
@@ -70,29 +70,68 @@ meson_dwmac_reset(const int phandle)
{
struct fdtbus_gpio_pin *pin_reset;
const u_int *reset_delay_us;
+ const u_int *reset_assert_us, *reset_deassert_us, *reset_gpios;
bool reset_active_low;
int len, val;
- pin_reset = fdtbus_gpio_acquire(phandle, "snps,reset-gpio", GPIO_PIN_OUTPUT);
- if (pin_reset == NULL)
+ /*
+ * Depending on the DTS, we need to check either the "snps,...",
+ * or the "reset-..." properties for the MAC reset information.
+ */
+
+ pin_reset = fdtbus_gpio_acquire(phandle, "snps,reset-gpio",
+ GPIO_PIN_OUTPUT);
+ if (pin_reset != NULL) {
+
+ reset_delay_us = fdtbus_get_prop(phandle,
+ "snps,reset-delays-us", );
+ if (reset_delay_us == NULL || len != 12)
+ return ENXIO;
+
+ reset_active_low = of_hasprop(phandle, "snps,reset-active-low");
+
+ val = reset_active_low ? 1 : 0;
+
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_delay_us[0]));
+ fdtbus_gpio_write(pin_reset, !val);
+ delay(be32toh(reset_delay_us[1]));
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_delay_us[2]));
+
return 0;
+ }
+
+ pin_reset = fdtbus_gpio_acquire(phandle, "reset-gpios",
+ GPIO_PIN_OUTPUT);
+ if (pin_reset != NULL) {
+ reset_assert_us = fdtbus_get_prop(phandle,
+ "reset-assert-us", );
+ if (reset_assert_us == NULL || len != 4)
+ return ENXIO;
+ reset_deassert_us = fdtbus_get_prop(phandle,
+ "reset-deassert-us", );
+ if (reset_deassert_us == NULL || len != 4)
+ return ENXIO;
+ reset_gpios = fdtbus_get_prop(phandle,
+ "reset-gpios", );
+ if (reset_gpios == NULL || len != 12)
+ return ENXIO;
+
+ reset_active_low = be32toh(reset_gpios[2]);
+
+ val = reset_active_low ? 1 : 0;
+
+
+ fdtbus_gpio_write(pin_reset, val);
+ delay(be32toh(reset_assert_us[0]));
+ fdtbus_gpio_write(pin_reset, !val);
+ delay(be32toh(reset_deassert_us[0]));
- reset_delay_us = fdtbus_get_prop(phandle, "snps,reset-delays-us", );
- if (reset_delay_us == NULL || len != 12)
- return ENXIO;
-
- reset_active_low = of_hasprop(phandle, "snps,reset-active-low");
-
- val = reset_active_low ? 1 : 0;
-
- fdtbus_gpio_write(pin_reset, val);
- delay(be32toh(reset_delay_us[0]));
- fdtbus_gpio_write(pin_reset, !val);
- delay(be32toh(reset_delay_us[1]));
- fdtbus_gpio_write(pin_reset, val);
- delay(be32toh(reset_delay_us[2]));
+ return 0;
+ }
- return 0;
+ return ENXIO;
}
static void
Re: CVS commit: src/sys/arch/sparc64/dev
Hi Tobias, > If you're interested there is an older version[1] of envctrl in the > Attic that might be relevant to use for reference. It supported fan > speed controls on E450. IIRC I got some of the magic constants from > OpenSolaris. Sadly I don't own an E450 any more. > > [1] > cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/arch/sparc64/dev/Attic/envctrl.c?rev=1.11=text/plain_with_tag=MAIN Thank you - that's useful information! Related to the magic offsets, I noticed that the value read from the sensor was always lower than the value written. However, it doesn't appear to be a constant difference (I see about 15 for most values, but only 5 for the minimum). I think that it's OK to keep the higher value - it'll mean that we run the fans slightly faster. The CPU temperature on my E250 doesn't reach the minimum threshold where the fan speed actually increases, so I don't think that this will have any impact. The GPIO values there helps to see what values I should be checking for too. It would be good to merge this with the current code, but I only have an E250 to test on, so I'll need to find a volunteer. Regards, Julian
Re: CVS commit: src/sys/arch/alpha/conf
Hi, > Oh, but to be clear, the iic instances themselves would not be in conflict, > because they are direct-configured by THEIR parents, and alipm and tsc wont > both exist on a given machine. Just for info, as it's fixed now. The DS20L has both: alipm0 at pci0 dev 17 function 0: 74KHz clock iic0 at alipm0: I2C bus tsciic0 at tsc0 iic1 at tsciic0: I2C bus (and I assume the CS20 is the same). Regards, Julian
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jdc Date: Sun Mar 7 11:28:46 UTC 2010 Modified Files: src/sys/dev/usb: uthum.c Log Message: s/delay/need_delay/ to get rid of shadowed variable warning (some ports define delay in machine/param.h). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uthum.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jdc
Date: Sun Mar 7 11:28:46 UTC 2010
Modified Files:
src/sys/dev/usb: uthum.c
Log Message:
s/delay/need_delay/ to get rid of shadowed variable warning (some
ports define delay in machine/param.h).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uthum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.3 src/sys/dev/usb/uthum.c:1.4
--- src/sys/dev/usb/uthum.c:1.3 Sat Mar 6 04:39:16 2010
+++ src/sys/dev/usb/uthum.c Sun Mar 7 11:28:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.3 2010/03/06 04:39:16 cnst Exp $ */
+/* $NetBSD: uthum.c,v 1.4 2010/03/07 11:28:46 jdc Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -248,7 +248,7 @@
int
uthum_read_data(struct uthum_softc *sc, uint8_t target_cmd, uint8_t *buf,
- size_t len, int delay)
+ size_t len, int need_delay)
{
int i;
uint8_t cmdbuf[32], report[256];
@@ -282,8 +282,8 @@
return EIO;
/* wait if required */
- if (delay 1)
- tsleep(sc-sc_sme, 0, uthum, (delay*hz+999)/1000 + 1);
+ if (need_delay 1)
+ tsleep(sc-sc_sme, 0, uthum, (need_delay*hz+999)/1000 + 1);
/* get answer */
if (uhidev_get_report(sc-sc_hdev, UHID_FEATURE_REPORT,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Fri Jan 22 14:34:34 UTC 2010 Modified Files: src/sys/dev/pci: if_cas.c Log Message: Remove port-specific code for determining MAC address, and use device properties instead (c.f. gem(4) and hme(4)). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_cas.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/dev
Module Name:src Committed By: jdc Date: Mon Jan 18 09:58:20 UTC 2010 Modified Files: src/sys/arch/sparc64/dev: sab.c Log Message: Re-do the previous check for the RSC console: Do the check in sabtty_console_flags() and set a flag if we are an RSC port. If we are an RSC port, note that the baud rate is 115200, but don't write a new value to the baud rate generator register, as this stops the console working. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc64/dev/sab.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: jdc Date: Mon Jan 18 10:35:18 UTC 2010 Modified Files: src/etc/etc.sparc64: MAKEDEV.conf Log Message: Add RSC ports (ttyh2, ttyh3) to all_md. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/etc/etc.sparc64/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Mon Jan 18 18:09:23 UTC 2010 Modified Files: src/sys/dev/pci: if_casvar.h Log Message: Add definitions for CAS_INTR_REG and CAS_INTR_PCI. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_casvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Sun Jan 17 11:57:29 UTC 2010 Modified Files: src/sys/dev/pci: if_cas.c Log Message: Mask out (disable) cas interrupts on detach and suspend. (Re-)enable interrupts on resume. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/if_cas.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: jdc Date: Thu Jan 14 07:47:53 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Add cas(4). To generate a diff of this commit: cvs rdiff -u -r1.1341 -r1.1342 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jdc Date: Mon Jan 11 09:30:42 UTC 2010 Modified Files: src/sys/dev/ic: gem.c Log Message: Mask out (disable) gem interrupts on detach. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/gem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jdc Date: Thu Jan 7 09:23:55 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Log Message: Add cas(4) manual page. To generate a diff of this commit: cvs rdiff -u -r1.1180 -r1.1181 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.500 -r1.501 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: jdc Date: Thu Jan 7 09:24:46 UTC 2010 Modified Files: src/sys/dev: DEVNAMES Log Message: Add cas (Sun Cassini/Cassini+ (GigaSwift) Ethernet). To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Thu Jan 7 09:25:19 UTC 2010 Modified Files: src/sys/dev/pci: files.pci Log Message: Add cas (Sun Cassini/Cassini+ (GigaSwift) Ethernet). To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/dev/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Thu Jan 7 09:27:16 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Sun Cassini/NS Saturn devices. To generate a diff of this commit: cvs rdiff -u -r1.1007 -r1.1008 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdc Date: Thu Jan 7 09:28:39 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regenerate for: Add Sun Cassini/NS Saturn devices. To generate a diff of this commit: cvs rdiff -u -r1.1005 -r1.1006 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1004 -r1.1005 src/sys/dev/pci/pcidevs_data.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: jdc Date: Thu Jan 7 09:30:29 UTC 2010 Modified Files: src/share/man/man4: gphyter.4 src/sys/dev/mii: gphyter.c Log Message: Add DP83865 to the supported PHY list (from OpenBSD). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/gphyter.4 cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/gphyter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jdc Date: Thu Jan 7 09:31:44 UTC 2010 Modified Files: src/sys/dev/mii: miidevs.h Log Message: Regenerate for: Add NS DP83865 To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/dev/mii/miidevs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: jdc Date: Thu Jan 7 09:33:44 UTC 2010 Modified Files: src/sys/arch/sparc64/dev: pci_machdep.c Log Message: Cope with up to four interrupts properties for a node. Just use the first one for now. This should be improved. OK: m...@. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc64/dev/pci_machdep.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/conf
Module Name:src Committed By: jdc Date: Thu Jan 7 09:34:49 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add cas, gentbi and gphyter for Sun Cassini/Cassini+ Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/arch/sparc64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4] src/sys/netbt
Module Name:src Committed By: jdc Date: Sun Jan 3 17:12:45 UTC 2010 Modified Files: src/sys/netbt [netbsd-4]: rfcomm_session.c Log Message: Pull up revision 1.16 (requested by plunky in ticket #1372). when receiving a MCC PN response, the max frame size that the remote party requests must be less than the one we asked for which will not be greater than the max acceptable value so no need to test for that but make sure that it is not smaller than minimum acceptable value. To generate a diff of this commit: cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/netbt/rfcomm_session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4-0] src/sys/netbt
Module Name:src Committed By: jdc Date: Sun Jan 3 17:12:50 UTC 2010 Modified Files: src/sys/netbt [netbsd-4-0]: rfcomm_session.c Log Message: Pull up revision 1.16 (requested by plunky in ticket #1372). when receiving a MCC PN response, the max frame size that the remote party requests must be less than the one we asked for which will not be greater than the max acceptable value so no need to test for that but make sure that it is not smaller than minimum acceptable value. To generate a diff of this commit: cvs rdiff -u -r1.4.2.1 -r1.4.2.1.4.1 src/sys/netbt/rfcomm_session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: jdc Date: Sun Jan 3 17:13:24 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket #1372. To generate a diff of this commit: cvs rdiff -u -r1.1.2.188 -r1.1.2.189 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/sys/netbt
Module Name:src Committed By: jdc Date: Sun Jan 3 17:52:17 UTC 2010 Modified Files: src/sys/netbt [netbsd-5-0]: rfcomm_session.c Log Message: Pull up revision 1.16 (requested by plunky in ticket #1221). when receiving a MCC PN response, the max frame size that the remote party requests must be less than the one we asked for which will not be greater than the max acceptable value so no need to test for that but make sure that it is not smaller than minimum acceptable value. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/netbt/rfcomm_session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Sun Jan 3 17:53:30 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket #1221. To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: jdc Date: Sun Jan 3 17:53:37 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket #1221. To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/sets/lists/base
Hi, Uh. Why is it in there anyway? Because NetBSD/amd64 and NetBSD/sparc64 provide 32 bit libraries for COMPAT_NETBSD32. Does it make sense to add an extra reminder line to all the libraries that are in the md.amd64 and md.sparc64 set lists? Something like: --- shlib_version.dist 2009-10-12 10:42:03.0 +0100 +++ shlib_version 2009-10-12 10:48:45.0 +0100 @@ -1,4 +1,5 @@ # $NetBSD: shlib_version,v 1.10 2009/10/10 18:06:54 bad Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing +# Remember to update distrib/sets/lists/base/md.* when changing major=1 minor=1 Thanks, J -- My other computer also runs NetBSD/Sailing at Newbiggin http://www.netbsd.org// http://www.newbigginsailingclub.org/
Re: CVS commit: src/share/man/man9
Hi, A crusade against British English? Yes, for example, colour versus color in the curses manual pages. As a US-based project, we standardiszed on US English, even though both the authors naturally use the British English spelling ;-) Thanks, J -- My other computer also runs NetBSD/Sailing at Newbiggin http://www.netbsd.org// http://www.newbigginsailingclub.org/
