Changeset 2ff9876 in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2014-08-12T21:44:45Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

aa2f865

Parents:

2f11e6c9

Message:

Added cleanup routine, added support for setting broadcast mode programmatically.

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -328 +328 @@
 }
 
+static void rtl8169_dev_cleanup(ddf_dev_t *dev)
+{
+        assert(dev);
+
+        if (ddf_dev_data_get(dev))
+                nic_unbind_and_destroy(dev);
+}
+
 static int rtl8169_dev_initialize(ddf_dev_t *dev)
 {
@@ -349 +357 @@
 failed:
         ddf_msg(LVL_ERROR, "The device initialization failed");
-//      rtl8139_dev_cleanup(dev);
+        rtl8169_dev_cleanup(dev);
         return ret;
 
@@ -464 +472 @@
 err_pio:
 err_destroy:
-        //rtl8169_dev_cleanup(dev);
+        rtl8169_dev_cleanup(dev);
         return rc;
 
@@ -730 +738 @@
         /* Configure Receive Control Register */
         uint32_t rcr = pio_read_32(rtl8169->regs + RCR);
-        rcr |= RCR_ACCEPT_ALL_PHYS | RCR_ACCEPT_PHYS_MATCH \
-            | RCR_ACCEPT_BROADCAST | RCR_ACCEPT_ERROR \
-            | RCR_ACCEPT_RUNT;
+        rcr |= RCR_ACCEPT_PHYS_MATCH | RCR_ACCEPT_ERROR | RCR_ACCEPT_RUNT;
         pio_write_32(rtl8169->regs + RCR, rcr);
         pio_write_16(rtl8169->regs + RMS, BUFFER_SIZE);
@@ -801 +807 @@
 static int rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode)
 {
+        rtl8169_t *rtl8169 = nic_get_specific(nic_data);
+        
+        /* Configure Receive Control Register */
+        uint32_t rcr = pio_read_32(rtl8169->regs + RCR);
+        rcr |= RCR_ACCEPT_BROADCAST;            
+        pio_write_32(rtl8169->regs + RCR, rcr);
         return EOK;
 }