Changeset 30111 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd

Timestamp:

Jun 9, 2010 12:14:59 PM (14 years ago)

Author:

vboxsync

Message:

iprt/asm.h,*: Revised the ASMAtomic*Ptr functions and macros. The new saves lots of unsafe (void * volatile *) casts as well as adding some type safety when using GCC (typeof rulez).

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c

@@ -498 +498 @@
     int error;
 
-    ifp = (void *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.ifp);
+    ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
 
     if (fDst & INTNETTRUNKDIR_WIRE)
@@ -568 +568 @@
     RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
 
-    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.ifp, ifp);
+    ASMAtomicUoWritePtr(&pThis->u.s.ifp, ifp);
     pThis->u.s.node = node;
     bcopy(IF_LLADDR(ifp), &pThis->u.s.MacAddr, ETHER_ADDR_LEN);
@@ -611 +611 @@
     struct ifnet *ifp, *ifp0;
 
-    ifp = (struct ifnet *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.ifp);
+    ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
     /*
      * Attempt to check if the interface is still there and re-initialize if
@@ -669 +669 @@
     Log(("%s: fActive:%d\n", __func__, fActive));
 
-    ifp = (struct ifnet *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.ifp);
-    node = (node_p)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.node);
+    ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
+    node = ASMAtomicUoReadPtrT(&pThis->u.s.node, node_p);
 
     memset(&ifreq, 0, sizeof(struct ifreq));