Changeset 8bc4430b in rtems
- Timestamp:
- 03/31/04 01:59:32 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- e96a950b
- Parents:
- a4a1ccf
- Location:
- c/src/lib/libcpu/m68k
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libcpu/m68k/ChangeLog
ra4a1ccf r8bc4430b 1 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * m68040/fpsp/rtems_fpsp.c, mcf5206/clock/ckinit.c, 4 mcf5206/console/mcfuart.c, mcf5206/include/mcf5206e.h, 5 mcf5206/include/mcfmbus.h, mcf5206/include/mcfuart.h, 6 mcf5206/mbus/mcfmbus.c, mcf5206/timer/timer.c: Convert to using c99 7 fixed size types. 8 1 9 2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org> 2 10 -
c/src/lib/libcpu/m68k/m68040/fpsp/rtems_fpsp.c
ra4a1ccf r8bc4430b 18 18 */ 19 19 static int 20 FPSP_install_raw_handler (u nsigned32vector, proc_ptr new_handler, proc_ptr *old_handler)20 FPSP_install_raw_handler (uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler) 21 21 { 22 22 int fpspVector; -
c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
ra4a1ccf r8bc4430b 31 31 * number of clock ticks since the driver was initialized. 32 32 */ 33 volatile rtems_unsigned32Clock_driver_ticks;33 volatile uint32_t Clock_driver_ticks; 34 34 35 35 … … 194 194 void *pargp) 195 195 { 196 rtems_unsigned32isrlevel;196 uint32_t isrlevel; 197 197 rtems_libio_ioctl_args_t *args = pargp; 198 198 -
c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
ra4a1ccf r8bc4430b 52 52 */ 53 53 rtems_status_code 54 mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8intvec,55 rtems_unsigned32chn)54 mcfuart_init(mcfuart *uart, void *tty, uint8_t intvec, 55 uint32_t chn) 56 56 { 57 57 if (uart == NULL) … … 81 81 mcfuart_set_baudrate(mcfuart *uart, speed_t baud) 82 82 { 83 rtems_unsigned32div;84 rtems_unsigned32rate;83 uint32_t div; 84 uint32_t rate; 85 85 switch (baud) 86 86 { … … 111 111 div = SYSTEM_CLOCK_FREQUENCY / (rate * 32); 112 112 113 *MCF5206E_UBG1(MBAR,uart->chn) = ( rtems_unsigned8)((div >> 8) & 0xff);114 *MCF5206E_UBG2(MBAR,uart->chn) = ( rtems_unsigned8)(div & 0xff);113 *MCF5206E_UBG1(MBAR,uart->chn) = (uint8_t )((div >> 8) & 0xff); 114 *MCF5206E_UBG2(MBAR,uart->chn) = (uint8_t )(div & 0xff); 115 115 } 116 116 … … 135 135 mcfuart_reset(mcfuart *uart) 136 136 { 137 register rtems_unsigned32chn;137 register uint32_t chn; 138 138 rtems_status_code rc; 139 139 … … 247 247 int level; 248 248 speed_t baud; 249 rtems_unsigned8umr1, umr2;249 uint8_t umr1, umr2; 250 250 251 251 baud = cfgetospeed(t); … … 350 350 mcfuart_poll_read(mcfuart *uart) 351 351 { 352 rtems_unsigned8usr;352 uint8_t usr; 353 353 int ch; 354 354 if (uart->parerr_mark_flag == 1) … … 420 420 { 421 421 mcfuart *uart; 422 register rtems_unsigned8usr;423 register rtems_unsigned8uisr;422 register uint8_t usr; 423 register uint8_t uisr; 424 424 register int chn; 425 425 register int bp = 0; -
c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
ra4a1ccf r8bc4430b 24 24 #else 25 25 #define MCF5206E_REG8(base,ofs) \ 26 (volatile rtems_unsigned8 *)((rtems_unsigned8*)(base) + (ofs))26 (volatile uint8_t *)((uint8_t *)(base) + (ofs)) 27 27 #define MCF5206E_REG16(base,ofs) \ 28 (volatile rtems_unsigned16 *)((rtems_unsigned8*)(base) + (ofs))28 (volatile uint16_t *)((uint8_t *)(base) + (ofs)) 29 29 #define MCF5206E_REG32(base,ofs) \ 30 (volatile rtems_unsigned32 *)((rtems_unsigned8*)(base) + (ofs))30 (volatile uint32_t *)((uint8_t *)(base) + (ofs)) 31 31 #endif 32 32 -
c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
ra4a1ccf r8bc4430b 29 29 30 30 typedef struct mcfmbus { 31 rtems_unsigned32base; /* ColdFire internal peripherial base31 uint32_t base; /* ColdFire internal peripherial base 32 32 address */ 33 33 enum mcfmbus_i2c_state state;/* State of I2C machine */ … … 39 39 rtems_id sema; /* MBUS semaphore */ 40 40 i2c_transfer_done done; /* Transfer done function */ 41 rtems_unsigned32done_arg; /* Done function argument */41 uint32_t done_arg; /* Done function argument */ 42 42 } mcfmbus; 43 43 … … 53 53 */ 54 54 rtems_status_code 55 mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32base);55 mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base); 56 56 57 57 /* mcfmbus_select_clock_divider -- … … 89 89 rtems_status_code 90 90 mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg, 91 i2c_transfer_done done, rtems_unsigned32done_arg);91 i2c_transfer_done done, uint32_t done_arg); 92 92 93 93 /* mcfmbus_i2c_done -- -
c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
ra4a1ccf r8bc4430b 34 34 */ 35 35 typedef struct mcfuart { 36 rtems_unsigned32chn; /* UART channel number */37 rtems_unsigned8intvec; /* UART interrupt vector number, or36 uint32_t chn; /* UART channel number */ 37 uint8_t intvec; /* UART interrupt vector number, or 38 38 0 if polled I/O */ 39 39 void *tty; /* termios channel descriptor */ 40 40 41 41 volatile const char *tx_buf; /* Transmit buffer from termios */ 42 volatile rtems_unsigned32tx_buf_len;/* Transmit buffer length */43 volatile rtems_unsigned32tx_ptr; /* Index of next char to transmit*/42 volatile uint32_t tx_buf_len;/* Transmit buffer length */ 43 volatile uint32_t tx_ptr; /* Index of next char to transmit*/ 44 44 rtems_isr_entry old_handler;/* Saved interrupt handler */ 45 45 … … 55 55 */ 56 56 rtems_status_code 57 mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8intvec,58 rtems_unsigned32chn);57 mcfuart_init(mcfuart *uart, void *tty, uint8_t intvec, 58 uint32_t chn); 59 59 60 60 /* mcfuart_reset -- -
c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
ra4a1ccf r8bc4430b 113 113 { 114 114 i2c_event event; 115 rtems_unsigned8status, control;115 uint8_t status, control; 116 116 rtems_interrupt_level level; 117 117 rtems_interrupt_disable(level); … … 173 173 mcfmbus_machine(mcfmbus *bus, i2c_event event) 174 174 { 175 rtems_unsigned8b;175 uint8_t b; 176 176 switch (bus->state) 177 177 { … … 283 283 case EVENT_ACK: 284 284 { 285 rtems_unsigned8b = (bus->cmsg->addr & 0xff);285 uint8_t b = (bus->cmsg->addr & 0xff); 286 286 mcfmbus_send(bus, b); 287 287 if (bus->state == STATE_ADDR_1_W) … … 505 505 */ 506 506 rtems_status_code 507 mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32base)507 mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t base) 508 508 { 509 509 rtems_interrupt_level level; … … 562 562 rtems_status_code 563 563 mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg, 564 i2c_transfer_done done, rtems_unsigned32done_arg)564 i2c_transfer_done done, uint32_t done_arg) 565 565 { 566 566 if (bus != mbus) … … 592 592 { 593 593 rtems_status_code sc; 594 rtems_unsigned32base;594 uint32_t base; 595 595 if (mbus == NULL) 596 596 return RTEMS_NOT_CONFIGURED; -
c/src/lib/libcpu/m68k/mcf5206/timer/timer.c
ra4a1ccf r8bc4430b 29 29 #define TRR2_VAL 65530 30 30 31 rtems_unsigned32Timer_interrupts;31 uint32_t Timer_interrupts; 32 32 33 33 rtems_boolean Timer_driver_Find_average_overhead; … … 106 106 Read_timer( void ) 107 107 { 108 rtems_unsigned16clicks;109 rtems_unsigned32total;108 uint16_t clicks; 109 uint32_t total; 110 110 111 111 /*
Note: See TracChangeset
for help on using the changeset viewer.