Changeset 6cfc0a4 in rtems
- Timestamp:
- 03/31/04 04:40:26 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- b7044dc
- Parents:
- 24282451
- Location:
- c/src/lib/libbsp/m68k/mvme147s
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/m68k/mvme147s/ChangeLog
r24282451 r6cfc0a4 1 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * include/bsp.h, shmsupp/getcfg.c, shmsupp/lock.c, 4 startup/bspstart.c: Convert to using c99 fixed size types. 5 1 6 2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 7 -
c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
r24282451 r6cfc0a4 52 52 struct pcc_map { 53 53 /* 32 bit registers */ 54 rtems_unsigned32dma_table_address; /* 0xfffe1000 */55 rtems_unsigned32dma_data_address; /* 0xfffe1004 */56 rtems_unsigned32dma_bytecount; /* 0xfffe1008 */57 rtems_unsigned32dma_data_holding; /* 0xfffe100c */54 uint32_t dma_table_address; /* 0xfffe1000 */ 55 uint32_t dma_data_address; /* 0xfffe1004 */ 56 uint32_t dma_bytecount; /* 0xfffe1008 */ 57 uint32_t dma_data_holding; /* 0xfffe100c */ 58 58 59 59 /* 16 bit registers */ 60 rtems_unsigned16timer1_preload; /* 0xfffe1010 */61 rtems_unsigned16timer1_count; /* 0xfffe1012 */62 rtems_unsigned16timer2_preload; /* 0xfffe1014 */63 rtems_unsigned16timer2_count; /* 0xfffe1016 */60 uint16_t timer1_preload; /* 0xfffe1010 */ 61 uint16_t timer1_count; /* 0xfffe1012 */ 62 uint16_t timer2_preload; /* 0xfffe1014 */ 63 uint16_t timer2_count; /* 0xfffe1016 */ 64 64 65 65 /* 8 bit registers */ 66 rtems_unsigned8timer1_int_control; /* 0xfffe1018 */67 rtems_unsigned8timer1_control; /* 0xfffe1019 */68 rtems_unsigned8timer2_int_control; /* 0xfffe101a */69 rtems_unsigned8timer2_control; /* 0xfffe101b */70 71 rtems_unsigned8acfail_int_control; /* 0xfffe101c */72 rtems_unsigned8watchdog_control; /* 0xfffe101d */73 74 rtems_unsigned8printer_int_control; /* 0xfffe101e */75 rtems_unsigned8printer_control; /* 0xfffe102f */76 77 rtems_unsigned8dma_int_control; /* 0xfffe1020 */78 rtems_unsigned8dma_control; /* 0xfffe1021 */79 rtems_unsigned8bus_error_int_control; /* 0xfffe1022 */80 rtems_unsigned8dma_status; /* 0xfffe1023 */81 rtems_unsigned8abort_int_control; /* 0xfffe1024 */82 rtems_unsigned8table_address_function_code; /* 0xfffe1025 */83 rtems_unsigned8serial_port_int_control; /* 0xfffe1026 */84 rtems_unsigned8general_purpose_control; /* 0xfffe1027 */85 rtems_unsigned8lan_int_control; /* 0xfffe1028 */86 rtems_unsigned8general_purpose_status; /* 0xfffe1029 */87 rtems_unsigned8scsi_port_int_control; /* 0xfffe102a */88 rtems_unsigned8slave_base_address; /* 0xfffe102b */89 rtems_unsigned8software_int_1_control; /* 0xfffe102c */90 rtems_unsigned8int_base_vector; /* 0xfffe102d */91 rtems_unsigned8software_int_2_control; /* 0xfffe102e */92 rtems_unsigned8revision_level; /* 0xfffe102f */66 uint8_t timer1_int_control; /* 0xfffe1018 */ 67 uint8_t timer1_control; /* 0xfffe1019 */ 68 uint8_t timer2_int_control; /* 0xfffe101a */ 69 uint8_t timer2_control; /* 0xfffe101b */ 70 71 uint8_t acfail_int_control; /* 0xfffe101c */ 72 uint8_t watchdog_control; /* 0xfffe101d */ 73 74 uint8_t printer_int_control; /* 0xfffe101e */ 75 uint8_t printer_control; /* 0xfffe102f */ 76 77 uint8_t dma_int_control; /* 0xfffe1020 */ 78 uint8_t dma_control; /* 0xfffe1021 */ 79 uint8_t bus_error_int_control; /* 0xfffe1022 */ 80 uint8_t dma_status; /* 0xfffe1023 */ 81 uint8_t abort_int_control; /* 0xfffe1024 */ 82 uint8_t table_address_function_code; /* 0xfffe1025 */ 83 uint8_t serial_port_int_control; /* 0xfffe1026 */ 84 uint8_t general_purpose_control; /* 0xfffe1027 */ 85 uint8_t lan_int_control; /* 0xfffe1028 */ 86 uint8_t general_purpose_status; /* 0xfffe1029 */ 87 uint8_t scsi_port_int_control; /* 0xfffe102a */ 88 uint8_t slave_base_address; /* 0xfffe102b */ 89 uint8_t software_int_1_control; /* 0xfffe102c */ 90 uint8_t int_base_vector; /* 0xfffe102d */ 91 uint8_t software_int_2_control; /* 0xfffe102e */ 92 uint8_t revision_level; /* 0xfffe102f */ 93 93 }; 94 94 … … 98 98 99 99 struct vme_lcsr_map { 100 rtems_unsigned8unused_1;101 rtems_unsigned8system_controller; /* 0xfffe2001 */102 rtems_unsigned8unused_2;103 rtems_unsigned8vme_bus_requester; /* 0xfffe2003 */104 rtems_unsigned8unused_3;105 rtems_unsigned8master_configuration; /* 0xfffe2005 */106 rtems_unsigned8unused_4;107 rtems_unsigned8slave_configuration; /* 0xfffe2007 */108 rtems_unsigned8unused_5;109 rtems_unsigned8timer_configuration; /* 0xfffe2009 */110 rtems_unsigned8unused_6;111 rtems_unsigned8slave_address_modifier; /* 0xfffe200b */112 rtems_unsigned8unused_7;113 rtems_unsigned8master_address_modifier; /* 0xfffe200d */114 rtems_unsigned8unused_8;115 rtems_unsigned8interrupt_handler_mask; /* 0xfffe200f */116 rtems_unsigned8unused_9;117 rtems_unsigned8utility_interrupt_mask; /* 0xfffe2011 */118 rtems_unsigned8unused_10;119 rtems_unsigned8utility_interrupt_vector; /* 0xfffe2013 */120 rtems_unsigned8unused_11;121 rtems_unsigned8interrupt_request; /* 0xfffe2015 */122 rtems_unsigned8unused_12;123 rtems_unsigned8vme_bus_status_id; /* 0xfffe2017 */124 rtems_unsigned8unused_13;125 rtems_unsigned8bus_error_status; /* 0xfffe2019 */126 rtems_unsigned8unused_14;127 rtems_unsigned8gcsr_base_address; /* 0xfffe201b */100 uint8_t unused_1; 101 uint8_t system_controller; /* 0xfffe2001 */ 102 uint8_t unused_2; 103 uint8_t vme_bus_requester; /* 0xfffe2003 */ 104 uint8_t unused_3; 105 uint8_t master_configuration; /* 0xfffe2005 */ 106 uint8_t unused_4; 107 uint8_t slave_configuration; /* 0xfffe2007 */ 108 uint8_t unused_5; 109 uint8_t timer_configuration; /* 0xfffe2009 */ 110 uint8_t unused_6; 111 uint8_t slave_address_modifier; /* 0xfffe200b */ 112 uint8_t unused_7; 113 uint8_t master_address_modifier; /* 0xfffe200d */ 114 uint8_t unused_8; 115 uint8_t interrupt_handler_mask; /* 0xfffe200f */ 116 uint8_t unused_9; 117 uint8_t utility_interrupt_mask; /* 0xfffe2011 */ 118 uint8_t unused_10; 119 uint8_t utility_interrupt_vector; /* 0xfffe2013 */ 120 uint8_t unused_11; 121 uint8_t interrupt_request; /* 0xfffe2015 */ 122 uint8_t unused_12; 123 uint8_t vme_bus_status_id; /* 0xfffe2017 */ 124 uint8_t unused_13; 125 uint8_t bus_error_status; /* 0xfffe2019 */ 126 uint8_t unused_14; 127 uint8_t gcsr_base_address; /* 0xfffe201b */ 128 128 }; 129 129 … … 132 132 133 133 struct vme_gcsr_map { 134 rtems_unsigned8unused_1;135 rtems_unsigned8global_0; /* 0xfffe2021 */136 rtems_unsigned8unused_2;137 rtems_unsigned8global_1; /* 0xfffe2023 */138 rtems_unsigned8unused_3;139 rtems_unsigned8board_identification; /* 0xfffe2025 */140 rtems_unsigned8unused_4;141 rtems_unsigned8general_purpose_0; /* 0xfffe2027 */142 rtems_unsigned8unused_5;143 rtems_unsigned8general_purpose_1; /* 0xfffe2029 */144 rtems_unsigned8unused_6;145 rtems_unsigned8general_purpose_2; /* 0xfffe202b */146 rtems_unsigned8unused_7;147 rtems_unsigned8general_purpose_3; /* 0xfffe202d */148 rtems_unsigned8unused_8;149 rtems_unsigned8general_purpose_4; /* 0xfffe202f */134 uint8_t unused_1; 135 uint8_t global_0; /* 0xfffe2021 */ 136 uint8_t unused_2; 137 uint8_t global_1; /* 0xfffe2023 */ 138 uint8_t unused_3; 139 uint8_t board_identification; /* 0xfffe2025 */ 140 uint8_t unused_4; 141 uint8_t general_purpose_0; /* 0xfffe2027 */ 142 uint8_t unused_5; 143 uint8_t general_purpose_1; /* 0xfffe2029 */ 144 uint8_t unused_6; 145 uint8_t general_purpose_2; /* 0xfffe202b */ 146 uint8_t unused_7; 147 uint8_t general_purpose_3; /* 0xfffe202d */ 148 uint8_t unused_8; 149 uint8_t general_purpose_4; /* 0xfffe202f */ 150 150 }; 151 151 -
c/src/lib/libbsp/m68k/mvme147s/shmsupp/getcfg.c
r24282451 r6cfc0a4 37 37 shm_config_table BSP_shm_cfgtbl; 38 38 39 rtems_unsigned32*BSP_int_address()39 uint32_t *BSP_int_address() 40 40 { 41 rtems_unsigned32id, offset;41 uint32_t id, offset; 42 42 43 id = ( rtems_unsigned32) vme_lcsr->gcsr_base_address;43 id = (uint32_t) vme_lcsr->gcsr_base_address; 44 44 offset = (id << 4) & 0xF0; 45 45 offset |= 0xffff0003; /* points to GCSR global 1 */ 46 return( ( rtems_unsigned32* ) offset );46 return( (uint32_t * ) offset ); 47 47 } 48 48 49 49 void Shm_Get_configuration( 50 rtems_unsigned32localnode,50 uint32_t localnode, 51 51 shm_config_table **shmcfg 52 52 ) -
c/src/lib/libbsp/m68k/mvme147s/shmsupp/lock.c
r24282451 r6cfc0a4 45 45 ) 46 46 { 47 rtems_unsigned32isr_level;48 rtems_unsigned32 *lockptr = (rtems_unsigned32*)&lq_cb->lock;47 uint32_t isr_level; 48 uint32_t *lockptr = (uint32_t*)&lq_cb->lock; 49 49 50 50 rtems_interrupt_disable( isr_level ); … … 66 66 ) 67 67 { 68 rtems_unsigned32isr_level;68 uint32_t isr_level; 69 69 70 70 lq_cb->lock = SHM_UNLOCK_VALUE; -
c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
r24282451 r6cfc0a4 42 42 43 43 void bsp_postdriver_hook(void); 44 void bsp_libc_init( void *, u nsigned32, int );44 void bsp_libc_init( void *, uint32_t, int ); 45 45 void bsp_pretasking_hook(void); /* m68k version */ 46 46 … … 55 55 m68k_isr_entry *monitors_vector_table; 56 56 int index; 57 rtems_unsigned8node_number;57 uint8_t node_number; 58 58 extern void *_WorkspaceBase; 59 59 extern void *_RamSize; … … 96 96 97 97 node_number = 98 ( rtems_unsigned8)98 (uint8_t) 99 99 (Configuration.User_multiprocessing_table->node - 1) & 0xF; 100 100 /* Get and store node ID, first node_number = 0 */
Note: See TracChangeset
for help on using the changeset viewer.