From 08cd807f1c7f3c269ef174bd0a26e68bba0b8978 Mon Sep 17 00:00:00 2001
From: he <he@NetBSD.org>
Date: Mon, 5 Mar 2007 15:29:13 +0000
Subject: [PATCH] Need char* for pointer arithmetic and array indexing.

---
 sys/arch/next68k/stand/boot/scsi.c    | 16 ++++++++--------
 sys/arch/next68k/stand/boot/scsireg.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/arch/next68k/stand/boot/scsi.c b/sys/arch/next68k/stand/boot/scsi.c
index 47a3f06db2d6..ca9af4a6c96a 100644
--- a/sys/arch/next68k/stand/boot/scsi.c
+++ b/sys/arch/next68k/stand/boot/scsi.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: scsi.c,v 1.7 2007/03/04 06:00:27 christos Exp $        */
+/*      $NetBSD: scsi.c,v 1.8 2007/03/05 15:29:13 he Exp $        */
 /*
  * Copyright (c) 1994, 1997 Rolf Grossmann
  * All rights reserved.
@@ -53,7 +53,7 @@ int dma_done(void);
 
 void scsi_init(void);
 void scsierror(char *error);
-short scsi_getbyte(volatile void *sr);
+short scsi_getbyte(volatile char *sr);
 int scsi_wait_for_intr(void);
 int scsiicmd(char target, char lun,
 	 u_char *cbuf, int clen, char *addr, int *len);
@@ -70,7 +70,7 @@ int scsiicmd(char target, char lun,
 void
 scsi_init(void)
 {
-    volatile void *sr;
+    volatile char *sr;
     struct dma_dev *dma;
 
     sr = P_SCSI;
@@ -123,7 +123,7 @@ scsierror(char *error)
 }
 
 short
-scsi_getbyte(volatile void *sr)
+scsi_getbyte(volatile char *sr)
 {
     if ((sr[NCR_FFLAG] & NCRFIFO_FF) == 0) 
     {
@@ -165,7 +165,7 @@ scsiicmd(char target, char lun,
 	 u_char *cbuf, int clen,
 	 char *addr, int *len)
 {
-    volatile void *sr;
+    volatile char *sr;
     int i;
 
     DPRINTF(("scsiicmd: [%x, %d] -> %d (%lx, %d)\n",*cbuf, clen,
@@ -314,7 +314,7 @@ scsiicmd(char target, char lun,
 int
 scsi_msgin(void)
 {
-    volatile void *sr;
+    volatile char *sr;
     u_char msg;
 
     sr = P_SCSI;
@@ -338,7 +338,7 @@ scsi_msgin(void)
 int
 dma_start(char *addr, int len)
 {
-    volatile void *sr;
+    volatile char *sr;
     struct dma_dev *dma;
     
     
@@ -401,7 +401,7 @@ dma_start(char *addr, int len)
 int
 dma_done(void)
 {
-    volatile void *sr;
+    volatile char *sr;
     struct dma_dev *dma;
     int resid, state;
     int flushcount = 0;
diff --git a/sys/arch/next68k/stand/boot/scsireg.h b/sys/arch/next68k/stand/boot/scsireg.h
index 8303473dc55a..06fc2cfdb76b 100644
--- a/sys/arch/next68k/stand/boot/scsireg.h
+++ b/sys/arch/next68k/stand/boot/scsireg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsireg.h,v 1.2 2007/03/04 06:00:27 christos Exp $	*/
+/*	$NetBSD: scsireg.h,v 1.3 2007/03/05 15:29:14 he Exp $	*/
 /*
  * Copyright (c) 1994, 1997 Rolf Grossmann
  * All rights reserved.
@@ -40,7 +40,7 @@
 
 #define	P_SCSI_CSR	((void *)(SLOT_ID+0x02000010))
 #define	P_SCSI		((void *)(SLOT_ID_BMAP+0x02014000))
-#define	P_FLOPPY	((void *)(SLOT_ID_BMAP+0x02014100))
+#define	P_FLOPPY	((char *)(SLOT_ID_BMAP+0x02014100))
 
 #define	SCSI_INTR	(1<<12)	/* I_BIT(I_SCSI) */