From 56f516bc8ac63671d32ceb6c06addd530c21bc33 Mon Sep 17 00:00:00 2001 From: nakasima Date: Mon, 19 Nov 2007 00:21:35 +0000 Subject: [PATCH] arrange pxi common defines. git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@318 4ee2a332-4b2b-5046-8439-1ba90f034370 --- include/nitro/pxi/common/regname.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/include/nitro/pxi/common/regname.h b/include/nitro/pxi/common/regname.h index a0ffe5e..70e1ba8 100644 --- a/include/nitro/pxi/common/regname.h +++ b/include/nitro/pxi/common/regname.h @@ -42,7 +42,7 @@ PXIProc; #ifdef SDK_ARM9 -#define PXI_PROC_ARM PXI_PROC_ARM9 +#define PXI_PROC_ARM PXI_PROC_ARM9 #define reg_PXI_FIFO_CNT reg_PXI_SUBP_FIFO_CNT #define REG_PXI_FIFO_CNT_ERR_MASK REG_PXI_SUBP_FIFO_CNT_ERR_MASK @@ -55,17 +55,18 @@ PXIProc; #define REG_PXI_FIFO_CNT_RECV_EMP_SHIFT REG_PXI_SUBP_FIFO_CNT_RECV_EMP_SHIFT #define REG_PXI_FIFO_CNT_E_MASK REG_PXI_SUBP_FIFO_CNT_E_MASK +#define REG_PXI_INTF_ADDR REG_SUBPINTF_ADDR #define reg_PXI_INTF reg_PXI_SUBPINTF -#define REG_PXI_INTF_I_MASK REG_PXI_SUBPINTF_I_MASK -#define REG_PXI_INTF_IREQ_MASK REG_PXI_SUBPINTF_IREQ_MASK -#define REG_PXI_INTF_SEND_MASK REG_PXI_SUBPINTF_A9STATUS_MASK -#define REG_PXI_INTF_SEND_SHIFT REG_PXI_SUBPINTF_A9STATUS_SHIFT -#define REG_PXI_INTF_RECV_MASK REG_PXI_SUBPINTF_A7STATUS_MASK -#define REG_PXI_INTF_RECV_SHIFT REG_PXI_SUBPINTF_A7STATUS_SHIFT +#define REG_PXI_INTF_I_MASK REG_PXI_SUBPINTF_I_MASK +#define REG_PXI_INTF_IREQ_MASK REG_PXI_SUBPINTF_IREQ_MASK +#define REG_PXI_INTF_SEND_MASK REG_PXI_SUBPINTF_A9STATUS_MASK +#define REG_PXI_INTF_SEND_SHIFT REG_PXI_SUBPINTF_A9STATUS_SHIFT +#define REG_PXI_INTF_RECV_MASK REG_PXI_SUBPINTF_A7STATUS_MASK +#define REG_PXI_INTF_RECV_SHIFT REG_PXI_SUBPINTF_A7STATUS_SHIFT #else // SDK_ARM7 -#define PXI_PROC_ARM PXI_PROC_ARM7 +#define PXI_PROC_ARM PXI_PROC_ARM7 #define reg_PXI_FIFO_CNT reg_PXI_MAINP_FIFO_CNT #define REG_PXI_FIFO_CNT_ERR_MASK REG_PXI_MAINP_FIFO_CNT_ERR_MASK @@ -78,13 +79,14 @@ PXIProc; #define REG_PXI_FIFO_CNT_RECV_EMP_SHIFT REG_PXI_MAINP_FIFO_CNT_RECV_EMP_SHIFT #define REG_PXI_FIFO_CNT_E_MASK REG_PXI_MAINP_FIFO_CNT_E_MASK +#define REG_PXI_INTF_ADDR REG_MAINPINTF_ADDR #define reg_PXI_INTF reg_PXI_MAINPINTF -#define REG_PXI_INTF_I_MASK REG_PXI_MAINPINTF_I_MASK -#define REG_PXI_INTF_IREQ_MASK REG_PXI_MAINPINTF_IREQ_MASK -#define REG_PXI_INTF_SEND_MASK REG_PXI_MAINPINTF_A7STATUS_MASK -#define REG_PXI_INTF_SEND_SHIFT REG_PXI_MAINPINTF_A7STATUS_SHIFT -#define REG_PXI_INTF_RECV_MASK REG_PXI_MAINPINTF_A9STATUS_MASK -#define REG_PXI_INTF_RECV_SHIFT REG_PXI_MAINPINTF_A9STATUS_SHIFT +#define REG_PXI_INTF_I_MASK REG_PXI_MAINPINTF_I_MASK +#define REG_PXI_INTF_IREQ_MASK REG_PXI_MAINPINTF_IREQ_MASK +#define REG_PXI_INTF_SEND_MASK REG_PXI_MAINPINTF_A7STATUS_MASK +#define REG_PXI_INTF_SEND_SHIFT REG_PXI_MAINPINTF_A7STATUS_SHIFT +#define REG_PXI_INTF_RECV_MASK REG_PXI_MAINPINTF_A9STATUS_MASK +#define REG_PXI_INTF_RECV_SHIFT REG_PXI_MAINPINTF_A9STATUS_SHIFT #endif