Changeset 8bc4430b in rtems


Ignore:
Timestamp:
Mar 31, 2004, 1:59:32 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
e96a950b
Parents:
a4a1ccf
Message:

2004-03-30 Ralf Corsepius <ralf_corsepius@…>

  • m68040/fpsp/rtems_fpsp.c, mcf5206/clock/ckinit.c, mcf5206/console/mcfuart.c, mcf5206/include/mcf5206e.h, mcf5206/include/mcfmbus.h, mcf5206/include/mcfuart.h, mcf5206/mbus/mcfmbus.c, mcf5206/timer/timer.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libcpu/m68k
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/m68k/ChangeLog

    ra4a1ccf r8bc4430b  
     12004-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
    192004-03-26      Ralf Corsepius <ralf_corsepius@rtems.org>
    210
  • c/src/lib/libcpu/m68k/m68040/fpsp/rtems_fpsp.c

    ra4a1ccf r8bc4430b  
    1818 */
    1919static int
    20 FPSP_install_raw_handler (unsigned32 vector, proc_ptr new_handler, proc_ptr *old_handler)
     20FPSP_install_raw_handler (uint32_t  vector, proc_ptr new_handler, proc_ptr *old_handler)
    2121{
    2222  int fpspVector;
  • c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c

    ra4a1ccf r8bc4430b  
    3131 * number of clock ticks since the driver was initialized.
    3232 */
    33 volatile rtems_unsigned32 Clock_driver_ticks;
     33volatile uint32_t  Clock_driver_ticks;
    3434
    3535
     
    194194              void *pargp)
    195195{
    196     rtems_unsigned32 isrlevel;
     196    uint32_t  isrlevel;
    197197    rtems_libio_ioctl_args_t *args = pargp;
    198198
  • c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c

    ra4a1ccf r8bc4430b  
    5252 */
    5353rtems_status_code
    54 mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8 intvec,
    55              rtems_unsigned32 chn)
     54mcfuart_init(mcfuart *uart, void *tty, uint8_t  intvec,
     55             uint32_t  chn)
    5656{
    5757    if (uart == NULL)
     
    8181mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
    8282{
    83     rtems_unsigned32 div;
    84     rtems_unsigned32 rate;
     83    uint32_t  div;
     84    uint32_t  rate;
    8585    switch (baud)
    8686    {
     
    111111    div = SYSTEM_CLOCK_FREQUENCY / (rate * 32);
    112112   
    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);
    115115}
    116116
     
    135135mcfuart_reset(mcfuart *uart)
    136136{
    137     register rtems_unsigned32 chn;
     137    register uint32_t  chn;
    138138    rtems_status_code rc;
    139139   
     
    247247    int level;
    248248    speed_t baud;
    249     rtems_unsigned8 umr1, umr2;
     249    uint8_t  umr1, umr2;
    250250   
    251251    baud = cfgetospeed(t);
     
    350350mcfuart_poll_read(mcfuart *uart)
    351351{
    352     rtems_unsigned8 usr;
     352    uint8_t  usr;
    353353    int ch;
    354354    if (uart->parerr_mark_flag == 1)
     
    420420{
    421421    mcfuart *uart;
    422     register rtems_unsigned8 usr;
    423     register rtems_unsigned8 uisr;
     422    register uint8_t  usr;
     423    register uint8_t  uisr;
    424424    register int chn;
    425425    register int bp = 0;
  • c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h

    ra4a1ccf r8bc4430b  
    2424#else
    2525#define MCF5206E_REG8(base,ofs) \
    26     (volatile rtems_unsigned8 *)((rtems_unsigned8 *)(base) + (ofs))
     26    (volatile uint8_t   *)((uint8_t  *)(base) + (ofs))
    2727#define MCF5206E_REG16(base,ofs) \
    28     (volatile rtems_unsigned16 *)((rtems_unsigned8 *)(base) + (ofs))
     28    (volatile uint16_t   *)((uint8_t  *)(base) + (ofs))
    2929#define MCF5206E_REG32(base,ofs) \
    30     (volatile rtems_unsigned32 *)((rtems_unsigned8 *)(base) + (ofs))
     30    (volatile uint32_t   *)((uint8_t  *)(base) + (ofs))
    3131#endif
    3232
  • c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h

    ra4a1ccf r8bc4430b  
    2929
    3030typedef struct mcfmbus {
    31     rtems_unsigned32       base; /* ColdFire internal peripherial base
     31    uint32_t         base; /* ColdFire internal peripherial base
    3232                                    address */
    3333    enum mcfmbus_i2c_state state;/* State of I2C machine */
     
    3939    rtems_id               sema; /* MBUS semaphore */
    4040    i2c_transfer_done      done; /* Transfer done function */
    41     rtems_unsigned32       done_arg; /* Done function argument */
     41    uint32_t         done_arg; /* Done function argument */
    4242} mcfmbus;
    4343
     
    5353 */
    5454rtems_status_code
    55 mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32 base);
     55mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t  base);
    5656
    5757/* mcfmbus_select_clock_divider --
     
    8989rtems_status_code
    9090mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg,
    91                      i2c_transfer_done done, rtems_unsigned32 done_arg);
     91                     i2c_transfer_done done, uint32_t  done_arg);
    9292
    9393/* mcfmbus_i2c_done --
  • c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h

    ra4a1ccf r8bc4430b  
    3434 */
    3535typedef struct mcfuart {
    36    rtems_unsigned32          chn;      /* UART channel number */
    37    rtems_unsigned8           intvec;   /* UART interrupt vector number, or
     36   uint32_t            chn;      /* UART channel number */
     37   uint8_t             intvec;   /* UART interrupt vector number, or
    3838                                          0 if polled I/O */
    3939   void                     *tty;      /* termios channel descriptor */
    4040   
    4141   volatile const char      *tx_buf;    /* Transmit buffer from termios */
    42    volatile rtems_unsigned32 tx_buf_len;/* Transmit buffer length */
    43    volatile rtems_unsigned32 tx_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*/
    4444   rtems_isr_entry           old_handler;/* Saved interrupt handler */
    4545   
     
    5555 */
    5656rtems_status_code
    57 mcfuart_init(mcfuart *uart, void *tty, rtems_unsigned8 intvec,
    58              rtems_unsigned32 chn);
     57mcfuart_init(mcfuart *uart, void *tty, uint8_t  intvec,
     58             uint32_t  chn);
    5959
    6060/* mcfuart_reset --
  • c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c

    ra4a1ccf r8bc4430b  
    113113{
    114114    i2c_event event;
    115     rtems_unsigned8 status, control;
     115    uint8_t  status, control;
    116116    rtems_interrupt_level level;
    117117    rtems_interrupt_disable(level);
     
    173173mcfmbus_machine(mcfmbus *bus, i2c_event event)
    174174{
    175     rtems_unsigned8 b;
     175    uint8_t  b;
    176176    switch (bus->state)
    177177    {
     
    283283                case EVENT_ACK:
    284284                {
    285                     rtems_unsigned8 b = (bus->cmsg->addr & 0xff);
     285                    uint8_t  b = (bus->cmsg->addr & 0xff);
    286286                    mcfmbus_send(bus, b);
    287287                    if (bus->state == STATE_ADDR_1_W)
     
    505505 */
    506506rtems_status_code
    507 mcfmbus_initialize(mcfmbus *i2c_bus, rtems_unsigned32 base)
     507mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t  base)
    508508{
    509509    rtems_interrupt_level level;
     
    562562rtems_status_code
    563563mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg,
    564                      i2c_transfer_done done, rtems_unsigned32 done_arg)
     564                     i2c_transfer_done done, uint32_t  done_arg)
    565565{
    566566    if (bus != mbus)
     
    592592{
    593593    rtems_status_code sc;
    594     rtems_unsigned32 base;
     594    uint32_t  base;
    595595    if (mbus == NULL)
    596596        return RTEMS_NOT_CONFIGURED;
  • c/src/lib/libcpu/m68k/mcf5206/timer/timer.c

    ra4a1ccf r8bc4430b  
    2929#define TRR2_VAL 65530 
    3030
    31 rtems_unsigned32 Timer_interrupts;
     31uint32_t  Timer_interrupts;
    3232
    3333rtems_boolean Timer_driver_Find_average_overhead;
     
    106106Read_timer( void )
    107107{
    108     rtems_unsigned16 clicks;
    109     rtems_unsigned32 total;
     108    uint16_t  clicks;
     109    uint32_t  total;
    110110
    111111    /*
Note: See TracChangeset for help on using the changeset viewer.