Changeset a4318d0 in rtems


Ignore:
Timestamp:
Mar 31, 2004, 4:39:50 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
24282451
Parents:
629e12a
Message:

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

  • clock/ckinit.c, include/bare.h, include/bsp.h, include/crc.h, startup/bspstart.c, startup/cpuboot.c, startup/crc.c, startup/gdb-hooks.c, startup/m68302scc.c, timer/timer.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/m68k/ods68302
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/m68k/ods68302/ChangeLog

    r629e12a ra4318d0  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * clock/ckinit.c, include/bare.h, include/bsp.h, include/crc.h,
     4        startup/bspstart.c, startup/cpuboot.c, startup/crc.c,
     5        startup/gdb-hooks.c, startup/m68302scc.c, timer/timer.c: Convert to
     6        using c99 fixed size types.
     7
    182004-02-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c

    r629e12a ra4318d0  
    3939 *  number of clock ticks since the driver was initialized.
    4040 */
    41 volatile rtems_unsigned32 Clock_driver_ticks;
     41volatile uint32_t        Clock_driver_ticks;
    4242
    4343/*
     
    4848 *  has passed.
    4949 */
    50 rtems_unsigned32 Clock_isrs;
     50uint32_t        Clock_isrs;
    5151
    5252void Clock_exit( void );
     
    130130)
    131131{
    132     rtems_unsigned32 isrlevel;
     132    uint32_t        isrlevel;
    133133    rtems_libio_ioctl_args_t *args = pargp;
    134134 
  • c/src/lib/libbsp/m68k/ods68302/include/bare.h

    r629e12a ra4318d0  
    157157/* Write */
    158158#define WRITE_REGISTER_8(address, data) \
    159                  *((rtems_unsigned8 *) (address)) = ((rtems_unsigned8) (data))
     159                 *((uint8_t*) (address)) = ((uint8_t) (data))
    160160#define WRITE_REGISTER_16(address, data) \
    161                  *((rtems_unsigned16 *) (address)) = ((rtems_unsigned16) (data))
     161                 *((uint16_t*) (address)) = ((uint16_t) (data))
    162162#define WRITE_REGISTER_32(address, data) \
    163                  *((rtems_unsigned32 *) (address)) = ((rtems_unsigned32) (data))
     163                 *((uint32_t*) (address)) = ((uint32_t) (data))
    164164/* Read */
    165 #define READ_REGISTER_8(address, data) data = *((rtems_unsigned8 *) (address))
    166 #define READ_REGISTER_16(address, data) data = *((rtems_unsigned16 *) (address))
    167 #define READ_REGISTER_32(address, data) data = *((rtems_unsigned32 *) (address))
     165#define READ_REGISTER_8(address, data) data = *((uint8_t*) (address))
     166#define READ_REGISTER_16(address, data) data = *((uint16_t*) (address))
     167#define READ_REGISTER_32(address, data) data = *((uint32_t*) (address))
    168168
    169169/* CS2 : Peripherials */
     
    229229 /* update the display, needs a long word */
    230230#define UPDATE_DISPLAY(LongWordPtr) \
    231          ( WRITE_REGISTER_16(DISPLAY_BASE, *(((rtems_unsigned8 *) LongWordPtr) + 3)), \
    232            WRITE_REGISTER_16(DISPLAY_BASE + 2, *(((rtems_unsigned8 *) LongWordPtr) + 2)), \
    233            WRITE_REGISTER_16(DISPLAY_BASE + 4, *(((rtems_unsigned8 *) LongWordPtr) + 1)), \
    234            WRITE_REGISTER_16(DISPLAY_BASE + 6, *((rtems_unsigned8 *) LongWordPtr)) )
     231         ( WRITE_REGISTER_16(DISPLAY_BASE, *(((uint8_t*) LongWordPtr) + 3)), \
     232           WRITE_REGISTER_16(DISPLAY_BASE + 2, *(((uint8_t*) LongWordPtr) + 2)), \
     233           WRITE_REGISTER_16(DISPLAY_BASE + 4, *(((uint8_t*) LongWordPtr) + 1)), \
     234           WRITE_REGISTER_16(DISPLAY_BASE + 6, *((uint8_t*) LongWordPtr)) )
    235235
    236236/* make a better test, say switches */
  • c/src/lib/libbsp/m68k/ods68302/include/bsp.h

    r629e12a ra4318d0  
    7979
    8080#define rtems_bsp_delay( microseconds ) \
    81   { register rtems_unsigned32 _delay=(microseconds); \
    82     register rtems_unsigned32 _tmp=123; \
     81  { register uint32_t        _delay=(microseconds); \
     82    register uint32_t        _tmp=123; \
    8383    asm volatile( "0: \
    8484                     nbcd      %0 ; \
  • c/src/lib/libbsp/m68k/ods68302/include/crc.h

    r629e12a ra4318d0  
    1919#endif
    2020
    21 rtems_unsigned16 calc_crc(void *data, rtems_unsigned32 count);
     21uint16_t         calc_crc(void *data, uint32_t        count);
    2222
    2323#if __cplusplus
  • c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c

    r629e12a ra4318d0  
    3939 
    4040void bsp_postdriver_hook(void);
    41 void bsp_libc_init( void *, unsigned32, int );
     41void bsp_libc_init( void *, uint32_t, int );
    4242void bsp_pretasking_hook(void);               /* m68k version */
    4343
  • c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c

    r629e12a ra4318d0  
    9696void boot_phase_2(void)
    9797{
    98   rtems_unsigned32 stack;
     98  uint32_t        stack;
    9999 
    100100#if defined(LED_CONTROL)
     
    112112
    113113  /* seems to want 2, looked at assember code output */
    114   *((volatile rtems_unsigned32*) (&stack + 2)) |= ROM_BASE;
     114  *((volatile uint32_t*) (&stack + 2)) |= ROM_BASE;
    115115}
    116116
  • c/src/lib/libbsp/m68k/ods68302/startup/crc.c

    r629e12a ra4318d0  
    1919 */
    2020
    21 static const rtems_unsigned16 factor[] =
     21static const uint16_t        factor[] =
    2222 {
    2323   0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
     
    6767*/
    6868
    69 rtems_unsigned16 calc_crc(void* vdata,            /* pointer to memory block */
    70                           rtems_unsigned32 count) /* length of block in bytes */
     69uint16_t        calc_crc(void* vdata,            /* pointer to memory block */
     70                          uint32_t        count) /* length of block in bytes */
    7171{
    72    register rtems_unsigned8 *data = vdata;
    73    register rtems_unsigned16 crc;
    74    register rtems_unsigned32 byte;
     72   register uint8_t        *data = vdata;
     73   register uint16_t        crc;
     74   register uint32_t        byte;
    7575
    7676    /* initialise to either 0x0 or 0xffff depending on the
  • c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c

    r629e12a ra4318d0  
    4646
    4747typedef struct {
    48   rtems_unsigned16 move_a7;            /* move #FORMAT_ID,%a7@- */
    49   rtems_unsigned16 format_id;
    50   rtems_unsigned16 jmp;                /* jmp  _ISR_Handlers */
    51   rtems_unsigned32 isr_handler;
     48  uint16_t        move_a7;            /* move #FORMAT_ID,%a7@- */
     49  uint16_t        format_id;
     50  uint16_t        jmp;                /* jmp  _ISR_Handlers */
     51  uint32_t        isr_handler;
    5252} GDB_HANDLER_ENTRY;
    5353
     
    6565void exceptionHandler(unsigned int vector, void *handler)
    6666{
    67   rtems_unsigned32 *interrupt_table = 0;
     67  uint32_t        *interrupt_table = 0;
    6868 
    6969  gdb_jump_table[vector].move_a7 = M68K_MOVE_A7;
    7070  gdb_jump_table[vector].format_id = vector;
    7171  gdb_jump_table[vector].jmp = M68K_JMP;
    72   gdb_jump_table[vector].isr_handler = (rtems_unsigned32) handler;
     72  gdb_jump_table[vector].isr_handler = (uint32_t) handler;
    7373
    74   interrupt_table[vector] = (rtems_unsigned32) &gdb_jump_table[vector];
     74  interrupt_table[vector] = (uint32_t) &gdb_jump_table[vector];
    7575}
    7676
  • c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c

    r629e12a ra4318d0  
    1919static int scc_translate[M68302_SCC_COUNT] = { 0, 0, 0 };
    2020
    21 static const rtems_unsigned16 baud_clocks[] =
     21static const uint16_t        baud_clocks[] =
    2222{
    2323  (SYSTEM_CLOCK / (  4800 * 16)),
     
    3131void scc_initialise(int channel, int baud, int translate)
    3232{
    33   rtems_unsigned16 scon;
     33  uint16_t        scon;
    3434 
    3535  if (channel < M68302_SCC_COUNT)
     
    4848    scc[channel]->bd.tx[0].length = 0;
    4949    scc[channel]->bd.tx[0].buffer =
    50       (rtems_unsigned8*) &(scc[channel]->bd.tx[1].buffer);
     50      (uint8_t*) &(scc[channel]->bd.tx[1].buffer);
    5151
    5252    scc[channel]->bd.rx[0].status = 0x2000;
    5353    scc[channel]->bd.rx[0].length = 0;
    5454    scc[channel]->bd.rx[0].buffer =
    55       (rtems_unsigned8*) &(scc[channel]->bd.rx[1].buffer);
     55      (uint8_t*) &(scc[channel]->bd.rx[1].buffer);
    5656
    5757    scc[channel]->parm.rfcr = 0x50;
     
    7979unsigned char scc_status(int channel, unsigned char status)
    8080{
    81   rtems_unsigned16 rx_status;
     81  uint16_t        rx_status;
    8282
    8383  m302.reg.wcn = 0;
  • c/src/lib/libbsp/m68k/ods68302/timer/timer.c

    r629e12a ra4318d0  
    4141                         */
    4242
    43 rtems_unsigned32 Timer_interrupts;
     43uint32_t        Timer_interrupts;
    4444
    4545rtems_boolean Timer_driver_Find_average_overhead;
     
    8080int Read_timer( void )
    8181{
    82   rtems_unsigned16 clicks;
    83   rtems_unsigned32 total;
     82  uint16_t        clicks;
     83  uint32_t        total;
    8484
    8585  /*
Note: See TracChangeset for help on using the changeset viewer.