Changes in uspace/lib/nic/src/nic_driver.c [c6ae4c2:49bd793b] in mainline

File:

• uspace/lib/nic/src/nic_driver.c (modified) (4 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -46 +46 @@
 #include <ipc/irc.h>
 #include <sysinfo.h>
-#include <as.h>
+
 #include <devman.h>
 #include <ddf/interrupt.h>
@@ -1329 +1329 @@
 }
 
+// FIXME: Later
+#if 0
+
 /** Lock packet for DMA usage
  *
@@ -1334 +1337 @@
  * @return physical address of packet
  */
-int nic_dma_lock_packet(packet_t *packet, size_t size, void **phys)
-{
-        return dmamem_map(packet, SIZE2PAGES(size), 0, 0, phys);
+void *nic_dma_lock_packet(packet_t *packet)
+{
+        void *phys_addr;
+        size_t locked;
+        int rc = dma_lock(packet, &phys_addr, 1, &locked);
+        if (rc != EOK)
+                return NULL;
+        
+        assert(locked == 1);
+        return phys_addr;
 }
 
@@ -1343 +1353 @@
  * @param packet
  */
-int nic_dma_unlock_packet(packet_t *packet, size_t size)
-{
-        return dmamem_unmap(packet, size, 0);
-}
+void nic_dma_unlock_packet(packet_t *packet)
+{
+        size_t unlocked;
+        int rc = dma_unlock(packet, 1, &unlocked);
+        if (rc != EOK)
+                return;
+        
+        assert(unlocked == 1);
+}
+
+#endif
 
 /** @}