Changeset 17095 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

Timestamp:

Feb 24, 2009 8:08:20 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43326

Message:

#2957: VBoxNetAdp: Fixes in generic and darwin parts. No traffic yet.

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -40 +40 @@
 #include <iprt/semaphore.h>
 #include <iprt/spinlock.h>
+#include <iprt/string.h>
 #include <iprt/uuid.h>
 
@@ -120 +121 @@
 DECLINLINE(ifnet_t) vboxNetAdpDarwinRetainIfNet(PVBOXNETADP pThis)
 {
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     ifnet_t pIfNet = NULL;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    if (pThis->enmState >= kVBoxNetAdpState_Connected)
-        ifnet_reference(pThis->u.s.pIface);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    ifnet_reference(pThis->u.s.pIface);
 
     return pIfNet;
@@ -599 +596 @@
     memcpy(LLADDR(&mac), pMACAddress->au8, mac.sdl_alen);
 
+    RTStrPrintf(pThis->szName, VBOXNETADP_MAX_NAME_LEN, "%s%d", VBOXNETADP_NAME, pThis->uUnit);
     vboxNetAdpDarwinComposeUUID(pThis, &uuid);
     Params.uniqueid = uuid.au8;
@@ -682 +680 @@
 }
 
+int  vboxNetAdpOsInit(PVBOXNETADP pThis)
+{
+    /*
+     * Init the darwin specific members.
+     */
+    pThis->u.s.pIface = NULL;
+    pThis->u.s.hEvtDetached = NIL_RTSEMEVENT;
+    memset(pThis->u.s.aAttachedFamilies, 0, sizeof(pThis->u.s.aAttachedFamilies));
+
+    return VINF_SUCCESS;
+}
+
 /**
  * Start the kernel module.