Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* clock/ckinit.c, console/concntl.h, console/console.c,
	include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using
	c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-31 04:21:06 +00:00
parent 945ace0d1e
commit 1d5c9757d7
7 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/i960/rxgen960/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* clock/ckinit.c, console/concntl.h, console/console.c,
include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using
c99 fixed size types.
2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect changes to bsp.am. * Makefile.am: Reflect changes to bsp.am.

8
c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
View File

@@ -25,11 +25,11 @@
#define CLOCK_VECTOR 0x92 #define CLOCK_VECTOR 0x92
rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ uint32_t Clock_isrs; /* ISRs until next tick */
rtems_unsigned32 Reload_Clock_isrs; uint32_t Reload_Clock_isrs;
i960_isr_entry Old_ticker; i960_isr_entry Old_ticker;
volatile rtems_unsigned32 Clock_driver_ticks; volatile uint32_t Clock_driver_ticks;
/* ticks since initialization */ /* ticks since initialization */
unsigned int clock_isr_global[16]; /* place to store global regs */ unsigned int clock_isr_global[16]; /* place to store global regs */
@@ -124,7 +124,7 @@ rtems_device_driver Clock_control(
void *pargp void *pargp
) )
{ {
rtems_unsigned32 isrlevel; uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp; rtems_libio_ioctl_args_t *args = pargp;
if (args == 0) if (args == 0)

2
c/src/lib/libbsp/i960/rxgen960/console/concntl.h
View File

@@ -12,5 +12,5 @@ typedef enum
typedef struct typedef struct
{ {
console_ioctl_t ioctl_type; console_ioctl_t ioctl_type;
unsigned32 param; uint32_t param;
} console_ioctl_request_t; } console_ioctl_request_t;

10
c/src/lib/libbsp/i960/rxgen960/console/console.c
View File

@@ -39,7 +39,7 @@ rtems_device_driver console_initialize(
{ {
rtems_status_code status; rtems_status_code status;
if ( console_pmr_init(*(unsigned32*)arg) ) if ( console_pmr_init(*(uint32_t*)arg) )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
@@ -158,9 +158,9 @@ rtems_device_driver console_read(
) )
{ {
rtems_libio_rw_args_t *rw_args; rtems_libio_rw_args_t *rw_args;
unsigned8 *buffer; uint8_t *buffer;
unsigned32 maximum; uint32_t maximum;
unsigned32 count = 0; uint32_t count = 0;
rw_args = (rtems_libio_rw_args_t *) arg; rw_args = (rtems_libio_rw_args_t *) arg;
@@ -203,7 +203,7 @@ rtems_device_driver console_write(
int count; int count;
int maximum; int maximum;
rtems_libio_rw_args_t *rw_args; rtems_libio_rw_args_t *rw_args;
unsigned8 *buffer; uint8_t *buffer;
rw_args = (rtems_libio_rw_args_t *) arg; rw_args = (rtems_libio_rw_args_t *) arg;

4
c/src/lib/libbsp/i960/rxgen960/include/bsp.h
View File

@@ -71,8 +71,8 @@ extern "C" {
*/ */
#define rtems_bsp_delay( microseconds ) \ #define rtems_bsp_delay( microseconds ) \
{ register rtems_unsigned32 _delay=(microseconds); \ { register uint32_t _delay=(microseconds); \
register rtems_unsigned32 _tmp = 0; /* initialized to avoid warning */ \ register uint32_t _tmp = 0; /* initialized to avoid warning */ \
asm volatile( "0: \ asm volatile( "0: \
remo 3,31,%0 ; \ remo 3,31,%0 ; \
cmpo 0,%0 ; \ cmpo 0,%0 ; \

8
c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
View File

@@ -67,11 +67,11 @@ bsp_pretasking_hook(void)
{ {
extern int end; extern int end;
rtems_unsigned32 heap_start; uint32_t heap_start;
*(unsigned char *)(0x120f) = 0xd; *(unsigned char *)(0x120f) = 0xd;
/* heap_start = (rtems_unsigned32) &end; */ /* heap_start = (uint32_t) &end; */
heap_start = (rtems_unsigned32) top_of_used_memory; heap_start = (uint32_t) top_of_used_memory;
if (heap_start & (CPU_ALIGNMENT-1)) if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
@@ -91,7 +91,7 @@ bsp_pretasking_hook(void)
int rx_boot_card( int argc, char **argv, char **environp) int rx_boot_card( int argc, char **argv, char **environp)
{ {
extern int end; extern int end;
top_of_used_memory = (rtems_unsigned32) &end + 0x1000; top_of_used_memory = (uint32_t) &end + 0x1000;
if ((argc > 0) && argv && argv[0]) if ((argc > 0) && argv && argv[0])
rtems_progname = argv[0]; rtems_progname = argv[0];
else else

2
c/src/lib/libbsp/i960/rxgen960/timer/timer.c
View File

@@ -95,7 +95,7 @@ int Read_timer()
{ {
volatile unsigned int *tcr1 = (unsigned int *) TCR1_ADDR; volatile unsigned int *tcr1 = (unsigned int *) TCR1_ADDR;
volatile unsigned int *trr1 = (unsigned int *) TRR1_ADDR; volatile unsigned int *trr1 = (unsigned int *) TRR1_ADDR;
rtems_unsigned32 remaining, total; uint32_t remaining, total;
/* this routine is supposed to count in 1/2 uSec units */ /* this routine is supposed to count in 1/2 uSec units */
/* pretty funny when using a 33MHz clock for the counter */ /* pretty funny when using a 33MHz clock for the counter */