diff --git a/lib/CPUs/MIPS/bsp/examples/dbg.c b/lib/CPUs/MIPS/bsp/examples/dbg.c index f20e516..f5b5391 100644 --- a/lib/CPUs/MIPS/bsp/examples/dbg.c +++ b/lib/CPUs/MIPS/bsp/examples/dbg.c @@ -49,7 +49,7 @@ void dbg_handler(struct xcptcontext * xcp) UINT32 bp_addr, bp_index = 0, branch_addr, reg, result, bp_type; int junk, i, leave_isr, is_branch_shadow, is_user_bp; - UINT32 volatile *pBtn = (UINT32*)sys_gpio0; + UINT32 volatile *pBtn = (UINT32*)SYS_GPIO0; UINT32 *pInstr, *pAddr_curr, *pAddr_prev, *pAddr_next; sputs("\n"); diff --git a/lib/CPUs/MIPS/bsp/examples/gunzip.c b/lib/CPUs/MIPS/bsp/examples/gunzip.c index 550cf88..066c88e 100644 --- a/lib/CPUs/MIPS/bsp/examples/gunzip.c +++ b/lib/CPUs/MIPS/bsp/examples/gunzip.c @@ -19,8 +19,8 @@ volatile int file_len; void handler3(void) { - volatile UINT32 *pUART_stat = (UINT32*)sys_uart0_stat; - volatile UINT32 *pUART_data = (UINT32*)sys_uart0_data; + volatile UINT32 *pUART_stat = (UINT32*)SYS_UART0_STAT; + volatile UINT32 *pUART_data = (UINT32*)SYS_UART0_DATA; while(0x200 & *pUART_stat) { @@ -45,7 +45,7 @@ int READBYTE(z_stream *zs) { #define MAX_BUFOUT 16*1024*1024 int main(int argc, char **argv) { - volatile UINT32 *pUART_stat = (UINT32*)sys_uart0_stat; + volatile UINT32 *pUART_stat = (UINT32*)SYS_UART0_STAT; unsigned char outData[MAX_BUFOUT]; FILE *infp; int i, gpflags, tmp[4]; diff --git a/lib/CPUs/MIPS/bsp/examples/life.c b/lib/CPUs/MIPS/bsp/examples/life.c index a9ebd8f..e129481 100644 --- a/lib/CPUs/MIPS/bsp/examples/life.c +++ b/lib/CPUs/MIPS/bsp/examples/life.c @@ -188,8 +188,8 @@ void nextGeneration( int* matrix, int* future ) { void gx_init(void) { - volatile UINT32 *pVGA_ctrl = (UINT32*)sys_vga_ctrl; - volatile UINT32 *pVGA_moffs = (UINT32*)sys_vga_moffs; + volatile UINT32 *pVGA_ctrl = (UINT32*)SYS_VGA_CTRL; + volatile UINT32 *pVGA_moffs = (UINT32*)SYS_VGA_MOFFS; sleep(500); @@ -197,7 +197,7 @@ void gx_init(void) memset(g_gx_buff, 0, SCREEN_X*SCREEN_Y*sizeof(UINT32)); printf("g_gx_buff : %8.8X\n", (UINT32)g_gx_buff); - *pVGA_ctrl |= sys_vga_bit_msten; + *pVGA_ctrl |= SYS_VGA_BIT_MSTEN; *pVGA_moffs = (UINT32)g_gx_buff; } @@ -208,7 +208,7 @@ int main( int argc, char* argv[] ) { int* matrix; int* future; - volatile UINT32 *pBtn = (UINT32*)sys_gpio0; + volatile UINT32 *pBtn = (UINT32*)SYS_GPIO0; // lcdEnableDisplay( 1 ); // lcdSetColor( 1 ); diff --git a/lib/CPUs/MIPS/bsp/examples/r3.c b/lib/CPUs/MIPS/bsp/examples/r3.c index 81eadcc..2e56bab 100644 --- a/lib/CPUs/MIPS/bsp/examples/r3.c +++ b/lib/CPUs/MIPS/bsp/examples/r3.c @@ -441,10 +441,10 @@ do_line(y) main() { #ifdef JMIPS_VGA - volatile UINT32 *pVGA_ctrl = (UINT32*)sys_vga_ctrl; - volatile UINT32 *pVGA_moffs = (UINT32*)sys_vga_moffs; - volatile UINT32 *pVGA_resx = (UINT32*)sys_vga_resx; - volatile UINT32 *pVGA_resy = (UINT32*)sys_vga_resy; + volatile UINT32 *pVGA_ctrl = (UINT32*)SYS_VGA_CTRL; + volatile UINT32 *pVGA_moffs = (UINT32*)SYS_VGA_MOFFS; + volatile UINT32 *pVGA_resx = (UINT32*)SYS_VGA_RESX; + volatile UINT32 *pVGA_resy = (UINT32*)SYS_VGA_RESY; UINT64 *pPixelBuf; xsize = *pVGA_resx; @@ -455,7 +455,7 @@ main() printf("pPixelBuf : %8.8X\n", (UINT32)pPixelBuf); *pVGA_moffs = (UINT32)pPixelBuf; - *pVGA_ctrl |= sys_vga_bit_msten; + *pVGA_ctrl |= SYS_VGA_BIT_MSTEN; memset(pPixelBuf, 0, xsize*ysize*sizeof(UINT32)); #else diff --git a/lib/CPUs/MIPS/bsp/examples/test_exception.c b/lib/CPUs/MIPS/bsp/examples/test_exception.c index f9e9354..eac7394 100644 --- a/lib/CPUs/MIPS/bsp/examples/test_exception.c +++ b/lib/CPUs/MIPS/bsp/examples/test_exception.c @@ -38,7 +38,7 @@ void _exc_arith(void) void _exc_store_err(void) { - volatile int *pSrc = (int*)sys_timer_sec; + volatile int *pSrc = (int*)SYS_TIMER_SEC; volatile int *pDst = (int*)0x40000001; *pDst = *pSrc;