Module Name: src
Committed By: tsutsui
Date: Sat Nov 4 18:13:25 UTC 2023
Modified Files:
src/sys/arch/newsmips/dev: dmac_0448.h scsi_1185.c
Log Message:
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.7 src/sys/arch/newsmips/dev/dmac_0448.h
cvs rdiff -u -r1.24 -r1.25 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.7
--- 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 Sat Nov 4 18:13:25 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.7 2023/11/04 18:13:25 tsutsui 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.24 src/sys/arch/newsmips/dev/scsi_1185.c:1.25
--- src/sys/arch/newsmips/dev/scsi_1185.c:1.24 Sat Jun 24 05:31:04 2023
+++ src/sys/arch/newsmips/dev/scsi_1185.c Sat Nov 4 18:13:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_1185.c,v 1.24 2023/06/24 05:31:04 msaitoh Exp $ */
+/* $NetBSD: scsi_1185.c,v 1.25 2023/11/04 18:13:25 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.24 2023/06/24 05:31:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.25 2023/11/04 18:13:25 tsutsui 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
