Changeset 462054a in mainline for uspace/drv/bus/usb/ar9271/wmi.c

Timestamp:

2015-01-29T17:46:19Z (9 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

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

Children:

ab365c4

Parents:

01784d2

Message:

Finished HW initialization (but skipped several things, will finish them later if they will be necessary) and finally bringed up device led light

File:

• uspace/drv/bus/usb/ar9271/wmi.c (modified) (4 diffs)

uspace/drv/bus/usb/ar9271/wmi.c

@@ -115 +115 @@
  * @return EOK if succeed, negative error code otherwise.
  */
-int wmi_reg_rmw(htc_device_t *htc_device, uint32_t reg_offset, 
+int wmi_reg_clear_set_bit(htc_device_t *htc_device, uint32_t reg_offset, 
         uint32_t set_bit, uint32_t clear_bit)
 {
@@ -127 +127 @@
         }
         
+        value &= ~clear_bit;
         value |= set_bit;
-        value &= ~clear_bit;
         
         rc = wmi_reg_write(htc_device, reg_offset, value);
@@ -152 +152 @@
         uint32_t set_bit)
 {
-        return wmi_reg_rmw(htc_device, reg_offset, set_bit, 0);
+        return wmi_reg_clear_set_bit(htc_device, reg_offset, set_bit, 0);
 }
 
@@ -167 +167 @@
         uint32_t clear_bit)
 {
-        return wmi_reg_rmw(htc_device, reg_offset, 0, clear_bit);
+        return wmi_reg_clear_set_bit(htc_device, reg_offset, 0, clear_bit);
 }