From dfa06293860bce521be12dfa99a8cdb3aaf430e2 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <linux@rempel-privat.de>
Date: Fri, 23 May 2014 18:36:16 +0200
Subject: [PATCH] remove all HAL_*_READ/WRITE defines

we do not need them any more

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
---
 .../magpie_fw_dev/target/inc/k2/k2/reg_defs.h | 23 -------------------
 .../magpie_fw_dev/target/inc/k2/uart_api.h    |  4 ----
 .../target/inc/magpie/magpie/reg_defs.h       | 23 -------------------
 .../target/inc/magpie/uart_api.h              |  4 ----
 .../magpie_fw_dev/target/inc/usb_defs.h       | 13 +++++------
 5 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/k2/reg_defs.h b/target_firmware/magpie_fw_dev/target/inc/k2/k2/reg_defs.h
index a8fd478..12e160f 100755
--- a/target_firmware/magpie_fw_dev/target/inc/k2/k2/reg_defs.h
+++ b/target_firmware/magpie_fw_dev/target/inc/k2/k2/reg_defs.h
@@ -52,29 +52,6 @@
 #define BIT_SET(bit)	(1<<bit)
 #define BIT_CLR(bit)	(0<<bit)
 
-#define HAL_WORD_REG_WRITE(addr, val)					\
-	do {								\
-		(*((volatile uint32_t *)(addr&0xfffffffc))) = (uint32_t)(val); \
-	} while (0)
-
-#define HAL_WORD_REG_READ(addr) (*((volatile uint32_t *)(addr&0xfffffffc)))
-
-
-#define HAL_HALF_WORD_REG_WRITE(addr, val)				\
-	do {								\
-		(*((volatile uint16_t *)(addr&0xfffffffe))) = (uint16_t)(val); \
-	} while (0)
-
-#define HAL_HALF_WORD_REG_READ(addr) (*((volatile uint16_t *)(addr&0xfffffffe))) 
-
-
-#define HAL_BYTE_REG_WRITE(addr, val)					\
-	do {								\
-		(*((volatile uint8_t *)(addr))) = (uint8_t)(val);	\
-	} while (0)
-
-#define HAL_BYTE_REG_READ(addr) (*((volatile uint8_t *)(addr))) 
-
 /***** REGISTER BASE ADDRESS DEFINITION *****/
 #define RESET_VECTOR_ADDRESS        0x8e0000
 /********************************************/
diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/uart_api.h b/target_firmware/magpie_fw_dev/target/inc/k2/uart_api.h
index a455957..b30c7b5 100755
--- a/target_firmware/magpie_fw_dev/target/inc/k2/uart_api.h
+++ b/target_firmware/magpie_fw_dev/target/inc/k2/uart_api.h
@@ -50,10 +50,6 @@
 
 #include "k2/reg_defs.h"
 
-/************************* Register Process marco ************************/
-#define UART_REG_WRITE(addr, val)       HAL_WORD_REG_WRITE(UART_BASE_ADDRESS|(uint32_t)(addr), (val))
-#define UART_REG_READ(addr)             HAL_WORD_REG_READ(UART_BASE_ADDRESS|(uint32_t)(addr))
-
 /************************** Register deinition ***************************/
 #define RBR_ADDRESS                              0x00051000
 #define RBR_OFFSET                               0x00000000
diff --git a/target_firmware/magpie_fw_dev/target/inc/magpie/magpie/reg_defs.h b/target_firmware/magpie_fw_dev/target/inc/magpie/magpie/reg_defs.h
index 378a13d..11ad649 100755
--- a/target_firmware/magpie_fw_dev/target/inc/magpie/magpie/reg_defs.h
+++ b/target_firmware/magpie_fw_dev/target/inc/magpie/magpie/reg_defs.h
@@ -52,29 +52,6 @@
 #define BIT_SET(bit)	(1<<bit)
 #define BIT_CLR(bit)	(0<<bit)
 
-#define HAL_WORD_REG_WRITE(addr, val)                                              \
-    do {                                                                            \
-        (*((volatile uint32_t *)(addr&0xfffffffc))) = (uint32_t)(val);              \
-    } while (0)
-
-#define HAL_WORD_REG_READ(addr) (*((volatile uint32_t *)(addr&0xfffffffc)))
-
-
-#define HAL_HALF_WORD_REG_WRITE(addr, val)                                              \
-    do {                                                                            \
-        (*((volatile uint16_t *)(addr&0xfffffffe))) = (uint16_t)(val);    \
-    } while (0)
-
-#define HAL_HALF_WORD_REG_READ(addr) (*((volatile uint16_t *)(addr&0xfffffffe))) 
-
-
-#define HAL_BYTE_REG_WRITE(addr, val)                                               \
-    do {                                                                            \
-        (*((volatile uint8_t *)(addr))) = (uint8_t)(val);                           \
-    } while (0)
-
-#define HAL_BYTE_REG_READ(addr) (*((volatile uint8_t *)(addr))) 
-
 /***** REGISTER BASE ADDRESS DEFINITION *****/
 #define RESET_VECTOR_ADDRESS        0x8e0000
 /********************************************/
diff --git a/target_firmware/magpie_fw_dev/target/inc/magpie/uart_api.h b/target_firmware/magpie_fw_dev/target/inc/magpie/uart_api.h
index b13f362..3492a1d 100755
--- a/target_firmware/magpie_fw_dev/target/inc/magpie/uart_api.h
+++ b/target_firmware/magpie_fw_dev/target/inc/magpie/uart_api.h
@@ -50,10 +50,6 @@
 
 #include "reg_defs.h"
 
-/************************* Register Process marco ************************/
-#define UART_REG_WRITE(addr, val)       HAL_WORD_REG_WRITE(UART_BASE_ADDRESS|(uint32_t)(addr), (val))
-#define UART_REG_READ(addr)             HAL_WORD_REG_READ(UART_BASE_ADDRESS|(uint32_t)(addr))
-
 /************************** Register deinition ***************************/
 #define RBR_ADDRESS                              0x00051000
 #define RBR_OFFSET                               0x00000000
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 ***************************/
-- 
2.31.1