Module Name: src
Committed By: joerg
Date: Sat Nov 22 19:50:00 UTC 2014
Modified Files:
src/sys/dev/ic: i82557var.h
Log Message:
Replace void * cast with proper __UNVOLATILE.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/i82557var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/i82557var.h
diff -u src/sys/dev/ic/i82557var.h:1.50 src/sys/dev/ic/i82557var.h:1.51
--- src/sys/dev/ic/i82557var.h:1.50 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/i82557var.h Sat Nov 22 19:50:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557var.h,v 1.50 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: i82557var.h,v 1.51 2014/11/22 19:50:00 joerg Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -323,8 +323,8 @@ do { \
/* NOTE: the RFA is misaligned, so we must copy. */ \
/* BIG_ENDIAN: no need to swap to store 0xffffffff */ \
__v = 0xffffffff; \
- memcpy((void *)&__rfa->link_addr, &__v, sizeof(__v)); \
- memcpy((void *)&__rfa->rbd_addr, &__v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(&__rfa->link_addr), &__v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(&__rfa->rbd_addr), &__v, sizeof(__v)); \
\
FXP_RFASYNC((sc), (m), \
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \
@@ -337,7 +337,7 @@ do { \
RFA_ALIGNMENT_FUDGE); \
FXP_RFASYNC((sc), __p_m, \
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); \
- memcpy((void *)&__p_rfa->link_addr, &__v, \
+ memcpy(__UNVOLATILE(&__p_rfa->link_addr), &__v, \
sizeof(__v)); \
__p_rfa->rfa_control &= htole16(~(FXP_RFA_CONTROL_EL| \
FXP_RFA_CONTROL_S)); \
