Changeset 192565b in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2013-05-27T13:18:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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 mainline changes.

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -293 +293 @@
         assert(info);
         
-        bzero(info, sizeof(nic_device_info_t));
+        memset(info, 0, sizeof(nic_device_info_t));
         
         info->vendor_id = 0x8086;
@@ -1581 +1581 @@
                 goto error;
         
-        bzero(e1000->tx_ring_virt,
+        memset(e1000->tx_ring_virt, 0,
             E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t));
         
@@ -1872 +1872 @@
         }
         
-        bzero(e1000, sizeof(e1000_t));
+        memset(e1000, 0, sizeof(e1000_t));
         
         nic_set_specific(nic, e1000);