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 
* include/bsp.h, shmsupp/getcfg.c, shmsupp/lock.c,
	startup/bspstart.c: Convert to using c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-31 04:40:26 +00:00
parent 2428245199
commit 6cfc0a4dd2
5 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/m68k/mvme147s/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* include/bsp.h, shmsupp/getcfg.c, shmsupp/lock.c,
startup/bspstart.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.

152
c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
View File

@@ -51,45 +51,45 @@ extern "C" {
struct pcc_map {
/* 32 bit registers */
rtems_unsigned32 dma_table_address; /* 0xfffe1000 */
rtems_unsigned32 dma_data_address; /* 0xfffe1004 */
rtems_unsigned32 dma_bytecount; /* 0xfffe1008 */
rtems_unsigned32 dma_data_holding; /* 0xfffe100c */
uint32_t dma_table_address; /* 0xfffe1000 */
uint32_t dma_data_address; /* 0xfffe1004 */
uint32_t dma_bytecount; /* 0xfffe1008 */
uint32_t dma_data_holding; /* 0xfffe100c */
/* 16 bit registers */
rtems_unsigned16 timer1_preload; /* 0xfffe1010 */
rtems_unsigned16 timer1_count; /* 0xfffe1012 */
rtems_unsigned16 timer2_preload; /* 0xfffe1014 */
rtems_unsigned16 timer2_count; /* 0xfffe1016 */
uint16_t timer1_preload; /* 0xfffe1010 */
uint16_t timer1_count; /* 0xfffe1012 */
uint16_t timer2_preload; /* 0xfffe1014 */
uint16_t timer2_count; /* 0xfffe1016 */
/* 8 bit registers */
rtems_unsigned8 timer1_int_control; /* 0xfffe1018 */
rtems_unsigned8 timer1_control; /* 0xfffe1019 */
rtems_unsigned8 timer2_int_control; /* 0xfffe101a */
rtems_unsigned8 timer2_control; /* 0xfffe101b */
uint8_t timer1_int_control; /* 0xfffe1018 */
uint8_t timer1_control; /* 0xfffe1019 */
uint8_t timer2_int_control; /* 0xfffe101a */
uint8_t timer2_control; /* 0xfffe101b */
rtems_unsigned8 acfail_int_control; /* 0xfffe101c */
rtems_unsigned8 watchdog_control; /* 0xfffe101d */
uint8_t acfail_int_control; /* 0xfffe101c */
uint8_t watchdog_control; /* 0xfffe101d */
rtems_unsigned8 printer_int_control; /* 0xfffe101e */
rtems_unsigned8 printer_control; /* 0xfffe102f */
uint8_t printer_int_control; /* 0xfffe101e */
uint8_t printer_control; /* 0xfffe102f */
rtems_unsigned8 dma_int_control; /* 0xfffe1020 */
rtems_unsigned8 dma_control; /* 0xfffe1021 */
rtems_unsigned8 bus_error_int_control; /* 0xfffe1022 */
rtems_unsigned8 dma_status; /* 0xfffe1023 */
rtems_unsigned8 abort_int_control; /* 0xfffe1024 */
rtems_unsigned8 table_address_function_code; /* 0xfffe1025 */
rtems_unsigned8 serial_port_int_control; /* 0xfffe1026 */
rtems_unsigned8 general_purpose_control; /* 0xfffe1027 */
rtems_unsigned8 lan_int_control; /* 0xfffe1028 */
rtems_unsigned8 general_purpose_status; /* 0xfffe1029 */
rtems_unsigned8 scsi_port_int_control; /* 0xfffe102a */
rtems_unsigned8 slave_base_address; /* 0xfffe102b */
rtems_unsigned8 software_int_1_control; /* 0xfffe102c */
rtems_unsigned8 int_base_vector; /* 0xfffe102d */
rtems_unsigned8 software_int_2_control; /* 0xfffe102e */
rtems_unsigned8 revision_level; /* 0xfffe102f */
uint8_t dma_int_control; /* 0xfffe1020 */
uint8_t dma_control; /* 0xfffe1021 */
uint8_t bus_error_int_control; /* 0xfffe1022 */
uint8_t dma_status; /* 0xfffe1023 */
uint8_t abort_int_control; /* 0xfffe1024 */
uint8_t table_address_function_code; /* 0xfffe1025 */
uint8_t serial_port_int_control; /* 0xfffe1026 */
uint8_t general_purpose_control; /* 0xfffe1027 */
uint8_t lan_int_control; /* 0xfffe1028 */
uint8_t general_purpose_status; /* 0xfffe1029 */
uint8_t scsi_port_int_control; /* 0xfffe102a */
uint8_t slave_base_address; /* 0xfffe102b */
uint8_t software_int_1_control; /* 0xfffe102c */
uint8_t int_base_vector; /* 0xfffe102d */
uint8_t software_int_2_control; /* 0xfffe102e */
uint8_t revision_level; /* 0xfffe102f */
};
#define pcc ((volatile struct pcc_map * const) 0xfffe1000)
@@ -97,56 +97,56 @@ struct pcc_map {
/* VME chip configuration registers */
struct vme_lcsr_map {
rtems_unsigned8 unused_1;
rtems_unsigned8 system_controller; /* 0xfffe2001 */
rtems_unsigned8 unused_2;
rtems_unsigned8 vme_bus_requester; /* 0xfffe2003 */
rtems_unsigned8 unused_3;
rtems_unsigned8 master_configuration; /* 0xfffe2005 */
rtems_unsigned8 unused_4;
rtems_unsigned8 slave_configuration; /* 0xfffe2007 */
rtems_unsigned8 unused_5;
rtems_unsigned8 timer_configuration; /* 0xfffe2009 */
rtems_unsigned8 unused_6;
rtems_unsigned8 slave_address_modifier; /* 0xfffe200b */
rtems_unsigned8 unused_7;
rtems_unsigned8 master_address_modifier; /* 0xfffe200d */
rtems_unsigned8 unused_8;
rtems_unsigned8 interrupt_handler_mask; /* 0xfffe200f */
rtems_unsigned8 unused_9;
rtems_unsigned8 utility_interrupt_mask; /* 0xfffe2011 */
rtems_unsigned8 unused_10;
rtems_unsigned8 utility_interrupt_vector; /* 0xfffe2013 */
rtems_unsigned8 unused_11;
rtems_unsigned8 interrupt_request; /* 0xfffe2015 */
rtems_unsigned8 unused_12;
rtems_unsigned8 vme_bus_status_id; /* 0xfffe2017 */
rtems_unsigned8 unused_13;
rtems_unsigned8 bus_error_status; /* 0xfffe2019 */
rtems_unsigned8 unused_14;
rtems_unsigned8 gcsr_base_address; /* 0xfffe201b */
uint8_t unused_1;
uint8_t system_controller; /* 0xfffe2001 */
uint8_t unused_2;
uint8_t vme_bus_requester; /* 0xfffe2003 */
uint8_t unused_3;
uint8_t master_configuration; /* 0xfffe2005 */
uint8_t unused_4;
uint8_t slave_configuration; /* 0xfffe2007 */
uint8_t unused_5;
uint8_t timer_configuration; /* 0xfffe2009 */
uint8_t unused_6;
uint8_t slave_address_modifier; /* 0xfffe200b */
uint8_t unused_7;
uint8_t master_address_modifier; /* 0xfffe200d */
uint8_t unused_8;
uint8_t interrupt_handler_mask; /* 0xfffe200f */
uint8_t unused_9;
uint8_t utility_interrupt_mask; /* 0xfffe2011 */
uint8_t unused_10;
uint8_t utility_interrupt_vector; /* 0xfffe2013 */
uint8_t unused_11;
uint8_t interrupt_request; /* 0xfffe2015 */
uint8_t unused_12;
uint8_t vme_bus_status_id; /* 0xfffe2017 */
uint8_t unused_13;
uint8_t bus_error_status; /* 0xfffe2019 */
uint8_t unused_14;
uint8_t gcsr_base_address; /* 0xfffe201b */
};
#define vme_lcsr ((volatile struct vme_lcsr_map * const) 0xfffe2000)
struct vme_gcsr_map {
rtems_unsigned8 unused_1;
rtems_unsigned8 global_0; /* 0xfffe2021 */
rtems_unsigned8 unused_2;
rtems_unsigned8 global_1; /* 0xfffe2023 */
rtems_unsigned8 unused_3;
rtems_unsigned8 board_identification; /* 0xfffe2025 */
rtems_unsigned8 unused_4;
rtems_unsigned8 general_purpose_0; /* 0xfffe2027 */
rtems_unsigned8 unused_5;
rtems_unsigned8 general_purpose_1; /* 0xfffe2029 */
rtems_unsigned8 unused_6;
rtems_unsigned8 general_purpose_2; /* 0xfffe202b */
rtems_unsigned8 unused_7;
rtems_unsigned8 general_purpose_3; /* 0xfffe202d */
rtems_unsigned8 unused_8;
rtems_unsigned8 general_purpose_4; /* 0xfffe202f */
uint8_t unused_1;
uint8_t global_0; /* 0xfffe2021 */
uint8_t unused_2;
uint8_t global_1; /* 0xfffe2023 */
uint8_t unused_3;
uint8_t board_identification; /* 0xfffe2025 */
uint8_t unused_4;
uint8_t general_purpose_0; /* 0xfffe2027 */
uint8_t unused_5;
uint8_t general_purpose_1; /* 0xfffe2029 */
uint8_t unused_6;
uint8_t general_purpose_2; /* 0xfffe202b */
uint8_t unused_7;
uint8_t general_purpose_3; /* 0xfffe202d */
uint8_t unused_8;
uint8_t general_purpose_4; /* 0xfffe202f */
};
#define vme_gcsr ((volatile struct vme_gcsr_map * const) 0xfffe2020)

10
c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c
View File

@@ -36,18 +36,18 @@
shm_config_table BSP_shm_cfgtbl;
rtems_unsigned32 *BSP_int_address()
uint32_t *BSP_int_address()
{
rtems_unsigned32 id, offset;
uint32_t id, offset;
id = (rtems_unsigned32) vme_lcsr->gcsr_base_address;
id = (uint32_t) vme_lcsr->gcsr_base_address;
offset = (id << 4) & 0xF0;
offset |= 0xffff0003; /* points to GCSR global 1 */
return( (rtems_unsigned32 * ) offset );
return( (uint32_t * ) offset );
}
void Shm_Get_configuration(
rtems_unsigned32 localnode,
uint32_t localnode,
shm_config_table **shmcfg
)
{

6
c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c
View File

@@ -44,8 +44,8 @@ void Shm_Lock(
Shm_Locked_queue_Control *lq_cb
)
{
rtems_unsigned32 isr_level;
rtems_unsigned32 *lockptr = (rtems_unsigned32 *)&lq_cb->lock;
uint32_t isr_level;
uint32_t *lockptr = (uint32_t*)&lq_cb->lock;
rtems_interrupt_disable( isr_level );
Shm_isrstat = isr_level;
@@ -65,7 +65,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;

6
c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
View File

@@ -41,7 +41,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 */
/*
@@ -54,7 +54,7 @@ void bsp_start( void )
{
m68k_isr_entry *monitors_vector_table;
int index;
rtems_unsigned8 node_number;
uint8_t node_number;
extern void *_WorkspaceBase;
extern void *_RamSize;
extern unsigned long _M68k_Ramsize;
@@ -95,7 +95,7 @@ void bsp_start( void )
node_number =
(rtems_unsigned8)
(uint8_t)
(Configuration.User_multiprocessing_table->node - 1) & 0xF;
/* Get and store node ID, first node_number = 0 */
vme_gcsr->board_identification = node_number;