Changes in uspace/drv/nic/rtl8139/driver.c [c9e88da:3f74275] in mainline

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (7 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -125 +125 @@
 
 
-/** Set interrupts on controller
+/** Disable interrupts on controller
  *
  *  @param rtl8139  The card private structure
  */
-inline static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
+inline static void rtl8139_hw_int_disable(rtl8139_t *rtl8139)
+{
+        pio_write_16(rtl8139->io_port + IMR, 0x0);
+}
+/** Enable interrupts on controller
+ *
+ *  @param rtl8139  The card private structure
+ */
+inline static void rtl8139_hw_int_enable(rtl8139_t *rtl8139)
 {
         pio_write_16(rtl8139->io_port + IMR, rtl8139->int_mask);
@@ -266 +274 @@
 }
 
+/**  Provide OR in the 32bit register (set selected bits to 1)
+ *
+ *   @param rtl8139     The rtl8139 structure
+ *   @param reg_offset  Register offset in the device IO space
+ *   @param bits_add    The value to or
+ */
+inline static void rtl8139_hw_reg_add_32(rtl8139_t * rtl8139, size_t reg_offset,
+    uint32_t bits_add)
+{
+        uint32_t value = pio_read_32(rtl8139->io_port + reg_offset);
+        value |= bits_add;
+        pio_write_32(rtl8139->io_port + reg_offset, value);
+}
+
 /**  Unset selected bits in 8bit register
  *
@@ -279 +301 @@
         pio_write_8(rtl8139->io_port + reg_offset, value);
 }
+
+/**  Unset selected bits in 32bit register
+ *
+ *   @param rtl8139     The rtl8139 structure
+ *   @param reg_offset  Register offset in the device IO space
+ *   @param bits_add    The mask of bits to remove
+ */
+inline static void rtl8139_hw_reg_rem_32(rtl8139_t * rtl8139, size_t reg_offset,
+    uint32_t bits_add)
+{
+        uint32_t value = pio_read_32(rtl8139->io_port + reg_offset);
+        value &= ~bits_add;
+        pio_write_32(rtl8139->io_port + reg_offset, value);
+}
+
 
 static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *);
@@ -834 +871 @@
 
         /* Turn the interrupts on again */
-        rtl8139_hw_int_set(rtl8139);
+        rtl8139_hw_int_enable(rtl8139);
 };
 
@@ -918 +955 @@
 
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
-        rtl8139_hw_int_set(rtl8139);
+        rtl8139_hw_int_enable(rtl8139);
 
         int rc = irc_enable_interrupt(rtl8139->irq);
@@ -2083 +2120 @@
                 /* Disable timer interrupts while working with timer-related data */
                 rtl8139->int_mask = 0;
-                rtl8139_hw_int_set(rtl8139);
+                rtl8139_hw_int_enable(rtl8139);
 
                 rtl8139->poll_timer = new_timer;
@@ -2106 +2143 @@
         }
 
-        rtl8139_hw_int_set(rtl8139);
+        rtl8139_hw_int_enable(rtl8139);
 
         fibril_mutex_unlock(&rtl8139->rx_lock);