-/**
- * @brief Write a 64-bit value into register
- *
- * @param[in] osdev platform device object
- * @param[in] addr register addr
- * @param[in] q the 64-bit value to be written
- */
-#define adf_os_reg_write64(osdev, addr, q) __adf_os_reg_write64(osdev, addr, q)
+ val = ioread32(addr);
+ val &= ~clr;
+ val |= set;
+ iowrite32(addr, val);
+}
+
+/* generic functions */
+#define io8_set(addr, s) io8_rmw((addr), (s), 0)
+#define io8_clr(addr, c) io8_rmw((addr), 0, (c))
+#define io32_set(addr, s) io32_rmw((addr), (s), 0)
+#define io32_clr(addr, c) io32_rmw((addr), 0, (c))
+
+/* mac specific functions */
+#define ioread32_mac(addr) ioread32(WLAN_BASE_ADDRESS + (addr))
+#define iowrite32_mac(addr, b) iowrite32(WLAN_BASE_ADDRESS + (addr), (b))
+
+/* usb specific functions */
+#define ioread8_usb(addr) ioread8(USB_CTRL_BASE_ADDRESS | (addr)^3)
+#define ioread16_usb(addr) ioread16(USB_CTRL_BASE_ADDRESS | (addr))
+#define ioread32_usb(addr) ioread32(USB_CTRL_BASE_ADDRESS | (addr))
+
+#define iowrite8_usb(addr, b) iowrite8(USB_CTRL_BASE_ADDRESS | (addr)^3, (b))
+#define iowrite16_usb(addr, b) iowrite16(USB_CTRL_BASE_ADDRESS | (addr), (b))
+#define iowrite32_usb(addr, b) iowrite32(USB_CTRL_BASE_ADDRESS | (addr), (b))
+
+#define io8_rmw_usb(addr, s, c) \
+ io8_rmw(USB_CTRL_BASE_ADDRESS | (addr)^3, (s), (c))
+#define io8_set_usb(addr, s) \
+ io8_rmw(USB_CTRL_BASE_ADDRESS | (addr)^3, (s), 0)
+#define io8_clr_usb(addr, c) \
+ io8_rmw(USB_CTRL_BASE_ADDRESS | (addr)^3, 0, (c))
+
+#define io32_rmw_usb(addr, s, c) \
+ io32_rmw(USB_CTRL_BASE_ADDRESS | (addr), (s), (c))
+#define io32_set_usb(addr, s) io32_rmw(USB_CTRL_BASE_ADDRESS | (addr), (s), 0)
+#define io32_clr_usb(addr, c) io32_rmw(USB_CTRL_BASE_ADDRESS | (addr), 0, (c))