summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-09-07 21:27:24 +0000
committerbde <bde@FreeBSD.org>1996-09-07 21:27:24 +0000
commit56630885e00b94bf07efcf92cdb04cb07ba33efc (patch)
tree00867cfe64fecf4666c31bc02b131732ecd711fe
parent984fd335eb4b3697cd4ce16686cc4dbbf72475d7 (diff)
downloadFreeBSD-src-56630885e00b94bf07efcf92cdb04cb07ba33efc.zip
FreeBSD-src-56630885e00b94bf07efcf92cdb04cb07ba33efc.tar.gz
Preserve volatility in casts of np->reg. Cosmetic.
-rw-r--r--sys/pci/ncr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 20e181c..a4f7cd7 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: ncr.c,v 1.76 1996/08/27 20:41:02 se Exp $
+** $Id: ncr.c,v 1.77 1996/09/06 23:08:57 phk Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@@ -1253,7 +1253,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
- "\n$Id: ncr.c,v 1.76 1996/08/27 20:41:02 se Exp $\n";
+ "\n$Id: ncr.c,v 1.77 1996/09/06 23:08:57 phk Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@@ -5043,7 +5043,7 @@ void ncr_exception (ncb_p np)
int i;
np->regtime = time;
for (i=0; i<sizeof(np->regdump); i++)
- ((char*)&np->regdump)[i] = ((char*)np->reg)[i];
+ ((char*)&np->regdump)[i] = ((volatile char*)np->reg)[i];
np->regdump.nc_dstat = dstat;
np->regdump.nc_sist = sist;
};
@@ -5097,7 +5097,7 @@ void ncr_exception (ncb_p np)
printf ("\treg:\t");
for (i=0; i<16;i++)
- printf (" %02x", ((u_char*)np->reg)[i]);
+ printf (" %02x", ((volatile u_char*)np->reg)[i]);
printf (".\n");
/*----------------------------------------
@@ -6520,7 +6520,7 @@ static int ncr_regtest (struct ncb* np)
** write 0xffffffff to a read only register area,
** and try to read it back.
*/
- addr = (u_long*) &np->reg->nc_dstat;
+ addr = (volatile u_long*) &np->reg->nc_dstat;
data = 0xffffffff;
*addr= data;
data = *addr;
OpenPOWER on IntegriCloud