Changeset 96e368a in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2014-07-21T17:15:31Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

cbfece7

Parents:

278fede

Message:

Implement MAC address changing.

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (5 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -79 +79 @@
 static inline int rtl8169_register_int_handler(nic_t *nic_data);
 static inline void rtl8169_get_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr);
-static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr);
+static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr);
 
 static void rtl8169_reset(rtl8169_t *rtl8169);
@@ -469 +469 @@
 static int rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
 {
+        nic_t *nic_data = nic_get_from_ddf_fun(fun);
+        rtl8169_t *rtl8169 = nic_get_specific(nic_data);
+        int rc;
+
+        rtl8169_set_hwaddr(rtl8169, addr);
+
+        rc = nic_report_address(nic_data, addr);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 }
@@ -476 +486 @@
 
         str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Realtek");
+        str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8169");
 
         return EOK;
@@ -967 +978 @@
 }
 
-static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr)
+static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr)
 {
         int i;
@@ -975 +986 @@
 
         for (i = 0; i < 6; i++)
-                addr->address[i] = pio_read_8(rtl8169->regs + MAC0 + i);
+                pio_write_8(rtl8169->regs + MAC0 + i, addr->address[i]);
 }