diff --git a/sys/arch/next68k/stand/boot/scsi.c b/sys/arch/next68k/stand/boot/scsi.c index ca9af4a6c96a..647dda7ba046 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.8 2007/03/05 15:29:13 he Exp $ */ +/* $NetBSD: scsi.c,v 1.9 2007/03/05 18:06:09 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 char *sr); +short scsi_getbyte(volatile uint8_t *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 char *sr; + volatile uint8_t *sr; struct dma_dev *dma; sr = P_SCSI; @@ -123,7 +123,7 @@ scsierror(char *error) } short -scsi_getbyte(volatile char *sr) +scsi_getbyte(volatile uint8_t *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 char *sr; + volatile uint8_t *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 char *sr; + volatile uint8_t *sr; u_char msg; sr = P_SCSI; @@ -338,7 +338,7 @@ scsi_msgin(void) int dma_start(char *addr, int len) { - volatile char *sr; + volatile uint8_t *sr; struct dma_dev *dma; @@ -401,7 +401,7 @@ dma_start(char *addr, int len) int dma_done(void) { - volatile char *sr; + volatile uint8_t *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 06fc2cfdb76b..f0aa997e77d6 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.3 2007/03/05 15:29:14 he Exp $ */ +/* $NetBSD: scsireg.h,v 1.4 2007/03/05 18:06:09 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 ((char *)(SLOT_ID_BMAP+0x02014100)) +#define P_FLOPPY ((uint8_t *)(SLOT_ID_BMAP+0x02014100)) #define SCSI_INTR (1<<12) /* I_BIT(I_SCSI) */