Changeset ed9e449 in rtems
- Timestamp:
- 03/31/04 03:08:46 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 8c93623
- Parents:
- 3d04f8b
- Location:
- c/src/lib/libbsp/powerpc/dmv177
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/powerpc/dmv177/ChangeLog
r3d04f8b red9e449 1 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * clock/clock.c, console/conscfg.c, console/debugio.c, 4 include/bsp.h, include/dmv170.h, scv64/scv64.c, sonic/dmvsonic.c, 5 startup/bspstart.c, startup/genpvec.c, startup/vmeintr.c, 6 timer/timer.c, tod/todcfg.c: Convert to using c99 fixed size types. 7 1 8 2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 9 -
c/src/lib/libbsp/powerpc/dmv177/clock/clock.c
r3d04f8b red9e449 34 34 */ 35 35 36 volatile rtems_unsigned32Clock_driver_ticks;36 volatile uint32_t Clock_driver_ticks; 37 37 38 38 /* … … 40 40 */ 41 41 42 rtems_unsigned32Clock_Decrementer_value;42 uint32_t Clock_Decrementer_value; 43 43 44 44 /* … … 209 209 ) 210 210 { 211 rtems_unsigned32isrlevel;211 uint32_t isrlevel; 212 212 rtems_libio_ioctl_args_t *args = pargp; 213 213 -
c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c
r3d04f8b red9e449 161 161 NULL, /* unused */ /* getData */ 162 162 NULL, /* unused */ /* setData */ 163 (u nsigned32)dmv177_mc68681_baud_table, /* ulClock */163 (uint32_t)dmv177_mc68681_baud_table, /* ulClock */ 164 164 DMV170_DUART_IRQ /* ulIntVector */ 165 165 }, … … 180 180 NULL, /* unused */ /* getData */ 181 181 NULL, /* unused */ /* setData */ 182 (u nsigned32)dmv177_mc68681_baud_table, /* ulClock */182 (uint32_t)dmv177_mc68681_baud_table, /* ulClock */ 183 183 DMV170_DUART_IRQ /* ulIntVector */ 184 184 }, … … 242 242 boolean dmv177_z85c30_probe(int minor) 243 243 { 244 volatile u nsigned32*dma_control_status_reg;245 volatile u nsigned16*card_resource_reg;246 u nsigned16v;247 248 card_resource_reg = (volatile u nsigned16*) DMV170_CARD_RESORCE_REG;244 volatile uint32_t *dma_control_status_reg; 245 volatile uint16_t *card_resource_reg; 246 uint16_t v; 247 248 card_resource_reg = (volatile uint16_t*) DMV170_CARD_RESORCE_REG; 249 249 250 250 v = *card_resource_reg & DMV170_SCC_INST_MASK; … … 257 257 */ 258 258 259 dma_control_status_reg = (volatile u nsigned32*)DMV170_DMA_CONTROL_STATUS_REG;259 dma_control_status_reg = (volatile uint32_t*)DMV170_DMA_CONTROL_STATUS_REG; 260 260 261 261 if ( *dma_control_status_reg & DMV170_SCC_10MHZ ) … … 269 269 boolean dmv177_mc68681_probe(int minor) 270 270 { 271 volatile u nsigned16*card_resource_reg;272 u nsigned16v;273 274 card_resource_reg = (volatile u nsigned16*) DMV170_CARD_RESORCE_REG;271 volatile uint16_t *card_resource_reg; 272 uint16_t v; 273 274 card_resource_reg = (volatile uint16_t*) DMV170_CARD_RESORCE_REG; 275 275 276 276 v = *card_resource_reg & DMV170_DUART_INST_MASK; -
c/src/lib/libbsp/powerpc/dmv177/console/debugio.c
r3d04f8b red9e449 61 61 { 62 62 char *s; 63 u nsigned32Irql;63 uint32_t Irql; 64 64 65 65 rtems_interrupt_disable(Irql); … … 90 90 91 91 void DEBUG_puth( 92 u nsigned32ulHexNum92 uint32_t ulHexNum 93 93 ) 94 94 { 95 95 unsigned long i,d; 96 u nsigned32Irql;96 uint32_t Irql; 97 97 void (*poll)(int minor, char cChar); 98 98 -
c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
r3d04f8b red9e449 90 90 #define Cause_tm27_intr() \ 91 91 do { \ 92 u nsigned32_clicks = 1; \92 uint32_t _clicks = 1; \ 93 93 asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ 94 94 } while (0) … … 96 96 #define Clear_tm27_intr() \ 97 97 do { \ 98 u nsigned32_clicks = 0xffffffff; \99 u nsigned32_msr = 0; \98 uint32_t _clicks = 0xffffffff; \ 99 uint32_t _msr = 0; \ 100 100 _ISR_Set_level( 0 ); \ 101 101 asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ … … 107 107 #define Lower_tm27_intr() \ 108 108 do { \ 109 u nsigned32_msr = 0; \109 uint32_t _msr = 0; \ 110 110 _ISR_Set_level( 0 ); \ 111 111 asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ … … 189 189 extern rtems_cpu_table Cpu_table; /* owned by BSP */ 190 190 191 extern rtems_unsigned32bsp_isr_level;191 extern uint32_t bsp_isr_level; 192 192 193 193 extern int CPU_PPC_CLICKS_PER_MS; -
c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
r3d04f8b red9e449 80 80 81 81 #define DMV170_WRITE( _reg, _data ) \ 82 *((volatile rtems_unsigned16*)(_reg)) = (_data)82 *((volatile uint16_t*)(_reg)) = (_data) 83 83 84 84 #define DMV170_READ( _reg, _data ) \ 85 (_data) = *((volatile rtems_unsigned16*)(_reg))85 (_data) = *((volatile uint16_t*)(_reg)) 86 86 87 87 /* … … 278 278 279 279 void SCV64_Generate_DUART_Interrupts(); 280 rtems_unsigned32SCV64_Get_Interrupt();281 rtems_unsigned32SCV64_Get_Interrupt_Enable();280 uint32_t SCV64_Get_Interrupt(); 281 uint32_t SCV64_Get_Interrupt_Enable(); 282 282 283 283 #ifdef __cplusplus -
c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c
r3d04f8b red9e449 15 15 typedef struct { 16 16 /* DARF Registers */ 17 volatile rtems_unsigned32DMALAR; /* 0x00 */18 volatile rtems_unsigned32DMAVAR; /* 0x04 */19 volatile rtems_unsigned32DMATC; /* 0x08 */20 volatile rtems_unsigned32DCSR; /* 0x0c */21 volatile rtems_unsigned32VMEBAR; /* 0x10 */22 volatile rtems_unsigned32RXDATA; /* 0x14 */23 volatile rtems_unsigned32RXADDR; /* 0x18 */24 volatile rtems_unsigned32RXCTL; /* 0x1c */25 volatile rtems_unsigned32BUSSEL; /* 0x20 */26 volatile rtems_unsigned32IVECT; /* 0x24 */27 volatile rtems_unsigned32APBR; /* 0x28 */28 volatile rtems_unsigned32TXDATA; /* 0x2c */29 volatile rtems_unsigned32TXADDR; /* 0x30 */30 volatile rtems_unsigned32TXCTL; /* 0x34 */31 volatile rtems_unsigned32LMFIFO; /* 0x38 */32 volatile rtems_unsigned32MODE; /* 0x3c */33 volatile rtems_unsigned32SA64BAR; /* 0x40 */34 volatile rtems_unsigned32MA64BAR; /* 0x44 */35 volatile rtems_unsigned32LAG; /* 0x48 */36 volatile rtems_unsigned32DMAVTC; /* 0x4c */17 volatile uint32_t DMALAR; /* 0x00 */ 18 volatile uint32_t DMAVAR; /* 0x04 */ 19 volatile uint32_t DMATC; /* 0x08 */ 20 volatile uint32_t DCSR; /* 0x0c */ 21 volatile uint32_t VMEBAR; /* 0x10 */ 22 volatile uint32_t RXDATA; /* 0x14 */ 23 volatile uint32_t RXADDR; /* 0x18 */ 24 volatile uint32_t RXCTL; /* 0x1c */ 25 volatile uint32_t BUSSEL; /* 0x20 */ 26 volatile uint32_t IVECT; /* 0x24 */ 27 volatile uint32_t APBR; /* 0x28 */ 28 volatile uint32_t TXDATA; /* 0x2c */ 29 volatile uint32_t TXADDR; /* 0x30 */ 30 volatile uint32_t TXCTL; /* 0x34 */ 31 volatile uint32_t LMFIFO; /* 0x38 */ 32 volatile uint32_t MODE; /* 0x3c */ 33 volatile uint32_t SA64BAR; /* 0x40 */ 34 volatile uint32_t MA64BAR; /* 0x44 */ 35 volatile uint32_t LAG; /* 0x48 */ 36 volatile uint32_t DMAVTC; /* 0x4c */ 37 37 38 38 /* Reserved */ 39 volatile rtems_unsigned32reserved_50_7F[12];39 volatile uint32_t reserved_50_7F[12]; 40 40 41 41 /* ACC Registers */ 42 volatile rtems_unsigned8STAT0_pad[3]; /* 0x80 */43 volatile rtems_unsigned8STAT0;44 volatile rtems_unsigned8STAT1_pad[3]; /* 0x84 */45 volatile rtems_unsigned8STAT1;46 volatile rtems_unsigned8GENCTL_pad[3]; /* 0x88 */47 volatile rtems_unsigned8GENCTL;48 volatile rtems_unsigned8VINT_pad[3]; /* 0x8c */49 volatile rtems_unsigned8VINT;50 volatile rtems_unsigned8VREQ_pad[3]; /* 0x90 */51 volatile rtems_unsigned8VREQ;52 volatile rtems_unsigned8VARB_pad[3]; /* 0x94 */53 volatile rtems_unsigned8VARB;54 volatile rtems_unsigned8ID_pad[3]; /* 0x98 */55 volatile rtems_unsigned8ID;56 volatile rtems_unsigned8NA_pad[3]; /* 0x9c */57 volatile rtems_unsigned8NA;58 volatile rtems_unsigned8_7IS_pad[3]; /* 0xa0 */59 volatile rtems_unsigned8_7IS;60 volatile rtems_unsigned8LIS_pad[3]; /* 0xa4 */61 volatile rtems_unsigned8LIS;62 volatile rtems_unsigned8UIE_pad[3]; /* 0xa8 */63 volatile rtems_unsigned8UIE;64 volatile rtems_unsigned8LIE_pad[3]; /* 0xac */65 volatile rtems_unsigned8LIE;66 volatile rtems_unsigned8VIE_pad[3]; /* 0xb0 */67 volatile rtems_unsigned8VIE;68 volatile rtems_unsigned8IC10_pad[3]; /* 0xb4 */69 volatile rtems_unsigned8IC10;70 volatile rtems_unsigned8IC32_pad[3]; /* 0xb8 */71 volatile rtems_unsigned8IC32;72 volatile rtems_unsigned8IC54_pad[3]; /* 0xbc */73 volatile rtems_unsigned8IC54;42 volatile uint8_t STAT0_pad[3]; /* 0x80 */ 43 volatile uint8_t STAT0; 44 volatile uint8_t STAT1_pad[3]; /* 0x84 */ 45 volatile uint8_t STAT1; 46 volatile uint8_t GENCTL_pad[3]; /* 0x88 */ 47 volatile uint8_t GENCTL; 48 volatile uint8_t VINT_pad[3]; /* 0x8c */ 49 volatile uint8_t VINT; 50 volatile uint8_t VREQ_pad[3]; /* 0x90 */ 51 volatile uint8_t VREQ; 52 volatile uint8_t VARB_pad[3]; /* 0x94 */ 53 volatile uint8_t VARB; 54 volatile uint8_t ID_pad[3]; /* 0x98 */ 55 volatile uint8_t ID; 56 volatile uint8_t NA_pad[3]; /* 0x9c */ 57 volatile uint8_t NA; 58 volatile uint8_t _7IS_pad[3]; /* 0xa0 */ 59 volatile uint8_t _7IS; 60 volatile uint8_t LIS_pad[3]; /* 0xa4 */ 61 volatile uint8_t LIS; 62 volatile uint8_t UIE_pad[3]; /* 0xa8 */ 63 volatile uint8_t UIE; 64 volatile uint8_t LIE_pad[3]; /* 0xac */ 65 volatile uint8_t LIE; 66 volatile uint8_t VIE_pad[3]; /* 0xb0 */ 67 volatile uint8_t VIE; 68 volatile uint8_t IC10_pad[3]; /* 0xb4 */ 69 volatile uint8_t IC10; 70 volatile uint8_t IC32_pad[3]; /* 0xb8 */ 71 volatile uint8_t IC32; 72 volatile uint8_t IC54_pad[3]; /* 0xbc */ 73 volatile uint8_t IC54; 74 74 /* Utility Registers */ 75 volatile rtems_unsigned32MISC;76 volatile rtems_unsigned32delay_line[3];77 volatile rtems_unsigned32MBOX0;78 volatile rtems_unsigned32MBOX1;79 volatile rtems_unsigned32MBOX2;80 volatile rtems_unsigned32MBOX3;75 volatile uint32_t MISC; 76 volatile uint32_t delay_line[3]; 77 volatile uint32_t MBOX0; 78 volatile uint32_t MBOX1; 79 volatile uint32_t MBOX2; 80 volatile uint32_t MBOX3; 81 81 } SCV64_Registers; 82 82 … … 121 121 void SCV64_Generate_DUART_Interrupts() { 122 122 123 rtems_unsigned8data;123 uint8_t data; 124 124 125 125 /* … … 144 144 * This routine returns the SCV64 status register. 145 145 */ 146 rtems_unsigned32SCV64_Get_Interrupt()146 uint32_t SCV64_Get_Interrupt() 147 147 { 148 rtems_unsigned8data;148 uint8_t data; 149 149 150 150 /* … … 162 162 * This routine returns the interrupt enable mask. 163 163 */ 164 rtems_unsigned32SCV64_Get_Interrupt_Enable()164 uint32_t SCV64_Get_Interrupt_Enable() 165 165 { 166 166 /* -
c/src/lib/libbsp/powerpc/dmv177/sonic/dmvsonic.c
r3d04f8b red9e449 16 16 void dmv177_sonic_write_register( 17 17 void *base, 18 u nsigned32regno,19 u nsigned32value18 uint32_t regno, 19 uint32_t value 20 20 ) 21 21 { 22 volatile u nsigned32*p = base;22 volatile uint32_t *p = base; 23 23 24 24 #if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS) … … 30 30 } 31 31 32 u nsigned32dmv177_sonic_read_register(32 uint32_t dmv177_sonic_read_register( 33 33 void *base, 34 u nsigned32regno34 uint32_t regno 35 35 ) 36 36 { 37 volatile u nsigned32*p = base;38 u nsigned32value;37 volatile uint32_t *p = base; 38 uint32_t value; 39 39 40 40 value = p[regno]; -
c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
r3d04f8b red9e449 26 26 rtems_configuration_table BSP_Configuration; 27 27 rtems_cpu_table Cpu_table; 28 rtems_unsigned32bsp_isr_level;28 uint32_t bsp_isr_level; 29 29 30 30 /* … … 33 33 34 34 void bsp_postdriver_hook(void); 35 void bsp_libc_init( void *, u nsigned32, int );35 void bsp_libc_init( void *, uint32_t, int ); 36 36 37 37 /*PAGE … … 46 46 { 47 47 extern int end; 48 rtems_unsigned32heap_start;49 rtems_unsigned32heap_size;48 uint32_t heap_start; 49 uint32_t heap_size; 50 50 51 heap_start = ( rtems_unsigned32) &end;51 heap_start = (uint32_t) &end; 52 52 if (heap_start & (CPU_ALIGNMENT-1)) 53 53 heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); -
c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
r3d04f8b red9e449 43 43 */ 44 44 EE_ISR_Type ISR_Nodes [NUM_LIRQ_HANDLERS]; 45 rtems_unsigned16Nodes_Used;45 uint16_t Nodes_Used; 46 46 Chain_Control ISR_Array [NUM_LIRQ]; 47 47 … … 64 64 ) 65 65 { 66 rtems_unsigned16index;66 uint16_t index; 67 67 rtems_boolean is_active=FALSE; 68 rtems_unsigned32scv64_status;68 uint32_t scv64_status; 69 69 Chain_Node *node; 70 70 EE_ISR_Type *ee_isr; … … 178 178 ) 179 179 { 180 rtems_unsigned16vec_idx = vector - DMV170_IRQ_FIRST;181 rtems_unsigned32index;180 uint16_t vec_idx = vector - DMV170_IRQ_FIRST; 181 uint32_t index; 182 182 183 183 /* -
c/src/lib/libbsp/powerpc/dmv177/startup/vmeintr.c
r3d04f8b red9e449 35 35 ) 36 36 { 37 volatile rtems_unsigned8*VME_interrupt_enable;38 rtems_unsigned8value;37 volatile uint8_t *VME_interrupt_enable; 38 uint8_t value; 39 39 40 40 #if 0 … … 68 68 ) 69 69 { 70 volatile rtems_unsigned8*VME_interrupt_enable;71 rtems_unsigned8value;70 volatile uint8_t *VME_interrupt_enable; 71 uint8_t value; 72 72 73 73 #if 0 -
c/src/lib/libbsp/powerpc/dmv177/timer/timer.c
r3d04f8b red9e449 15 15 #include <bsp.h> 16 16 17 rtems_unsigned64Timer_driver_Start_time;17 uint64_t Timer_driver_Start_time; 18 18 19 19 rtems_boolean Timer_driver_Find_average_overhead; … … 65 65 int Read_timer() 66 66 { 67 rtems_unsigned64clicks;68 rtems_unsigned64total64;69 rtems_unsigned32total;67 uint64_t clicks; 68 uint64_t total64; 69 uint32_t total; 70 70 71 71 /* approximately CLOCK_SPEED clicks per microsecond */ … … 77 77 total64 = clicks - Timer_driver_Start_time; 78 78 79 assert( total64 <= 0xffffffff ); /* fits into a u nsigned32*/79 assert( total64 <= 0xffffffff ); /* fits into a uint32_t */ 80 80 81 total = ( rtems_unsigned32) total64;81 total = (uint32_t) total64; 82 82 83 83 if ( Timer_driver_Find_average_overhead == 1 ) -
c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c
r3d04f8b red9e449 64 64 boolean dmv177_icm7170_probe(int minor) 65 65 { 66 volatile u nsigned16*card_resource_reg;67 u nsigned16v;66 volatile uint16_t *card_resource_reg; 67 uint16_t v; 68 68 69 card_resource_reg = (volatile u nsigned16*) DMV170_CARD_RESORCE_REG;69 card_resource_reg = (volatile uint16_t*) DMV170_CARD_RESORCE_REG; 70 70 71 71 v = *card_resource_reg & DMV170_RTC_INST_MASK;
Note: See TracChangeset
for help on using the changeset viewer.