RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* clock/ckinit.c, include/bsp.h, shmsupp/addrconv.c,
	shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c,
	startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size
	types.
This commit is contained in:
Ralf Corsepius
2004-03-31 04:20:42 +00:00
parent 5601b2b200
commit 090760c5f1
9 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/i960/cvme961/ChangeLog
View File

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

6
c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
View File

@@ -24,9 +24,9 @@
#define CLOCK_VECTOR 5
rtems_unsigned32 Clock_isrs; /* ISRs until next tick */
uint32_t Clock_isrs; /* ISRs until next tick */
i960_isr_entry Old_ticker;
volatile rtems_unsigned32 Clock_driver_ticks;
volatile uint32_t Clock_driver_ticks;
/* ticks since initialization */
void Clock_exit( void );
@@ -93,7 +93,7 @@ rtems_device_driver Clock_control(
void *pargp
)
{
rtems_unsigned32 isrlevel;
uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp;
if (args == 0)

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

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

4
c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c
View File

@@ -28,9 +28,9 @@ void *Shm_Convert_address(
void *address
)
{
rtems_unsigned32 workaddr = (rtems_unsigned32) address;
uint32_t workaddr = (uint32_t) address;
if ( workaddr >= 0xffff0000 )
workaddr = (workaddr & 0xffff) | 0xb4000000;
return ( (rtems_unsigned32 *)workaddr );
return ( (uint32_t*)workaddr );
}

10
c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c
View File

@@ -54,17 +54,17 @@
shm_config_table BSP_shm_cfgtbl;
void Shm_Get_configuration(
rtems_unsigned32 localnode,
uint32_t localnode,
shm_config_table **shmcfg
)
{
#if ( USE_ONBOARD_RAM == 1 )
if ( Shm_RTEMS_MP_Configuration->node == MASTER )
BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x00300000;
BSP_shm_cfgtbl.base = (uint32_t*)0x00300000;
else
BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x10300000;
BSP_shm_cfgtbl.base = (uint32_t*)0x10300000;
#else
BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x20000000;
BSP_shm_cfgtbl.base = (uint32_t*)0x20000000;
#endif
BSP_shm_cfgtbl.length = 1 * MEGABYTE;
@@ -86,7 +86,7 @@ void Shm_Get_configuration(
#else
BSP_shm_cfgtbl.poll_intr = INTR_MODE;
BSP_shm_cfgtbl.Intr.address =
(rtems_unsigned32 *) (0xffff0021|((localnode-1) << 12));
(uint32_t*) (0xffff0021|((localnode-1) << 12));
/* use ICMS0 */
BSP_shm_cfgtbl.Intr.value = 1;
BSP_shm_cfgtbl.Intr.length = BYTE;

4
c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c
View File

@@ -44,7 +44,7 @@ void Shm_Lock(
Shm_Locked_queue_Control *lq_cb
)
{
rtems_unsigned32 isr_level, oldlock;
uint32_t isr_level, oldlock;
rtems_interrupt_disable( isr_level );
Shm_isrstat = isr_level;
@@ -66,7 +66,7 @@ void Shm_Unlock(
Shm_Locked_queue_Control *lq_cb
)
{
rtems_unsigned32 isr_level;
uint32_t isr_level;
lq_cb->lock = SHM_UNLOCK_VALUE;
isr_level = Shm_isrstat;

16
c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c
View File

@@ -25,15 +25,15 @@ rtems_isr Shm_isr_cvme961(
rtems_vector_number vector
)
{
rtems_unsigned32 vic_vector;
uint32_t vic_vector;
/* enable_tracing(); */
vic_vector = (*(volatile rtems_unsigned8 *)0xb6000007);
vic_vector = (*(volatile uint8_t*)0xb6000007);
/* reset intr by reading */
/* vector at IPL=3 */
Shm_Interrupt_count += 1;
rtems_multiprocessing_announce();
(*(volatile rtems_unsigned8 *)0xa000005f) = 0; /* clear ICMS0 */
(*(volatile uint8_t*)0xa000005f) = 0; /* clear ICMS0 */
i960_clear_intr( 6 );
}
@@ -52,18 +52,18 @@ rtems_isr Shm_isr_cvme961(
void Shm_setvec()
{
rtems_unsigned32 isrlevel;
uint32_t isrlevel;
rtems_interrupt_disable( isrlevel );
/* set SQSIO4 CTL REG for */
/* VME slave address */
(*(rtems_unsigned8 *)0xc00000b0) =
(*(uint8_t*)0xc00000b0) =
(Shm_RTEMS_MP_Configuration->node - 1) | 0x10;
set_vector( Shm_isr_cvme961, 6, 1 );
/* set ICMS Bector Base Register */
(*(rtems_unsigned8 *)0xa0000053) = 0x60; /* XINT6 vector is 0x62 */
(*(uint8_t*)0xa0000053) = 0x60; /* XINT6 vector is 0x62 */
/* set ICMS Intr Control Reg */
(*(rtems_unsigned8 *)0xa0000047) = 0xeb; /* ICMS0 enabled, IPL=0 */
(*(rtems_unsigned8 *)0xa000005f) = 0; /* clear ICMS0 */
(*(uint8_t*)0xa0000047) = 0xeb; /* ICMS0 enabled, IPL=0 */
(*(uint8_t*)0xa000005f) = 0; /* clear ICMS0 */
rtems_interrupt_enable( isrlevel );
}

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

@@ -40,7 +40,7 @@ char *rtems_progname;
*/
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, unsigned32, int );
void bsp_libc_init( void *, uint32_t, int );
/*
* Function: bsp_pretasking_hook
@@ -59,9 +59,9 @@ void bsp_libc_init( void *, unsigned32, int );
void bsp_pretasking_hook(void)
{
extern int end;
rtems_unsigned32 heap_start;
uint32_t heap_start;
heap_start = (rtems_unsigned32) &end;
heap_start = (uint32_t) &end;
if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
@@ -82,7 +82,7 @@ void bsp_start( void )
{
/* set node number in SQSIO4 CTL REG */
*((rtems_unsigned32 *)0xc00000b0) =
*((uint32_t*)0xc00000b0) =
(Configuration.User_multiprocessing_table) ?
Configuration.User_multiprocessing_table->node : 0;

4
c/src/lib/libbsp/i960/cvme961/timer/timer.c
View File

@@ -74,8 +74,8 @@ void Timer_initialize()
int Read_timer()
{
rtems_unsigned8 msb, lsb;
rtems_unsigned32 remaining, total;
uint8_t msb, lsb;
uint32_t remaining, total;
Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xce ); /* read the counter value */
Z8x36_READ( TIMER, CT1_CUR_CNT_MSB, msb );