Changeset 9fe4db3 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2011-12-17T08:38:38Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

65d7b0a

Parents:

f4d5f90 (diff), 792807f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/lib/nic/src/nic_driver.c (modified) (3 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>
@@ -1334 +1334 @@
  * @return physical address of packet
  */
-void *nic_dma_lock_packet(packet_t *packet)
-{
-        void *phys_addr;
-        int rc = dmamem_lock(packet, &phys_addr, 1);
-        if (rc != EOK)
-                return NULL;
-        
-        return phys_addr;
+int nic_dma_lock_packet(packet_t *packet, size_t size, void **phys)
+{
+        return dmamem_map(packet, SIZE2PAGES(size), 0, 0, phys);
 }
 
@@ -1348 +1343 @@
  * @param packet
  */
-int nic_dma_unlock_packet(packet_t *packet)
-{
-        return dmamem_unlock(packet, 1);
+int nic_dma_unlock_packet(packet_t *packet, size_t size)
+{
+        return dmamem_unmap(packet, size, 0);
 }