From a4318d0cccc9f0a3434c48305a9f7291d79575ac Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:39:50 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, include/bare.h, include/bsp.h, include/crc.h, startup/bspstart.c, startup/cpuboot.c, startup/crc.c, startup/gdb-hooks.c, startup/m68302scc.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c | 4 ++-- c/src/lib/libbsp/m68k/ods68302/startup/crc.c | 12 ++++++------ c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c | 14 +++++++------- c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp/m68k/ods68302/startup') diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c index d5c27b2064..eb5bde8e54 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c @@ -38,7 +38,7 @@ char *rtems_progname; */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ /* diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c index 0e7130dc8c..d28366d011 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c @@ -95,7 +95,7 @@ void boot_phase_1() void boot_phase_2(void) { - rtems_unsigned32 stack; + uint32_t stack; #if defined(LED_CONTROL) LED_CONTROL(LED_1_RED, LED_2_RED, LED_3_OFF, LED_4_OFF, @@ -111,7 +111,7 @@ void boot_phase_2(void) #endif /* seems to want 2, looked at assember code output */ - *((volatile rtems_unsigned32*) (&stack + 2)) |= ROM_BASE; + *((volatile uint32_t*) (&stack + 2)) |= ROM_BASE; } /* diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/crc.c b/c/src/lib/libbsp/m68k/ods68302/startup/crc.c index b589ccd2ba..3e3ff4ab5b 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/crc.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/crc.c @@ -18,7 +18,7 @@ */ -static const rtems_unsigned16 factor[] = +static const uint16_t factor[] = { 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, @@ -66,12 +66,12 @@ static const rtems_unsigned16 factor[] = Calculates the CRC value of a block of memory */ -rtems_unsigned16 calc_crc(void* vdata, /* pointer to memory block */ - rtems_unsigned32 count) /* length of block in bytes */ +uint16_t calc_crc(void* vdata, /* pointer to memory block */ + uint32_t count) /* length of block in bytes */ { - register rtems_unsigned8 *data = vdata; - register rtems_unsigned16 crc; - register rtems_unsigned32 byte; + register uint8_t *data = vdata; + register uint16_t crc; + register uint32_t byte; /* initialise to either 0x0 or 0xffff depending on the CRC implementation */ diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c b/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c index 64d220219f..601e037809 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c @@ -45,10 +45,10 @@ char getDebugChar(void) void (*exceptionHook)(unsigned int) = 0; typedef struct { - rtems_unsigned16 move_a7; /* move #FORMAT_ID,%a7@- */ - rtems_unsigned16 format_id; - rtems_unsigned16 jmp; /* jmp _ISR_Handlers */ - rtems_unsigned32 isr_handler; + uint16_t move_a7; /* move #FORMAT_ID,%a7@- */ + uint16_t format_id; + uint16_t jmp; /* jmp _ISR_Handlers */ + uint32_t isr_handler; } GDB_HANDLER_ENTRY; #if !defined(M68K_MOVE_A7) @@ -64,13 +64,13 @@ static GDB_HANDLER_ENTRY gdb_jump_table[256]; void exceptionHandler(unsigned int vector, void *handler) { - rtems_unsigned32 *interrupt_table = 0; + uint32_t *interrupt_table = 0; gdb_jump_table[vector].move_a7 = M68K_MOVE_A7; gdb_jump_table[vector].format_id = vector; gdb_jump_table[vector].jmp = M68K_JMP; - gdb_jump_table[vector].isr_handler = (rtems_unsigned32) handler; + gdb_jump_table[vector].isr_handler = (uint32_t) handler; - interrupt_table[vector] = (rtems_unsigned32) &gdb_jump_table[vector]; + interrupt_table[vector] = (uint32_t) &gdb_jump_table[vector]; } diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c b/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c index 77d7867a21..5b06c6c2c8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c @@ -18,7 +18,7 @@ static volatile m302_SCC_t *scc[M68302_SCC_COUNT] = { 0, 0, 0 }; static volatile m302_SCC_Registers_t *scc_reg[M68302_SCC_COUNT] = { 0, 0, 0 }; static int scc_translate[M68302_SCC_COUNT] = { 0, 0, 0 }; -static const rtems_unsigned16 baud_clocks[] = +static const uint16_t baud_clocks[] = { (SYSTEM_CLOCK / ( 4800 * 16)), (SYSTEM_CLOCK / ( 9600 * 16)), @@ -30,7 +30,7 @@ static const rtems_unsigned16 baud_clocks[] = void scc_initialise(int channel, int baud, int translate) { - rtems_unsigned16 scon; + uint16_t scon; if (channel < M68302_SCC_COUNT) { @@ -47,12 +47,12 @@ void scc_initialise(int channel, int baud, int translate) scc[channel]->bd.tx[0].status = 0x2000; scc[channel]->bd.tx[0].length = 0; scc[channel]->bd.tx[0].buffer = - (rtems_unsigned8*) &(scc[channel]->bd.tx[1].buffer); + (uint8_t*) &(scc[channel]->bd.tx[1].buffer); scc[channel]->bd.rx[0].status = 0x2000; scc[channel]->bd.rx[0].length = 0; scc[channel]->bd.rx[0].buffer = - (rtems_unsigned8*) &(scc[channel]->bd.rx[1].buffer); + (uint8_t*) &(scc[channel]->bd.rx[1].buffer); scc[channel]->parm.rfcr = 0x50; scc[channel]->parm.tfcr = 0x50; @@ -78,7 +78,7 @@ void scc_initialise(int channel, int baud, int translate) unsigned char scc_status(int channel, unsigned char status) { - rtems_unsigned16 rx_status; + uint16_t rx_status; m302.reg.wcn = 0; -- cgit v1.2.3