diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-27 17:25:53 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-27 17:25:53 +0000 |
| commit | ae7325bdc85e1dd39f039b66ba20ca681712dcc3 (patch) | |
| tree | b90f303df4b2cefcd3155f164e16d177bcfb18f9 /c/src/lib/libbsp/i960/rxgen960/include | |
| parent | Added CVS Ids and a basic header. More header cleanup needed. (diff) | |
| download | rtems-ae7325bdc85e1dd39f039b66ba20ca681712dcc3.tar.bz2 | |
rxgen960 now compiles -- may not link.
Diffstat (limited to 'c/src/lib/libbsp/i960/rxgen960/include')
| -rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/include/bsp.h | 18 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h | 12 |
2 files changed, 10 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h index a45e8221eb..52f8258010 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h +++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h @@ -90,9 +90,9 @@ extern "C" { * Returns the PRCB pointer. */ -static inline PRCB *get_prcb( void ) +static inline i960_PRCB *get_prcb( void ) { - register PRCB *_prcb = 0; + register i960_PRCB *_prcb = 0; asm volatile( "calls 5; \ mov g0,%0" \ @@ -118,18 +118,8 @@ static inline PRCB *get_prcb( void ) extern rtems_configuration_table BSP_Configuration; -BSP_EXTERN PRCB *Prcb; -BSP_EXTERN CNTL_TBL *Ctl_tbl; - -/* -#if defined(i960ca) -BSP_EXTERN i960ca_control_table *Ctl_tbl; -#elif defined(i960rp) -BSP_EXTERN i960rp_control_table *Ctl_tbl; -#else -#error "invalid processor selection!" -#endif -*/ +BSP_EXTERN i960_PRCB *Prcb; +BSP_EXTERN i960_control_table *Ctl_tbl; /* * Device Driver Table Entries diff --git a/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h b/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h index d424397299..e637fa7bf0 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h +++ b/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h @@ -8,11 +8,11 @@ #define __PMC901_CONFIG__
/* The following define the PMC960 bus regions */
/* Bus configuration */
-#define RP_CONFIG_REGS BUS_WIDTH(32)
-#define FLASH BUS_WIDTH(8)
-#define DRAM BUS_WIDTH(32)
-#define UART_LED BUS_WIDTH(8)
-#define DEFAULT BUS_WIDTH(32)
+#define RP_CONFIG_REGS I960RP_BUS_WIDTH(32)
+#define FLASH I960RP_BUS_WIDTH(8)
+#define DRAM I960RP_BUS_WIDTH(32)
+#define UART_LED I960RP_BUS_WIDTH(8)
+#define DEFAULT I960RP_BUS_WIDTH(32)
/* Region Configuration */
#define REGION_0_CONFIG RP_CONFIG_REGS
@@ -23,7 +23,7 @@ #define REGION_A_CONFIG DRAM
#define REGION_C_CONFIG UART_LED
#define REGION_E_CONFIG DEFAULT
-/* #define REGION_BOOT_CONFIG (FLASH | BYTE_ORDER)*/
+/* #define REGION_BOOT_CONFIG (FLASH | I960RP_ZBYTE_ORDER)*/
#define REGION_BOOT_CONFIG (DRAM)
/* #define DRAM_BASE 0xfed00000 */
|