Changeset 6a0f1309 in mainline

Timestamp:

2018-06-24T09:07:19Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8b3cb67

Parents:

4810acf

git-author:

Jakub Jermar <jakub@…> (2018-06-24 09:07:12)

git-committer:

Jakub Jermar <jakub@…> (2018-06-24 09:07:19)

Message:

Use macros for working with MAC addresses

Location:

uspace/drv/nic/virtio-net

Files:

• virtio-net.c (modified) (3 diffs)
• virtio-net.h (modified) (2 diffs)

uspace/drv/nic/virtio-net/virtio-net.c

@@ -38 +38 @@
 #include <ops/nic.h>
 #include <pci_dev_iface.h>
+#include <nic/nic.h>
 
 #include <nic.h>
@@ -336 +337 @@
          */
         nic_address_t nic_addr;
-        for (unsigned i = 0; i < 6; i++)
+        for (unsigned i = 0; i < ETH_ADDR; i++)
                 nic_addr.address[i] = pio_read_8(&netcfg->mac[i]);
         rc = nic_report_address(nic, &nic_addr);
@@ -342 +343 @@
                 goto fail;
 
-        ddf_msg(LVL_NOTE, "MAC address: %02x:%02x:%02x:%02x:%02x:%02x",
+        ddf_msg(LVL_NOTE, "MAC address: " PRIMAC,
             nic_addr.address[0], nic_addr.address[1], nic_addr.address[2],
             nic_addr.address[3], nic_addr.address[4], nic_addr.address[5]);

uspace/drv/nic/virtio-net/virtio-net.h

@@ -32 +32 @@
 #include <virtio-pci.h>
 #include <abi/cap.h>
+#include <nic/nic.h>
 
 #define RX_BUFFERS      8
@@ -59 +60 @@
 
 typedef struct {
-        uint8_t mac[6];
+        uint8_t mac[ETH_ADDR];
 } virtio_net_cfg_t;