Module Name: src
Committed By: martin
Date: Mon Nov 27 19:32:23 UTC 2023
Modified Files:
src/sys/arch/newsmips/dev [netbsd-9]: dmac_0448.h scsi_1185.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1764):
sys/arch/newsmips/dev/dmac_0448.h: revision 1.7
sys/arch/newsmips/dev/scsi_1185.c: revision 1.25
Use DELAY(9), not empty for() loop that could be optimized out.
No visible regression on NWS-3260 and NWS-3470.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.96.1 src/sys/arch/newsmips/dev/dmac_0448.h
cvs rdiff -u -r1.23 -r1.23.20.1 src/sys/arch/newsmips/dev/scsi_1185.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/newsmips/dev/dmac_0448.h
diff -u src/sys/arch/newsmips/dev/dmac_0448.h:1.6 src/sys/arch/newsmips/dev/dmac_0448.h:1.6.96.1
--- src/sys/arch/newsmips/dev/dmac_0448.h:1.6 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/dev/dmac_0448.h Mon Nov 27 19:32:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dmac_0448.h,v 1.6 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: dmac_0448.h,v 1.6.96.1 2023/11/27 19:32:23 martin Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -120,7 +120,7 @@ struct dm_stat {
unsigned int dm_width;
};
-#define DMAC_WAIT nops(10)
+#define DMAC_WAIT DELAY(1)
#define PINTEN 0xbfc80001
# define DMA_INTEN 0x10
Index: src/sys/arch/newsmips/dev/scsi_1185.c
diff -u src/sys/arch/newsmips/dev/scsi_1185.c:1.23 src/sys/arch/newsmips/dev/scsi_1185.c:1.23.20.1
--- src/sys/arch/newsmips/dev/scsi_1185.c:1.23 Thu Jul 21 19:49:58 2016
+++ src/sys/arch/newsmips/dev/scsi_1185.c Mon Nov 27 19:32:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_1185.c,v 1.23 2016/07/21 19:49:58 christos Exp $ */
+/* $NetBSD: scsi_1185.c,v 1.23.20.1 2023/11/27 19:32:23 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.23 2016/07/21 19:49:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.23.20.1 2023/11/27 19:32:23 martin Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -116,10 +116,9 @@ __KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,
#define splscsi splsc
#if defined(__mips__) && defined(CPU_SINGLE)
-#define nops(x) { int __i; for (__i = 0; __i < (x); __i++) ; }
-#define DMAC_WAIT0 ;
+#define DMAC_WAIT0 __nothing
#else
-#define DMAC_WAIT0 DMAC_WAIT
+#define DMAC_WAIT0 DMAC_WAIT /* see MODIFY HISTORY comment above */
#endif
#ifdef DMAC_MAP_INIT
