Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Replace void * cast with proper __UNVOLATILE.



details:   https://anonhg.NetBSD.org/src/rev/7513804bc598
branches:  trunk
changeset: 333941:7513804bc598
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Nov 22 19:50:00 2014 +0000

description:
Replace void * cast with proper __UNVOLATILE.

diffstat:

 sys/dev/ic/i82557var.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 615cc1cad9e5 -r 7513804bc598 sys/dev/ic/i82557var.h
--- a/sys/dev/ic/i82557var.h    Sat Nov 22 19:48:36 2014 +0000
+++ b/sys/dev/ic/i82557var.h    Sat Nov 22 19:50:00 2014 +0000
@@ -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 @@
        /* 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 @@
                    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));                                \



Home | Main Index | Thread Index | Old Index