diff options
| author | bernard.xiong <[email protected]> | 2010-10-09 09:20:28 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-10-09 09:20:28 +0000 |
| commit | da7bbdb0dfceec4d45d9fd666f73ec4656723fcc (patch) | |
| tree | 0999339e55f1dae6cd0d6c101b87958bb72b467b | |
| parent | d56c91e32265a0a6f0855483b31d5ee7ba8fa57d (diff) | |
remove interrupt.h and compiling error in jz47xx branch.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1005 bbd45198-f89e-11dd-88c7-29a3b14d5316
| -rw-r--r-- | bsp/jz47xx/application.c | 1 | ||||
| -rw-r--r-- | libcpu/mips/jz47xx/interrupt.c | 1 | ||||
| -rw-r--r-- | libcpu/mips/jz47xx/interrupt.h | 28 | ||||
| -rw-r--r-- | libcpu/mips/jz47xx/jz47xx.h | 2 |
4 files changed, 2 insertions, 30 deletions
diff --git a/bsp/jz47xx/application.c b/bsp/jz47xx/application.c index 2b6ce42b41..f4bf3ba65c 100644 --- a/bsp/jz47xx/application.c +++ b/bsp/jz47xx/application.c @@ -19,7 +19,6 @@ #include <rtthread.h> #include <jz4755.h> -#include <mipsregs.h> static struct rt_thread thread1; static rt_uint8_t thread1_stack[1024]; diff --git a/libcpu/mips/jz47xx/interrupt.c b/libcpu/mips/jz47xx/interrupt.c index 8a9bd84e6f..d7aa0ea209 100644 --- a/libcpu/mips/jz47xx/interrupt.c +++ b/libcpu/mips/jz47xx/interrupt.c @@ -13,7 +13,6 @@ */
#include <rtthread.h>
#include "jz47xx.h"
-#include "interrupt.h"
#define JZ47XX_MAX_INTR 32
diff --git a/libcpu/mips/jz47xx/interrupt.h b/libcpu/mips/jz47xx/interrupt.h deleted file mode 100644 index d92d7cfcbd..0000000000 --- a/libcpu/mips/jz47xx/interrupt.h +++ /dev/null @@ -1,28 +0,0 @@ -/*
- * File : interrupt.h
- * Change Logs:
- * Date Author Notes
- * 2010-05-17 swkyer first version
- */
-#ifndef __IRQ_H__
-#define __IRQ_H__
-
-
-/* Interrupt Numbers */
-#define AXXXX_UART_INT 0
-#define AXXXX_USB_INT 1
-#define AXXXX_RTC_INT 2
-#define AXXXX_DMA_INT 3
-#define AXXXX_EXTERNAL_INT 4
-#define AXXXX_SPI_INT 5
-#define AXXXX_I2C1_INT 6
-#define AXXXX_I2C2_INT 7
-#define AXXXX_ADC_INT 8
-#define AXXXX_DAC_INT 9
-#define AXXXX_FLASH_INT 10
-
-#define AXXXX_CP0_COUNT_INT 11
-#define AXXXX_MAX_INTR 12
-
-
-#endif /* end of __IRQ_H__ */
diff --git a/libcpu/mips/jz47xx/jz47xx.h b/libcpu/mips/jz47xx/jz47xx.h index e530680d75..8f06bd369e 100644 --- a/libcpu/mips/jz47xx/jz47xx.h +++ b/libcpu/mips/jz47xx/jz47xx.h @@ -1,6 +1,8 @@ #ifndef __JZ47XX_H__
#define __JZ47XX_H__
+#include "../common/mipsregs.h"
+
#define __REG8(addr) *((volatile unsigned char *)(addr))
#define __REG16(addr) *((volatile unsigned short *)(addr))
#define __REG32(addr) *((volatile unsigned int *)(addr))
|