Changeset 72d120e in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (6 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1375 +1375 @@
         fibril_mutex_lock(&e1000->rx_lock);
         
+        e1000->rx_ring_virt = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(
             E1000_RX_FRAME_COUNT * sizeof(e1000_rx_descriptor_t),
@@ -1396 +1397 @@
         }
         
-        size_t i;
-        uintptr_t frame_phys;
-        void *frame_virt;
-        
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+                uintptr_t frame_phys;
+                void *frame_virt = AS_AREA_ANY;
+                
                 rc = dmamem_map_anonymous(E1000_MAX_SEND_FRAME_SIZE,
                     DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
@@ -1412 +1412 @@
         
         /* Write descriptor */
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++)
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++)
                 e1000_fill_new_rx_descriptor(nic, i);
         
@@ -1421 +1421 @@
         
 error:
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) {
                 if (e1000->rx_frame_virt[i] != NULL) {
                         dmamem_unmap_anonymous(e1000->rx_frame_virt[i]);
@@ -1571 +1571 @@
         
         e1000->tx_ring_phys = 0;
-        e1000->tx_ring_virt = NULL;
+        e1000->tx_ring_virt = AS_AREA_ANY;
         
         e1000->tx_frame_phys = NULL;
@@ -1597 +1597 @@
         
         for (i = 0; i < E1000_TX_FRAME_COUNT; i++) {
+                e1000->tx_frame_virt[i] = AS_AREA_ANY;
                 rc = dmamem_map_anonymous(E1000_MAX_SEND_FRAME_SIZE,
                     DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,