X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Ftarget%2Finc%2Fusb_defs.h;h=2d0af6948bf3e53cb708cfaee05e5d01d27431b4;hp=109071a20ed7d960ce9fe5dfccb25f604f68e912;hb=dfa06293860bce521be12dfa99a8cdb3aaf430e2;hpb=5b3ebda88a761069c407f3c20d70b6fe93f8e888

diff --git a/target_firmware/magpie_fw_dev/target/inc/usb_defs.h b/target_firmware/magpie_fw_dev/target/inc/usb_defs.h
index 109071a..2d0af69 100755
--- a/target_firmware/magpie_fw_dev/target/inc/usb_defs.h
+++ b/target_firmware/magpie_fw_dev/target/inc/usb_defs.h
@@ -63,15 +63,14 @@
 #define mADDR(addr)             				(*mpADDR(addr))
 #define muADDR(addr)            				((uint16_t) (&(addr)))
 
-#define USB_BYTE_REG_WRITE(addr, val)       	HAL_BYTE_REG_WRITE(USB_CTRL_BASE_ADDRESS|(uint8_t)(addr^3), (val))
-#define USB_BYTE_REG_READ(addr)             	HAL_BYTE_REG_READ(USB_CTRL_BASE_ADDRESS|(uint8_t)(addr^3))
-//#define USB_BYTE_REG_READ(addr)             	HAL_BYTE_REG_READ(USB_CTRL_BASE_ADDRESS|(uint8_t)(addr))
+#define USB_BYTE_REG_WRITE(addr, val)		iowrite8_usb(addr, val)
+#define USB_BYTE_REG_READ(addr)			ioread8_usb(addr)
 
-#define USB_HALF_WORD_REG_WRITE(addr, val)      HAL_HALF_WORD_REG_WRITE(USB_CTRL_BASE_ADDRESS|(uint16_t)(addr), (val))
-#define USB_HALF_WORD_REG_READ(addr)            HAL_HALF_WORD_REG_READ(USB_CTRL_BASE_ADDRESS|(uint16_t)(addr))
+#define USB_HALF_WORD_REG_WRITE(addr, val)	iowrite16_usb(addr, val)
+#define USB_HALF_WORD_REG_READ(addr)		ioread16_usb(addr)
 
-#define USB_WORD_REG_WRITE(addr, val)       	HAL_WORD_REG_WRITE(USB_CTRL_BASE_ADDRESS|(uint32_t)(addr), (val))
-#define USB_WORD_REG_READ(addr)             	HAL_WORD_REG_READ(USB_CTRL_BASE_ADDRESS|(uint32_t)(addr))
+#define USB_WORD_REG_WRITE(addr, val)		iowrite32_usb(addr, val)
+#define USB_WORD_REG_READ(addr)			ioread32_usb(addr)
 
 
 /************************** Register Deinition ***************************/