CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Fri Oct 13 22:20:46 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: fd.c

Log Message:
s/fdstartegy/fdstrategy/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amiga/dev/fd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.102 src/sys/arch/amiga/dev/fd.c:1.103
--- src/sys/arch/amiga/dev/fd.c:1.102	Sat Aug 26 21:20:48 2023
+++ src/sys/arch/amiga/dev/fd.c	Fri Oct 13 22:20:46 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.102 2023/08/26 21:20:48 andvar Exp $ */
+/*	$NetBSD: fd.c,v 1.103 2023/10/13 22:20:46 andvar Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.102 2023/08/26 21:20:48 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.103 2023/10/13 22:20:46 andvar Exp $");
 
 #include 
 #include 
@@ -1182,7 +1182,7 @@ fdstart(struct fd_softc *sc)
 #endif
 
 	/*
-	 * if DMA'ing just return. we must have been called from fdstartegy.
+	 * if DMA'ing just return. we must have been called from fdstrategy.
 	 */
 	if (fdc_indma)
 		return;

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Fri Oct 13 22:20:46 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: fd.c

Log Message:
s/fdstartegy/fdstrategy/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amiga/dev/fd.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Aug 28 09:22:26 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grf_ul.c ite_ul.c

Log Message:
rename DEBUG_UL to UL_DEBUG for naming consistency.
remove stray UL_DEBUG definition in grf_ul.c


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/ite_ul.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.54 src/sys/arch/amiga/dev/grf_ul.c:1.55
--- src/sys/arch/amiga/dev/grf_ul.c:1.54	Mon Mar 28 12:38:57 2022
+++ src/sys/arch/amiga/dev/grf_ul.c	Mon Aug 28 09:22:26 2023
@@ -1,5 +1,4 @@
-/*	$NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $ */
-#define UL_DEBUG
+/*	$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -33,7 +32,7 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $");
 
 #include "grful.h"
 #include "ite.h"

Index: src/sys/arch/amiga/dev/ite_ul.c
diff -u src/sys/arch/amiga/dev/ite_ul.c:1.16 src/sys/arch/amiga/dev/ite_ul.c:1.17
--- src/sys/arch/amiga/dev/ite_ul.c:1.16	Mon Aug 28 09:14:02 2023
+++ src/sys/arch/amiga/dev/ite_ul.c	Mon Aug 28 09:22:26 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $ */
+/*	$NetBSD: ite_ul.c,v 1.17 2023/08/28 09:22:26 andvar Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.17 2023/08/28 09:22:26 andvar Exp $");
 
 #include "grful.h"
 #if NGRFUL > 0
@@ -79,7 +79,7 @@ extern u_int8_t kernel_font_lo, kernel_f
 extern u_int8_t kernel_font[], kernel_cursor[];
 
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 #define gsp_out(ba,cmd,len) gsp_dump(cmd,len); gsp_write(ba,cmd,len)
 #else
 #define gsp_out(ba,cmd,len) gsp_write(ba,cmd,len)
@@ -94,7 +94,7 @@ void ulowell_clear(struct ite_softc *, i
 void ulowell_putc(struct ite_softc *, int, int, int, int);
 void ulowell_init(struct ite_softc *);
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 void gsp_dump(u_int16_t *, int);
 #endif
 
@@ -305,7 +305,7 @@ static void screen_up(struct ite_softc *
 
 	ba = (volatile struct gspregs *)ip->grf->g_regkva;
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 	printf("screen_up %d %d %d ->",top,bottom,lines);
 #endif
 	/* do some bounds-checking here.. */
@@ -339,7 +339,7 @@ static void screen_down(struct ite_softc
 
 	ba = (volatile struct gspregs *)ip->grf->g_regkva;
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 	printf("screen_down %d %d %d ->",top,bottom,lines);
 #endif
 
@@ -396,7 +396,7 @@ void ulowell_clear(struct ite_softc *ip,
 
 	u_int16_t cmd[7];
 
-#ifdef	DEBUG_UL
+#ifdef	UL_DEBUG
 	printf("ulowell_clear %d %d %d %d ->",sy,sx,h,w);
 #endif
 	ba = (volatile struct gspregs *)ip->grf->g_regkva;
@@ -419,7 +419,7 @@ void ulowell_scroll(struct ite_softc *ip
 
 	ba = (volatile struct gspregs *)ip->grf->g_regkva;
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 	printf("ulowell_scroll %d %d %d %d ->",sy,sx,count,dir);
 #endif
 
@@ -452,7 +452,7 @@ void ulowell_scroll(struct ite_softc *ip
 	}
 }
 
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
 void
 gsp_dump(u_int16_t *cmd,int len)
 {

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Aug 28 09:22:26 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grf_ul.c ite_ul.c

Log Message:
rename DEBUG_UL to UL_DEBUG for naming consistency.
remove stray UL_DEBUG definition in grf_ul.c


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/ite_ul.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Aug 28 09:14:02 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: ite_ul.c

Log Message:
fix format specifier from %lx to %hx, cmd has a type of u_int16_t.

fixes DEBUG_UL build for amiga (will be renamed to UL_DEBUG in next commit).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/ite_ul.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/ite_ul.c
diff -u src/sys/arch/amiga/dev/ite_ul.c:1.15 src/sys/arch/amiga/dev/ite_ul.c:1.16
--- src/sys/arch/amiga/dev/ite_ul.c:1.15	Mon Sep  3 16:29:22 2018
+++ src/sys/arch/amiga/dev/ite_ul.c	Mon Aug 28 09:14:02 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_ul.c,v 1.15 2018/09/03 16:29:22 riastradh Exp $ */
+/*	$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.15 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $");
 
 #include "grful.h"
 #if NGRFUL > 0
@@ -458,7 +458,7 @@ gsp_dump(u_int16_t *cmd,int len)
 {
 	printf("gsp");
 	while (len-- > 0)
-		printf(" %lx",*cmd++);
+		printf(" %hx",*cmd++);
 	printf("\n");
 }
 #endif

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Aug 28 09:14:02 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: ite_ul.c

Log Message:
fix format specifier from %lx to %hx, cmd has a type of u_int16_t.

fixes DEBUG_UL build for amiga (will be renamed to UL_DEBUG in next commit).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/ite_ul.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 22:09:55 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
amiga/es(4): start_ptr/end_ptr are initialized with USEPKTBUF option only,
thus add this option check, when they are defined/used under ESDEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amiga/dev/if_es.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.69 src/sys/arch/amiga/dev/if_es.c:1.70
--- src/sys/arch/amiga/dev/if_es.c:1.69	Sat Aug 26 20:23:23 2023
+++ src/sys/arch/amiga/dev/if_es.c	Sun Aug 27 22:09:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.69 2023/08/26 20:23:23 andvar Exp $ */
+/*	$NetBSD: if_es.c,v 1.70 2023/08/27 22:09:55 andvar Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.69 2023/08/26 20:23:23 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.70 2023/08/27 22:09:55 andvar Exp $");
 
 
 #include 
@@ -773,7 +773,7 @@ esstart(struct ifnet *ifp)
 	}
 #endif
 	while (!sc->sc_txbusy) {
-#ifdef ESDEBUG
+#if defined(ESDEBUG) && defined(USEPKTBUF)
 		u_short start_ptr, end_ptr;
 #endif
 		/*
@@ -907,8 +907,10 @@ esstart(struct ifnet *ifp)
 #endif
 			smc->b2.bsr = BSR_BANK2;
 #ifdef ESDEBUG
+#ifdef USEPKTBUF
 			printf("start_ptr %04x end_ptr %04x cur ptr %04x\n",
 			start_ptr, end_ptr, SWAP(smc->b2.ptr));
+#endif
 			--sc->sc_smcbusy;
 #endif
 			esinit(sc);	/* It's really hosed - reset */

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 22:09:55 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
amiga/es(4): start_ptr/end_ptr are initialized with USEPKTBUF option only,
thus add this option check, when they are defined/used under ESDEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amiga/dev/if_es.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 19:48:19 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grf_cl.c

Log Message:
amiga/grfcl(4): return prx, pry definition/assigment lost with rev 1.49,
however under CL_SHIFTSPRITE code block only, where it is used.

Fixes build with the CL_SHIFTSPRITE enabled option.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/grf_cl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.56 src/sys/arch/amiga/dev/grf_cl.c:1.57
--- src/sys/arch/amiga/dev/grf_cl.c:1.56	Tue Feb 14 20:27:17 2023
+++ src/sys/arch/amiga/dev/grf_cl.c	Sun Aug 27 19:48:19 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cl.c,v 1.56 2023/02/14 20:27:17 andvar Exp $ */
+/*	$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.56 2023/02/14 20:27:17 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $");
 
 #include "grfcl.h"
 #include "ite.h"
@@ -908,6 +908,7 @@ cl_setmousepos(struct grf_softc *gp, str
 	volatile char *ba = gp->g_regkva;
 short rx, ry;
 #ifdef CL_SHIFTSPRITE
+	short prx, pry;
 	volatile char *fb = gp->g_fbkva;
 volatile char *sprite = fb + (cl_fbsize - 1024);
 #endif
@@ -926,6 +927,8 @@ cl_setmousepos(struct grf_softc *gp, str
  * and kind of buggy anyhow).
  */
 #ifdef CL_SHIFTSPRITE
+	prx = cl_cursprite.pos.x - cl_cursprite.hot.x;
+	pry = cl_cursprite.pos.y - cl_cursprite.hot.y;
 if (rx < 0 || ry < 0 || prx < 0 || pry < 0) {
 writeshifted(sprite, rx < 0 ? -rx : 0, ry < 0 ? -ry : 0);
 }

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 19:48:19 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grf_cl.c

Log Message:
amiga/grfcl(4): return prx, pry definition/assigment lost with rev 1.49,
however under CL_SHIFTSPRITE code block only, where it is used.

Fixes build with the CL_SHIFTSPRITE enabled option.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/grf_cl.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 18:36:55 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: toccata.c

Log Message:
amiga/toccata(4): define ad1848debug to fix AUDIO_DEBUG enabled amiga build.

The code is taken from sys/dev/isa/ad1848_isa.c for consistency.
Unsure, if new debug level variable wouldn't be better or it is needed at all.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/dev/toccata.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.21 src/sys/arch/amiga/dev/toccata.c:1.22
--- src/sys/arch/amiga/dev/toccata.c:1.21	Sat Feb 29 05:51:10 2020
+++ src/sys/arch/amiga/dev/toccata.c	Sun Aug 27 18:36:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.21 2020/02/29 05:51:10 isaki Exp $ */
+/* $NetBSD: toccata.c,v 1.22 2023/08/27 18:36:55 andvar Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.21 2020/02/29 05:51:10 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.22 2023/08/27 18:36:55 andvar Exp $");
 
 #include 
 #include 
@@ -49,6 +49,12 @@ __KERNEL_RCSID(0, "$NetBSD: toccata.c,v 
 #include 
 #include 
 
+#ifdef AUDIO_DEBUG
+#define DPRINTF(x)	if (ad1848debug) printf x
+extern int	ad1848debug;
+#else
+#define DPRINTF(x)
+#endif
 
 /* Register offsets. XXX All of this is guesswork. */
 

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 18:36:55 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: toccata.c

Log Message:
amiga/toccata(4): define ad1848debug to fix AUDIO_DEBUG enabled amiga build.

The code is taken from sys/dev/isa/ad1848_isa.c for consistency.
Unsure, if new debug level variable wouldn't be better or it is needed at all.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/dev/toccata.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 08:15:14 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: afsc.c

Log Message:
remove empty #ifdef DEBUG block.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/afsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/afsc.c
diff -u src/sys/arch/amiga/dev/afsc.c:1.46 src/sys/arch/amiga/dev/afsc.c:1.47
--- src/sys/arch/amiga/dev/afsc.c:1.46	Sat Aug  7 16:18:41 2021
+++ src/sys/arch/amiga/dev/afsc.c	Sun Aug 27 08:15:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: afsc.c,v 1.46 2021/08/07 16:18:41 thorpej Exp $ */
+/*	$NetBSD: afsc.c,v 1.47 2023/08/27 08:15:13 andvar Exp $ */
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.46 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.47 2023/08/27 08:15:13 andvar Exp $");
 
 #include 
 #include 
@@ -88,10 +88,6 @@ int afsc_dmaintr(void *);
 void afsc_dump(void);
 #endif
 
-
-#ifdef DEBUG
-#endif
-
 CFATTACH_DECL_NEW(afsc, sizeof(struct siop_softc),
 afscmatch, afscattach, NULL, NULL);
 

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Aug 27 08:15:14 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: afsc.c

Log Message:
remove empty #ifdef DEBUG block.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/afsc.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Aug 26 21:20:48 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: fd.c

Log Message:
amiga/fdc(4): revert bp->b_bcount format specifiers from %ld to %d,
changed in rev 1.62. b_bcount has a type of int.

fixes FDDEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amiga/dev/fd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.101 src/sys/arch/amiga/dev/fd.c:1.102
--- src/sys/arch/amiga/dev/fd.c:1.101	Mon Jan 17 20:38:49 2022
+++ src/sys/arch/amiga/dev/fd.c	Sat Aug 26 21:20:48 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.101 2022/01/17 20:38:49 andvar Exp $ */
+/*	$NetBSD: fd.c,v 1.102 2023/08/26 21:20:48 andvar Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.101 2022/01/17 20:38:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.102 2023/08/26 21:20:48 andvar Exp $");
 
 #include 
 #include 
@@ -1675,11 +1675,11 @@ fdminphys(struct buf *bp)
 	toff = sec * FDSECSIZE;
 	tsz = sc->nsectors * FDSECSIZE;
 #ifdef FDDEBUG
-	printf("fdminphys: before %ld", bp->b_bcount);
+	printf("fdminphys: before %d", bp->b_bcount);
 #endif
 	bp->b_bcount = uimin(bp->b_bcount, tsz - toff);
 #ifdef FDDEBUG
-	printf(" after %ld\n", bp->b_bcount);
+	printf(" after %d\n", bp->b_bcount);
 #endif
 	minphys(bp);
 }

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Aug 26 21:20:48 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: fd.c

Log Message:
amiga/fdc(4): revert bp->b_bcount format specifiers from %ld to %d,
changed in rev 1.62. b_bcount has a type of int.

fixes FDDEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amiga/dev/fd.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Aug 26 20:23:24 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
amiga/es(4): constify es_dump_smcregs char* argument to fix ESDEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/dev/if_es.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Aug 26 20:23:24 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
amiga/es(4): constify es_dump_smcregs char* argument to fix ESDEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/dev/if_es.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.68 src/sys/arch/amiga/dev/if_es.c:1.69
--- src/sys/arch/amiga/dev/if_es.c:1.68	Sat Sep 17 19:03:31 2022
+++ src/sys/arch/amiga/dev/if_es.c	Sat Aug 26 20:23:23 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.68 2022/09/17 19:03:31 thorpej Exp $ */
+/*	$NetBSD: if_es.c,v 1.69 2023/08/26 20:23:23 andvar Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.68 2022/09/17 19:03:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.69 2023/08/26 20:23:23 andvar Exp $");
 
 
 #include 
@@ -102,7 +102,7 @@ int	estxint2 = 0;	/* IST_TX active after
 int	estxint3 = 0;	/* IST_TX interrupt processed */
 int	estxint4 = 0;	/* ~TEMPTY counts */
 int	estxint5 = 0;	/* IST_TX_EMPTY interrupts */
-void	es_dump_smcregs(char *, union smcregs *);
+void	es_dump_smcregs(const char *, union smcregs *);
 #endif
 
 int esintr(void *);
@@ -199,7 +199,7 @@ esattach(device_t parent, device_t self,
 
 #ifdef ESDEBUG
 void
-es_dump_smcregs(char *where, union smcregs *smc)
+es_dump_smcregs(const char *where, union smcregs *smc)
 {
 	u_short cur_bank = smc->b0.bsr & BSR_MASK;
 

CVS commit: src/sys/arch/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Aug  4 08:39:44 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: acafh.c

Log Message:
amiga/acafh(4): Appease GCC 12.3.0 -Wmisleading-indentation

No binary changes. Alternatively, pmap_update(9) can be placed in
this loop, but it should make nothing other than small overhead.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/acafh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/acafh.c
diff -u src/sys/arch/amiga/dev/acafh.c:1.5 src/sys/arch/amiga/dev/acafh.c:1.6
--- src/sys/arch/amiga/dev/acafh.c:1.5	Sat Aug  7 16:18:41 2021
+++ src/sys/arch/amiga/dev/acafh.c	Fri Aug  4 08:39:44 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: acafh.c,v 1.5 2021/08/07 16:18:41 thorpej Exp $ */
+/*	$NetBSD: acafh.c,v 1.6 2023/08/04 08:39:44 rin Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.5 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.6 2023/08/04 08:39:44 rin Exp $");
 
 /*
  * Individual Computers ACA500 driver. 
@@ -167,7 +167,7 @@ acafh_attach(device_t parent, device_t s
 		pmap_enter(vm_map_pmap(kernel_map),
 			i - ACAFH_BASE + aca_vbase, i,
 			   VM_PROT_READ | VM_PROT_WRITE, true);
-		pmap_update(vm_map_pmap(kernel_map));
+	pmap_update(vm_map_pmap(kernel_map));
 
 	aca_vbase += ACAFH_FIRST_REG_OFF;
 

CVS commit: src/sys/arch/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Aug  4 08:39:44 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: acafh.c

Log Message:
amiga/acafh(4): Appease GCC 12.3.0 -Wmisleading-indentation

No binary changes. Alternatively, pmap_update(9) can be placed in
this loop, but it should make nothing other than small overhead.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/acafh.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/amiga/dev

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Jul 12 05:16:42 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
Make inclusion of sys/intr.h explicit for spl*.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amiga/dev/grfabs_cc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grfabs_cc.c
diff -u src/sys/arch/amiga/dev/grfabs_cc.c:1.38 src/sys/arch/amiga/dev/grfabs_cc.c:1.39
--- src/sys/arch/amiga/dev/grfabs_cc.c:1.38	Mon Jan 23 21:22:44 2023
+++ src/sys/arch/amiga/dev/grfabs_cc.c	Wed Jul 12 05:16:42 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_cc.c,v 1.38 2023/01/23 21:22:44 andvar Exp $ */
+/*	$NetBSD: grfabs_cc.c,v 1.39 2023/07/12 05:16:42 mlelstv Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -38,12 +38,13 @@
 #include "opt_amigaccgrf.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.38 2023/01/23 21:22:44 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.39 2023/07/12 05:16:42 mlelstv Exp $");
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

CVS commit: src/sys/arch/amiga/dev

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Jul 12 05:16:42 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
Make inclusion of sys/intr.h explicit for spl*.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amiga/dev/grfabs_cc.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Feb 19 21:35:07 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_esreg.h

Log Message:
s/collsions/collisions/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/if_esreg.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/amiga/dev/if_esreg.h
diff -u src/sys/arch/amiga/dev/if_esreg.h:1.8 src/sys/arch/amiga/dev/if_esreg.h:1.9
--- src/sys/arch/amiga/dev/if_esreg.h:1.8	Tue May 31 08:43:14 2022
+++ src/sys/arch/amiga/dev/if_esreg.h	Sun Feb 19 21:35:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_esreg.h,v 1.8 2022/05/31 08:43:14 andvar Exp $	*/
+/*	$NetBSD: if_esreg.h,v 1.9 2023/02/19 21:35:07 andvar Exp $	*/
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -87,7 +87,7 @@ union smcregs {
 
 /* EPH Status Register */
 #define	EPHSR_16COL	0x1000		/* 16 collisions reached */
-#define	EPHSR_MULCOL	0x0400		/* Multiple collsions */
+#define	EPHSR_MULCOL	0x0400		/* Multiple collisions */
 #define	EPHSR_TX_SUC	0x0100		/* Last transmit successful */
 #define	EPHSR_LOST_CAR	0x0004		/* Lost carrier */
 

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Feb 19 21:35:07 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: if_esreg.h

Log Message:
s/collsions/collisions/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/if_esreg.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jan 23 21:22:44 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
s/makre/make/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amiga/dev/grfabs_cc.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jan 23 21:22:44 UTC 2023

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
s/makre/make/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amiga/dev/grfabs_cc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grfabs_cc.c
diff -u src/sys/arch/amiga/dev/grfabs_cc.c:1.37 src/sys/arch/amiga/dev/grfabs_cc.c:1.38
--- src/sys/arch/amiga/dev/grfabs_cc.c:1.37	Sat Mar 26 17:15:18 2022
+++ src/sys/arch/amiga/dev/grfabs_cc.c	Mon Jan 23 21:22:44 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_cc.c,v 1.37 2022/03/26 17:15:18 andvar Exp $ */
+/*	$NetBSD: grfabs_cc.c,v 1.38 2023/01/23 21:22:44 andvar Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
 #include "opt_amigaccgrf.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.37 2022/03/26 17:15:18 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.38 2023/01/23 21:22:44 andvar Exp $");
 
 #include 
 #include 
@@ -169,7 +169,7 @@ cc_init_monitor(void)
 	/* turn sprite DMA off. we don't support them yet. */
 	custom.dmacon = DMAF_SPRITE;
 
-	/* makre sure sprite data registers are clear as well */
+	/* make sure sprite data registers are clear as well */
 	custom.spr[0].data = 0;
 	custom.spr[0].datb = 0;
 

CVS commit: src/sys/arch/amiga/dev

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 26 23:55:40 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: msc.c

Log Message:
amiga/msc(4): Convert to ttylock/ttyunlock.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amiga/dev/msc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/msc.c
diff -u src/sys/arch/amiga/dev/msc.c:1.47 src/sys/arch/amiga/dev/msc.c:1.48
--- src/sys/arch/amiga/dev/msc.c:1.47	Fri Jul 25 08:10:31 2014
+++ src/sys/arch/amiga/dev/msc.c	Wed Oct 26 23:55:40 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: msc.c,v 1.47 2014/07/25 08:10:31 dholland Exp $ */
+/*	$NetBSD: msc.c,v 1.48 2022/10/26 23:55:40 riastradh Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msc.c,v 1.47 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msc.c,v 1.48 2022/10/26 23:55:40 riastradh Exp $");
 
 #include "msc.h"
 
@@ -390,7 +390,7 @@ mscopen(dev_t dev, int flag, int mode, s
 	if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
 		return (EBUSY);
 
-	mutex_spin_enter(&tty_lock);
+	ttylock(tp);
 	/* initialize tty */
 	if ((tp->t_state & TS_ISOPEN) == 0 && tp->t_wopen == 0) {
 		ttychars(tp);
@@ -451,7 +451,7 @@ mscopen(dev_t dev, int flag, int mode, s
 		tp->t_wopen--;
 
 		if (error) {
-			mutex_spin_exit(&tty_lock);
+			ttyunlock(tp);
 			return(error);
 		}
 	}
@@ -472,7 +472,7 @@ mscopen(dev_t dev, int flag, int mode, s
 	 * use of the tty with a dialin open waiting.
 	 */
 	tp->t_dev = dev;
-	mutex_spin_exit(&tty_lock);
+	ttyunlock(tp);
 
 	return tp->t_linesw->l_open(dev, tp);
 }

CVS commit: src/sys/arch/amiga/dev

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 26 23:55:40 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: msc.c

Log Message:
amiga/msc(4): Convert to ttylock/ttyunlock.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amiga/dev/msc.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/amiga/dev

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 26 23:54:19 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: mfc.c

Log Message:
amiga/mfc(4): Convert to ttylock/ttyunlock.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amiga/dev/mfc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/mfc.c
diff -u src/sys/arch/amiga/dev/mfc.c:1.60 src/sys/arch/amiga/dev/mfc.c:1.61
--- src/sys/arch/amiga/dev/mfc.c:1.60	Thu Oct 21 13:21:54 2021
+++ src/sys/arch/amiga/dev/mfc.c	Wed Oct 26 23:54:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfc.c,v 1.60 2021/10/21 13:21:54 andvar Exp $ */
+/*	$NetBSD: mfc.c,v 1.61 2022/10/26 23:54:19 riastradh Exp $ */
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -55,7 +55,7 @@
 #include "opt_kgdb.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.60 2021/10/21 13:21:54 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.61 2022/10/26 23:54:19 riastradh Exp $");
 
 #include 
 #include 
@@ -516,7 +516,7 @@ mfcsopen(dev_t dev, int flag, int mode, 
 	if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
 		return (EBUSY);
 
-	mutex_spin_enter(&tty_lock);
+	ttylock(tp);
 	if ((tp->t_state & TS_ISOPEN) == 0 && tp->t_wopen == 0) {
 		ttychars(tp);
 		if (tp->t_ispeed == 0) {
@@ -563,7 +563,7 @@ mfcsopen(dev_t dev, int flag, int mode, 
 		error = ttysleep(tp, &tp->t_rawcv, true, 0);
 		tp->t_wopen--;
 		if (error) {
-			mutex_spin_exit(&tty_lock);
+			ttyunlock(tp);
 			return(error);
 		}
 	}
@@ -578,7 +578,7 @@ done:
 	 * use of the tty with a dialin open waiting.
 	 */
 	tp->t_dev = dev;
-	mutex_spin_exit(&tty_lock);
+	ttyunlock(tp);
 	return tp->t_linesw->l_open(dev, tp);
 }
 

CVS commit: src/sys/arch/amiga/dev

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 26 23:54:19 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: mfc.c

Log Message:
amiga/mfc(4): Convert to ttylock/ttyunlock.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amiga/dev/mfc.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:23:24 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amiga/dev/if_qn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.52 src/sys/arch/amiga/dev/if_qn.c:1.53
--- src/sys/arch/amiga/dev/if_qn.c:1.52	Sat Sep 17 19:20:14 2022
+++ src/sys/arch/amiga/dev/if_qn.c	Sat Sep 17 19:23:24 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_qn.c,v 1.52 2022/09/17 19:20:14 thorpej Exp $ */
+/*	$NetBSD: if_qn.c,v 1.53 2022/09/17 19:23:24 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.52 2022/09/17 19:20:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.53 2022/09/17 19:23:24 thorpej Exp $");
 
 #include "qn.h"
 #if NQN > 0
@@ -276,7 +276,6 @@ qninit(struct qn_softc *sc)
 		CLLADDR(ifp->if_sadl)[i]);
 
 	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
 	sc->transmit_pending = false;
 
 	qn_flush(sc);
@@ -386,7 +385,10 @@ qnstart(struct ifnet *ifp)
 	int timout = 6;
 
 
-	if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+	if ((ifp->if_flags & IFF_RUNNING) == 0)
+		return;
+
+	if (sc->transmit_pending)
 		return;
 
 	IF_DEQUEUE(&ifp->if_snd, m);
@@ -426,7 +428,6 @@ qnstart(struct ifnet *ifp)
 	sc->transmit_pending = true;
 	*sc->nic_t_mask = INT_TMT_OK | INT_SIXTEEN_COL;
 
-	ifp->if_flags |= IFF_OACTIVE;
 	ifp->if_timer = 2;
 }
 
@@ -763,8 +764,6 @@ qnintr(void *arg)
 			/* Must return transmission interrupt mask. */
 			return_tintmask = 1;
 		} else {
-			sc->sc_ethercom.ec_if.if_flags &= ~IFF_OACTIVE;
-
 			/* Clear watchdog timer. */
 			sc->sc_ethercom.ec_if.if_timer = 0;
 		}
@@ -777,7 +776,7 @@ qnintr(void *arg)
 	if (rint != 0)
 		qn_rint(sc, rint);
 
-	if ((sc->sc_ethercom.ec_if.if_flags & IFF_OACTIVE) == 0)
+	if (!sc->transmit_pending)
 		if_schedule_deferred_start(&sc->sc_ethercom.ec_if);
 	else if (return_tintmask == 1)
 		*sc->nic_t_mask = tintmask;

CVS commit: src/sys/arch/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:23:24 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amiga/dev/if_qn.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:20:14 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Make qn_softc::transmit_pending a bool.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amiga/dev/if_qn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.51 src/sys/arch/amiga/dev/if_qn.c:1.52
--- src/sys/arch/amiga/dev/if_qn.c:1.51	Sat Sep 17 19:18:04 2022
+++ src/sys/arch/amiga/dev/if_qn.c	Sat Sep 17 19:20:14 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_qn.c,v 1.51 2022/09/17 19:18:04 thorpej Exp $ */
+/*	$NetBSD: if_qn.c,v 1.52 2022/09/17 19:20:14 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.51 2022/09/17 19:18:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.52 2022/09/17 19:20:14 thorpej Exp $");
 
 #include "qn.h"
 #if NQN > 0
@@ -141,7 +141,7 @@ struct	qn_softc {
 	u_short	volatile *nic_t_mode;
 	u_short	volatile *nic_reset;
 	u_short	volatile *nic_len;
-	u_char	transmit_pending;
+	bool	transmit_pending;
 };
 
 int	qnmatch(device_t, cfdata_t, void *);
@@ -208,7 +208,7 @@ qnattach(device_t parent, device_t self,
 	sc->nic_t_mode = (u_short volatile *)(sc->sc_nic_base + NIC_DLCR4);
 	sc->nic_r_mode = (u_short volatile *)(sc->sc_nic_base + NIC_DLCR5);
 	sc->nic_reset = (u_short volatile *)(sc->sc_nic_base + NIC_DLCR6);
-	sc->transmit_pending = 0;
+	sc->transmit_pending = false;
 
 	/*
 	 * The ethernet address of the board (1st three bytes are the vendor
@@ -277,7 +277,7 @@ qninit(struct qn_softc *sc)
 
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
-	sc->transmit_pending = 0;
+	sc->transmit_pending = false;
 
 	qn_flush(sc);
 
@@ -423,7 +423,7 @@ qnstart(struct ifnet *ifp)
 		/* But now, let's just fall thru and hope the best... */
 		log(LOG_INFO, "qn: transmit timeout (fatal?)\n");
 
-	sc->transmit_pending = 1;
+	sc->transmit_pending = true;
 	*sc->nic_t_mask = INT_TMT_OK | INT_SIXTEEN_COL;
 
 	ifp->if_flags |= IFF_OACTIVE;
@@ -736,7 +736,7 @@ qnintr(void *arg)
 		*sc->nic_t_status = CLEAR_T_ERR;
 
 		if (sc->transmit_pending && (tint & T_TMT_OK)) {
-			sc->transmit_pending = 0;
+			sc->transmit_pending = false;
 			/*
 			 * Update total number of successfully
 			 * transmitted packets.
@@ -754,7 +754,7 @@ qnintr(void *arg)
 #endif
 			if_statadd2(&sc->sc_ethercom.ec_if,
 			if_oerrors, 1, if_collisions, 16);
-			sc->transmit_pending = 0;
+			sc->transmit_pending = false;
 		}
 
 		if (sc->transmit_pending) {
@@ -897,7 +897,7 @@ qn_dump(struct qn_softc *sc)
 	log(LOG_INFO, "r_status  : %04x\n", *sc->nic_r_status);
 	log(LOG_INFO, "r_mask: %04x\n", *sc->nic_r_mask);
 	log(LOG_INFO, "r_mode: %04x\n", *sc->nic_r_mode);
-	log(LOG_INFO, "pending   : %02x\n", sc->transmit_pending);
+	log(LOG_INFO, "pending   : %s\n", sc->transmit_pending ? "T" : "F");
 	log(LOG_INFO, "if_flags  : %04x\n", sc->sc_ethercom.ec_if.if_flags);
 }
 #endif

CVS commit: src/sys/arch/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:20:14 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Make qn_softc::transmit_pending a bool.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amiga/dev/if_qn.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:18:04 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Remove statically allocated qn_softc[] array.  NFC, as it was not
referenced by anything.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amiga/dev/if_qn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.50 src/sys/arch/amiga/dev/if_qn.c:1.51
--- src/sys/arch/amiga/dev/if_qn.c:1.50	Sun Dec  5 08:16:10 2021
+++ src/sys/arch/amiga/dev/if_qn.c	Sat Sep 17 19:18:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_qn.c,v 1.50 2021/12/05 08:16:10 msaitoh Exp $ */
+/*	$NetBSD: if_qn.c,v 1.51 2022/09/17 19:18:04 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.50 2021/12/05 08:16:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.51 2022/09/17 19:18:04 thorpej Exp $");
 
 #include "qn.h"
 #if NQN > 0
@@ -142,8 +142,7 @@ struct	qn_softc {
 	u_short	volatile *nic_reset;
 	u_short	volatile *nic_len;
 	u_char	transmit_pending;
-} qn_softc[NQN];
-
+};
 
 int	qnmatch(device_t, cfdata_t, void *);
 void	qnattach(device_t, device_t, void *);

CVS commit: src/sys/arch/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:18:04 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Remove statically allocated qn_softc[] array.  NFC, as it was not
referenced by anything.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amiga/dev/if_qn.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:03:31 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/if_es.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.67 src/sys/arch/amiga/dev/if_es.c:1.68
--- src/sys/arch/amiga/dev/if_es.c:1.67	Sat Aug 20 16:47:01 2022
+++ src/sys/arch/amiga/dev/if_es.c	Sat Sep 17 19:03:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.67 2022/08/20 16:47:01 thorpej Exp $ */
+/*	$NetBSD: if_es.c,v 1.68 2022/09/17 19:03:31 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.67 2022/08/20 16:47:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.68 2022/09/17 19:03:31 thorpej Exp $");
 
 
 #include 
@@ -86,6 +86,7 @@ struct	es_softc {
 	void	*sc_base;		/* base address of board */
 	short	sc_iflags;
 	unsigned short sc_intctl;
+	bool	sc_txbusy;
 #ifdef ESDEBUG
 	int	sc_debug;
 	short	sc_intbusy;		/* counter for interrupt rentered */
@@ -289,7 +290,7 @@ esinit(struct es_softc *sc)
 
 	/* Interface is now 'running', with no output active. */
 	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
+	sc->sc_txbusy = false;
 
 	/* Attempt to start output, if any. */
 	if_schedule_deferred_start(ifp);
@@ -359,7 +360,7 @@ esintr(void *arg)
 			while (smc->b2.mmucr & MMUCR_BUSY)
 ;
 			smc->b2.pnr = save_pnr;
-			ifp->if_flags &= ~IFF_OACTIVE;
+			sc->sc_txbusy = false;
 			ifp->if_timer = 0;
 		}
 #ifdef ESDEBUG
@@ -757,8 +758,7 @@ esstart(struct ifnet *ifp)
 	int i;
 	u_char active_pnr;
 
-	if ((sc->sc_ethercom.ec_if.if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
-	IFF_RUNNING)
+	if ((sc->sc_ethercom.ec_if.if_flags & IFF_RUNNING) == 0)
 		return;
 
 #ifdef ESDEBUG
@@ -772,7 +772,7 @@ esstart(struct ifnet *ifp)
 		smc->b2.bsr = BSR_BANK2;
 	}
 #endif
-	for (;;) {
+	while (!sc->sc_txbusy) {
 #ifdef ESDEBUG
 		u_short start_ptr, end_ptr;
 #endif
@@ -801,7 +801,7 @@ esstart(struct ifnet *ifp)
 			if ((smc->b2.arr & ARR_FAILED) == 0)
 break;
 		if (smc->b2.arr & ARR_FAILED) {
-			sc->sc_ethercom.ec_if.if_flags |= IFF_OACTIVE;
+			sc->sc_txbusy = true;
 			sc->sc_intctl |= MSK_ALLOC;
 			sc->sc_ethercom.ec_if.if_timer = 5;
 			break;

CVS commit: src/sys/arch/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Sep 17 19:03:31 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/if_es.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Aug 20 16:47:01 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
esstart(): Replace "IF_DEQUEUE() -> IF_PREPEND() on failure" with
"IF_POLL() -> IF_DEQUEUE() on success".


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/if_es.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/amiga/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Aug 20 16:47:01 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: if_es.c

Log Message:
esstart(): Replace "IF_DEQUEUE() -> IF_PREPEND() on failure" with
"IF_POLL() -> IF_DEQUEUE() on success".


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/if_es.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.66 src/sys/arch/amiga/dev/if_es.c:1.67
--- src/sys/arch/amiga/dev/if_es.c:1.66	Tue May 24 20:50:18 2022
+++ src/sys/arch/amiga/dev/if_es.c	Sat Aug 20 16:47:01 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.66 2022/05/24 20:50:18 andvar Exp $ */
+/*	$NetBSD: if_es.c,v 1.67 2022/08/20 16:47:01 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.66 2022/05/24 20:50:18 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.67 2022/08/20 16:47:01 thorpej Exp $");
 
 
 #include 
@@ -780,7 +780,7 @@ esstart(struct ifnet *ifp)
 		 * Sneak a peek at the next packet to get the length
 		 * and see if the SMC 91C90 can accept it.
 		 */
-		m = sc->sc_ethercom.ec_if.if_snd.ifq_head;
+		IF_POLL(&sc->sc_ethercom.ec_if.if_snd, m);
 		if (!m)
 			break;
 #ifdef ESDEBUG
@@ -815,7 +815,6 @@ esstart(struct ifnet *ifp)
 			smc->b2.bsr = BSR_BANK2;
 		}
 #endif
-		IF_DEQUEUE(&sc->sc_ethercom.ec_if.if_snd, m);
 		smc->b2.ptr = PTR_AUTOINCR;
 		(void) smc->b2.mmucr;
 		data = (volatile u_short *)&smc->b2.data;
@@ -912,10 +911,10 @@ esstart(struct ifnet *ifp)
 			start_ptr, end_ptr, SWAP(smc->b2.ptr));
 			--sc->sc_smcbusy;
 #endif
-			IF_PREPEND(&sc->sc_ethercom.ec_if.if_snd, m0);
 			esinit(sc);	/* It's really hosed - reset */
 			return;
 		}
+		IF_DEQUEUE(&sc->sc_ethercom.ec_if.if_snd, m);
 		smc->b2.mmucr = MMUCR_ENQ_TX;
 		if (smc->b2.pnr != active_pnr)
 			printf("%s: esstart - PNR changed %x->%x\n",

CVS commit: src/sys/arch/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Mon Aug  1 01:32:15 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: ms.c

Log Message:
ms_wscons_ioctl(): Return EPASSTHROUGH instead of -1, for unsupported
ioctl, as done for other backends of wsmouse(4).


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/dev/ms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/ms.c
diff -u src/sys/arch/amiga/dev/ms.c:1.42 src/sys/arch/amiga/dev/ms.c:1.43
--- src/sys/arch/amiga/dev/ms.c:1.42	Sat Aug  7 16:18:41 2021
+++ src/sys/arch/amiga/dev/ms.c	Mon Aug  1 01:32:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ms.c,v 1.42 2021/08/07 16:18:41 thorpej Exp $ */
+/*	$NetBSD: ms.c,v 1.43 2022/08/01 01:32:15 rin Exp $ */
 
 /*
  * based on:
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.42 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.43 2022/08/01 01:32:15 rin Exp $");
 
 /*
  * Mouse driver.
@@ -554,7 +554,7 @@ ms_wscons_ioctl(void *cookie, u_long cmd
 		return (0);
 	}
 
-	return -1;
+	return EPASSTHROUGH;
 }
 
 static int

CVS commit: src/sys/arch/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Mon Aug  1 01:32:15 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: ms.c

Log Message:
ms_wscons_ioctl(): Return EPASSTHROUGH instead of -1, for unsupported
ioctl, as done for other backends of wsmouse(4).


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/dev/ms.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/amiga/dev

[Jukka Andberg]

Module Name:src
Committed By:   jandberg
Date:   Wed Jul  6 14:34:13 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c

Log Message:
Return display depth correctly from WSDISPLAYIO_GET_FBINFO.
(previous workaround to always return 1 no longer needed with latest wsfb)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/dev/amidisplaycc.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/amiga/dev

[Jukka Andberg]

Module Name:src
Committed By:   jandberg
Date:   Wed Jul  6 14:34:13 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c

Log Message:
Return display depth correctly from WSDISPLAYIO_GET_FBINFO.
(previous workaround to always return 1 no longer needed with latest wsfb)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/dev/amidisplaycc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.39 src/sys/arch/amiga/dev/amidisplaycc.c:1.40
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.39	Sun Feb  6 10:05:56 2022
+++ src/sys/arch/amiga/dev/amidisplaycc.c	Wed Jul  6 14:34:13 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $ */
+/*	$NetBSD: amidisplaycc.c,v 1.40 2022/07/06 14:34:13 jandberg Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.40 2022/07/06 14:34:13 jandberg Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
@@ -1112,14 +1112,13 @@ amidisplaycc_getfbinfo(struct amidisplay
 	bm = adp->gfxview->bitmap;
 	KASSERT(bm);
 
-	/* Depth 1 since current X wsfb driver doesn't support multiple bitplanes */
 	memset(fbinfo, 0, sizeof(*fbinfo));
-	fbinfo->fbi_fbsize = bm->bytes_per_row * bm->rows;
+	fbinfo->fbi_fbsize = bm->bytes_per_row * bm->rows * adp->gfxdepth;
 	fbinfo->fbi_fboffset = 0;
 	fbinfo->fbi_width = bm->bytes_per_row * 8;
 	fbinfo->fbi_height = bm->rows;
 	fbinfo->fbi_stride = bm->bytes_per_row;
-	fbinfo->fbi_bitsperpixel = 1;
+	fbinfo->fbi_bitsperpixel = adp->gfxdepth;
 	fbinfo->fbi_pixeltype = WSFB_CI;
 	fbinfo->fbi_flags = 0;
 	fbinfo->fbi_subtype.fbi_cmapinfo.cmap_entries = 1 << adp->gfxdepth;

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jun 27 20:28:31 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: siopreg.h

Log Message:
s/loobpack/loopback/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/siopreg.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/amiga/dev/siopreg.h
diff -u src/sys/arch/amiga/dev/siopreg.h:1.15 src/sys/arch/amiga/dev/siopreg.h:1.16
--- src/sys/arch/amiga/dev/siopreg.h:1.15	Fri Aug 24 09:01:22 2012
+++ src/sys/arch/amiga/dev/siopreg.h	Mon Jun 27 20:28:31 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: siopreg.h,v 1.15 2012/08/24 09:01:22 msaitoh Exp $	*/
+/*	$NetBSD: siopreg.h,v 1.16 2022/06/27 20:28:31 andvar Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -462,7 +462,7 @@ typedef volatile siop_regmap_t *siop_reg
 #define	SIOP_CTEST4_ZMOD	0x40	/* High-impedance outputs */
 #define	SIOP_CTEST4_SZM		0x20	/* ditto, SCSI "outputs" */
 #ifndef ARCH_720
-#define	SIOP_CTEST4_SLBE	0x10	/* SCSI loobpack enable */
+#define	SIOP_CTEST4_SLBE	0x10	/* SCSI loopback enable */
 #define	SIOP_CTEST4_SFWR	0x08	/* SCSI FIFO write enable (from sodl) */
 #else
 #define	SIOP_CTEST4_SRTM	0x10	/* Shadow Register Test Mode */

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jun 27 20:28:31 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: siopreg.h

Log Message:
s/loobpack/loopback/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/siopreg.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Mar 26 17:15:18 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
s/logial/logical/


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/grfabs_cc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grfabs_cc.c
diff -u src/sys/arch/amiga/dev/grfabs_cc.c:1.36 src/sys/arch/amiga/dev/grfabs_cc.c:1.37
--- src/sys/arch/amiga/dev/grfabs_cc.c:1.36	Tue Aug 17 22:00:27 2021
+++ src/sys/arch/amiga/dev/grfabs_cc.c	Sat Mar 26 17:15:18 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_cc.c,v 1.36 2021/08/17 22:00:27 andvar Exp $ */
+/*	$NetBSD: grfabs_cc.c,v 1.37 2022/03/26 17:15:18 andvar Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
 #include "opt_amigaccgrf.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.36 2021/08/17 22:00:27 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_cc.c,v 1.37 2022/03/26 17:15:18 andvar Exp $");
 
 #include 
 #include 
@@ -930,7 +930,7 @@ display_hires_view(view_t *v)
 			int d = 0;
 
 			/* XXX anyone know the equality properties of
-			 * intermixed logial AND's */
+			 * intermixed logical AND's */
 			/* XXX and arithmetic operators? */
 			while (((ddfstart & 0xfffc) + ddfwidth - d) > 0xd8) {
 d++;

CVS commit: src/sys/arch/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Mar 26 17:15:18 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c

Log Message:
s/logial/logical/


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/grfabs_cc.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Feb 12 23:30:30 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: repulse.c

Log Message:
s/epxected/expected/


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amiga/dev/repulse.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/amiga/dev

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sat Feb 12 23:30:30 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: repulse.c

Log Message:
s/epxected/expected/


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amiga/dev/repulse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/repulse.c
diff -u src/sys/arch/amiga/dev/repulse.c:1.23 src/sys/arch/amiga/dev/repulse.c:1.24
--- src/sys/arch/amiga/dev/repulse.c:1.23	Sat Jun  8 08:02:36 2019
+++ src/sys/arch/amiga/dev/repulse.c	Sat Feb 12 23:30:30 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: repulse.c,v 1.23 2019/06/08 08:02:36 isaki Exp $ */
+/*	$NetBSD: repulse.c,v 1.24 2022/02/12 23:30:30 andvar Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.23 2019/06/08 08:02:36 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.24 2022/02/12 23:30:30 andvar Exp $");
 
 #include 
 #include 
@@ -310,7 +310,7 @@ repulse_attach(device_t parent, device_t
 	/*
 	 * Print a warning if the codec doesn't support hardware variable
 	 * rate audio. As the initial incarnations of the Repulse board
-	 * are AC'97 2.1, it is epxected that we'll always have VRA.
+	 * are AC'97 2.1, it is expected that we'll always have VRA.
 	 */
 	/*
 	 * XXX this should be a panic(). OTOH, audio codec speed is not

CVS commit: src/sys/arch/amiga/dev

[Jukka Andberg]

Module Name:src
Committed By:   jandberg
Date:   Sun Feb  6 10:05:56 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c

Log Message:
Refactor cursor drawing.
Fixes rare case where cursor gets painted over when screen is cleared.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amiga/dev/amidisplaycc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.38 src/sys/arch/amiga/dev/amidisplaycc.c:1.39
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.38	Sat Aug 21 23:00:31 2021
+++ src/sys/arch/amiga/dev/amidisplaycc.c	Sun Feb  6 10:05:56 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: amidisplaycc.c,v 1.38 2021/08/21 23:00:31 andvar Exp $ */
+/*	$NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.38 2021/08/21 23:00:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
@@ -122,6 +122,9 @@ static int amidisplaycc_getfbinfo(struct
 
 static int amidisplaycc_setfont(struct amidisplaycc_screen *, const char *);
 static const struct wsdisplay_font * amidisplaycc_getbuiltinfont(void);
+static void amidisplaycc_cursor_undraw(struct amidisplaycc_screen *);
+static void amidisplaycc_cursor_draw(struct amidisplaycc_screen *);
+static void amidisplaycc_cursor_xor(struct amidisplaycc_screen *, int, int);
 
 static void dprintf(const char *fmt, ...);
 
@@ -276,6 +279,7 @@ struct amidisplaycc_screen
 
 	int   cursorrow;
 	int   cursorcol;
+	int   cursordrawn;
 
 	/* Active bitplanes for each character row. */
 	int   rowmasks[MAXROWS];
@@ -499,36 +503,55 @@ void
 amidisplaycc_cursor(void *screen, int on, int row, int col)
 {
 	adccscr_t  * scr;
-	u_char * dst;
-	int  i;
 
 	scr = screen;
 
 	if (row < 0 || col < 0 || row >= scr->nrows || col >= scr->ncols)
 		return;
 
-	/* was off, turning off again? */
-	if (!on && scr->cursorrow == -1 && scr->cursorcol == -1)
-		return;
-
-	/* was on, and turning on again? */
-	if (on && scr->cursorrow >= 0 && scr->cursorcol >= 0)
-	{
-		/* clear from old location first */
-		amidisplaycc_cursor (screen, 0, scr->cursorrow, scr->cursorcol);
-	}
-	
-	dst = scr->planes[0];
-	dst += row * scr->rowbytes;
-	dst += col;
+	amidisplaycc_cursor_undraw(scr);
 
 	if (on) {
 		scr->cursorrow = row;
 		scr->cursorcol = col;
+		amidisplaycc_cursor_draw(scr);
 	} else {
 		scr->cursorrow = -1;
 		scr->cursorcol = -1;
 	}
+}
+
+void
+amidisplaycc_cursor_undraw(struct amidisplaycc_screen * scr)
+{
+	if (scr->cursordrawn) {
+		amidisplaycc_cursor_xor(scr, scr->cursorrow, scr->cursorcol);
+		scr->cursordrawn = 0;
+	}
+}
+
+void
+amidisplaycc_cursor_draw(struct amidisplaycc_screen * scr)
+{
+	if (!scr->cursordrawn && scr->cursorrow >= 0 && scr->cursorcol >= 0) {
+		amidisplaycc_cursor_xor(scr, scr->cursorrow, scr->cursorcol);
+		scr->cursordrawn = 1;
+	}
+}
+
+void
+amidisplaycc_cursor_xor(struct amidisplaycc_screen * scr, int row, int col)
+{
+	u_char * dst;
+	int i;
+
+	KASSERT(scr);
+	KASSERT(row >= 0);
+	KASSERT(col >= 0);
+
+	dst = scr->planes[0];
+	dst += row * scr->rowbytes;
+	dst += col;
 
 	for (i = scr->fontheight ; i > 0 ; i--) {
 		*dst ^= 255;
@@ -536,7 +559,6 @@ amidisplaycc_cursor(void *screen, int on
 	}
 }
 
-
 int
 amidisplaycc_mapchar(void *screen, int ch, unsigned int *chp)
 {
@@ -924,6 +946,7 @@ amidisplaycc_eraserows(void *screen, int
 
 	if (row < 0 || row + nrows > scr->nrows)
 		return;
+	amidisplaycc_cursor_undraw(scr);
 
 	depth  = scr->depth;
 	widthbytes = scr->widthbytes;
@@ -958,6 +981,7 @@ amidisplaycc_eraserows(void *screen, int
 		}
 		bgcolor >>= 1;
 	}
+	amidisplaycc_cursor_draw(scr);
 }
 
 
@@ -1870,7 +1894,7 @@ amidisplaycc_setfont(struct amidisplaycc
 
 	scr->wsfont = wsfont;
 	scr->wsfontcookie = wsfontcookie;
-	
+
 	return 0;
 }
 

CVS commit: src/sys/arch/amiga/dev

[Jukka Andberg]

Module Name:src
Committed By:   jandberg
Date:   Sun Feb  6 10:05:56 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c

Log Message:
Refactor cursor drawing.
Fixes rare case where cursor gets painted over when screen is cleared.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amiga/dev/amidisplaycc.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/amiga/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Jan  1 11:45:37 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c grf_cv3d.c

Log Message:
s/frambuffer/framebuffer/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amiga/dev/grf_cv3d.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/grf_cv.c
diff -u src/sys/arch/amiga/dev/grf_cv.c:1.62 src/sys/arch/amiga/dev/grf_cv.c:1.63
--- src/sys/arch/amiga/dev/grf_cv.c:1.62	Sun Dec 26 16:08:19 2021
+++ src/sys/arch/amiga/dev/grf_cv.c	Sat Jan  1 11:45:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cv.c,v 1.62 2021/12/26 16:08:19 andvar Exp $ */
+/*	$NetBSD: grf_cv.c,v 1.63 2022/01/01 11:45:37 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.62 2021/12/26 16:08:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.63 2022/01/01 11:45:37 msaitoh Exp $");
 
 #include "grfcv.h"
 #include "ite.h"
@@ -404,7 +404,7 @@ cvintr(void *arg)
 }
 
 /*
- * Get frambuffer memory size.
+ * Get framebuffer memory size.
  * phase5 didn't provide the bit in CR36,
  * so we have to do it this way.
  * Return 0 for 2MB, 1 for 4MB

Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.37 src/sys/arch/amiga/dev/grf_cv3d.c:1.38
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.37	Sun Dec 26 16:08:19 2021
+++ src/sys/arch/amiga/dev/grf_cv3d.c	Sat Jan  1 11:45:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cv3d.c,v 1.37 2021/12/26 16:08:19 andvar Exp $ */
+/*	$NetBSD: grf_cv3d.c,v 1.38 2022/01/01 11:45:37 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.37 2021/12/26 16:08:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.38 2022/01/01 11:45:37 msaitoh Exp $");
 
 #include "grfcv3d.h"
 #include "ite.h"
@@ -345,7 +345,7 @@ static struct cfdata *cfdata;
 #define CV3D_ULCURSOR	1	/* Underlined Cursor in textmode */
 
 /*
- * Get frambuffer memory size.
+ * Get framebuffer memory size.
  * phase5 didn't provide the bit in CR36,
  * so we have to do it this way.
  * Return 0 for 2MB, 1 for 4MB

CVS commit: src/sys/arch/amiga/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Jan  1 11:45:37 UTC 2022

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c grf_cv3d.c

Log Message:
s/frambuffer/framebuffer/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amiga/dev/grf_cv3d.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/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat Sep  7 11:57:08 UTC 2019

Modified Files:
src/sys/arch/amiga/dev: aucc.c

Log Message:
The device does not support recording.
Fix diagnostic assertion failure in aucc_set_format().

OK isaki

XXX
pullup to netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/aucc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/aucc.c
diff -u src/sys/arch/amiga/dev/aucc.c:1.46 src/sys/arch/amiga/dev/aucc.c:1.47
--- src/sys/arch/amiga/dev/aucc.c:1.46	Sat Jun  8 08:02:36 2019
+++ src/sys/arch/amiga/dev/aucc.c	Sat Sep  7 11:57:08 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: aucc.c,v 1.46 2019/06/08 08:02:36 isaki Exp $ */
+/*	$NetBSD: aucc.c,v 1.47 2019/09/07 11:57:08 rin Exp $ */
 
 /*
  * Copyright (c) 1999 Bernardo Innocenti
@@ -46,7 +46,7 @@
 #if NAUCC > 0
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.46 2019/06/08 08:02:36 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.47 2019/09/07 11:57:08 rin Exp $");
 
 #include 
 #include 
@@ -694,7 +694,7 @@ int
 aucc_get_props(void *addr)
 {
 
-	return AUDIO_PROP_PLAYBACK | AUDIO_PROP_CAPTURE;
+	return AUDIO_PROP_PLAYBACK;
 }
 
 

CVS commit: src/sys/arch/amiga/dev

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat Sep  7 11:57:08 UTC 2019

Modified Files:
src/sys/arch/amiga/dev: aucc.c

Log Message:
The device does not support recording.
Fix diagnostic assertion failure in aucc_set_format().

OK isaki

XXX
pullup to netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/aucc.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/amiga/dev

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Sun Feb  7 12:52:04 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: atzsc.c

Log Message:
Remove a now-unused variable declaration.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/atzsc.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Tue Feb  2 19:03:31 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: com_supio.c gvpio.c hyper.c ioblix_zbus.c
zbusvar.h

Log Message:
Fix compilation warnings and errors with amigappc.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/com_supio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/gvpio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/dev/hyper.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amiga/dev/ioblix_zbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/zbusvar.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sun Jan 31 19:56:19 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c grf_cvreg.h

Log Message:
Fixed for amigappc by executing eieio after writing to a vga register.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amiga/dev/grf_cvreg.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Jan 30 16:49:14 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c

Log Message:
Fixed compiler warnings when CV_INT_NUM == 2 or CV64CONSOLE is not defined.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/dev/grf_cv.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Sat Jan 30 16:47:05 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: ite.c

Log Message:
Do not crash when ite wasn't configured to be console.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amiga/dev/ite.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Fri Jan 29 19:56:41 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: siop.c siop2.c

Log Message:
Define DCIAS() for amigappc.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amiga/dev/siop.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/siop2.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/amiga/dev

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Mon Jan 18 18:14:43 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: if_qn.c

Log Message:
Fix bpf.  compile-tested only.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amiga/dev/if_qn.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/amiga/dev

[David Young]

Module Name:src
Committed By:   dyoung
Date:   Fri Jan 15 23:49:22 UTC 2010

Modified Files:
src/sys/arch/amiga/dev: fd.c

Log Message:
Use __arraycount().


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amiga/dev/fd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.