Changeset 0f458a3 in rtems


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

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

  • clock/ckinit.c, console/console.c, include/bsp.h, spurious/spinit.c, startup/bspstart.c, startup/vmeintr.c, timer/timer.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/m68k/dmv152
Files:
8 edited

Legend:

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

    r2a7e204 r0f458a3  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * clock/ckinit.c, console/console.c, include/bsp.h,
     4        spurious/spinit.c, startup/bspstart.c, startup/vmeintr.c,
     5        timer/timer.c: Convert to using c99 fixed size types.
     6
    172004-02-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c

    r2a7e204 r0f458a3  
    2323#include <rtems/libio.h>
    2424
    25 rtems_unsigned32 Clock_isrs;        /* ISRs until next tick */
    26 volatile rtems_unsigned32 Clock_driver_ticks;
     25uint32_t        Clock_isrs;        /* ISRs until next tick */
     26volatile uint32_t        Clock_driver_ticks;
    2727                                    /* ticks since initialization */
    2828rtems_isr_entry  Old_ticker;
     
    6565)
    6666{
    67   rtems_unsigned8 data;
     67  uint8_t        data;
    6868
    6969  Clock_driver_ticks = 0;
     
    8787   */
    8888
    89   data = (*(rtems_unsigned8 *)0x0D00000B);
    90   (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x7F) | 0x60;
     89  data = (*(uint8_t*)0x0D00000B);
     90  (*(uint8_t*)0x0D00000B) = (data & 0x7F) | 0x60;
    9191
    9292  Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xC6 );
     
    9797void Clock_exit( void )
    9898{
    99   rtems_unsigned8 data;
     99  uint8_t        data;
    100100
    101101  Z8x36_READ ( TIMER, MASTER_INTR, data );
     
    128128)
    129129{
    130     rtems_unsigned32 isrlevel;
     130    uint32_t        isrlevel;
    131131    rtems_libio_ioctl_args_t *args = pargp;
    132132 
  • c/src/lib/libbsp/m68k/dmv152/console/console.c

    r2a7e204 r0f458a3  
    3232)
    3333{
    34   rtems_unsigned32 control;
    35   rtems_unsigned32 data;
    36   rtems_unsigned8  rr_0;
     34  uint32_t        control;
     35  uint32_t        data;
     36  uint8_t          rr_0;
    3737
    3838  if ( port == 0 ) {
     
    6161int console_inbyte_nonblocking(int port)
    6262{
    63   rtems_unsigned32 control;
    64   rtems_unsigned32 data;
    65   rtems_unsigned8  rr_0;
     63  uint32_t        control;
     64  uint32_t        data;
     65  uint8_t          rr_0;
    6666  char             ch;
    6767
  • c/src/lib/libbsp/m68k/dmv152/include/bsp.h

    r2a7e204 r0f458a3  
    7070  { \
    7171    set_vector( (handler), 0x50, 1 );  \
    72     (*(volatile rtems_unsigned32 *)0x0d800024) = 0x50; /* set IVECT reg */ \
    73     (*(volatile rtems_unsigned8  *)0x0d00000c) = 0x40; /* set VIE reg */ \
     72    (*(volatile uint32_t*)0x0d800024) = 0x50; /* set IVECT reg */ \
     73    (*(volatile uint8_t*)0x0d00000c) = 0x40; /* set VIE reg */ \
    7474  }
    7575
    7676#define Cause_tm27_intr()  \
    77   (*(volatile rtems_unsigned8 *)0x0d000003) = 0x0f  /* set VINT */
     77  (*(volatile uint8_t*)0x0d000003) = 0x0f  /* set VINT */
    7878
    7979#define Clear_tm27_intr()  /* no operation necessary */
     
    8787
    8888#define rtems_bsp_delay( microseconds ) \
    89   { register rtems_unsigned32 _delay=(microseconds); \
    90     register rtems_unsigned32 _tmp=123; \
     89  { register uint32_t        _delay=(microseconds); \
     90    register uint32_t        _tmp=123; \
    9191    asm volatile( "0: \
    9292                     nbcd      %0 ; \
     
    122122#define ACC_BASE    0x0D000000
    123123
    124 #define ACC_STAT0   ((volatile rtems_unsigned8 *) (ACC_BASE + 0x00))
    125 #define ACC_STAT1   ((volatile rtems_unsigned8 *) (ACC_BASE + 0x01))
    126 #define ACC_GENCTL  ((volatile rtems_unsigned8 *) (ACC_BASE + 0x02))
    127 #define ACC_VINT    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x03))
    128 #define ACC_VREQ    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x04))
    129 #define ACC_VARB    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x05))
    130 #define ACC_ID      ((volatile rtems_unsigned8 *) (ACC_BASE + 0x06))
    131 #define ACC_CTL2    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x07))
    132 #define ACC_7IS     ((volatile rtems_unsigned8 *) (ACC_BASE + 0x08))
    133 #define ACC_LIS     ((volatile rtems_unsigned8 *) (ACC_BASE + 0x09))
    134 #define ACC_7IE     ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0A))
    135 #define ACC_LIE     ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0B))
    136 #define ACC_VIE     ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0C))
    137 #define ACC_IC10    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0D))
    138 #define ACC_IC32    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0E))
    139 #define ACC_IC54    ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0F))
     124#define ACC_STAT0   ((volatile uint8_t*) (ACC_BASE + 0x00))
     125#define ACC_STAT1   ((volatile uint8_t*) (ACC_BASE + 0x01))
     126#define ACC_GENCTL  ((volatile uint8_t*) (ACC_BASE + 0x02))
     127#define ACC_VINT    ((volatile uint8_t*) (ACC_BASE + 0x03))
     128#define ACC_VREQ    ((volatile uint8_t*) (ACC_BASE + 0x04))
     129#define ACC_VARB    ((volatile uint8_t*) (ACC_BASE + 0x05))
     130#define ACC_ID      ((volatile uint8_t*) (ACC_BASE + 0x06))
     131#define ACC_CTL2    ((volatile uint8_t*) (ACC_BASE + 0x07))
     132#define ACC_7IS     ((volatile uint8_t*) (ACC_BASE + 0x08))
     133#define ACC_LIS     ((volatile uint8_t*) (ACC_BASE + 0x09))
     134#define ACC_7IE     ((volatile uint8_t*) (ACC_BASE + 0x0A))
     135#define ACC_LIE     ((volatile uint8_t*) (ACC_BASE + 0x0B))
     136#define ACC_VIE     ((volatile uint8_t*) (ACC_BASE + 0x0C))
     137#define ACC_IC10    ((volatile uint8_t*) (ACC_BASE + 0x0D))
     138#define ACC_IC32    ((volatile uint8_t*) (ACC_BASE + 0x0E))
     139#define ACC_IC54    ((volatile uint8_t*) (ACC_BASE + 0x0F))
    140140
    141141/* constants */
  • c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c

    r2a7e204 r0f458a3  
    3737  void *pargp,
    3838  rtems_id tid,
    39   rtems_unsigned32 *rval
     39  uint32_t        *rval
    4040)
    4141{
  • c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c

    r2a7e204 r0f458a3  
    3838 
    3939void bsp_postdriver_hook(void);
    40 void bsp_libc_init( void *, unsigned32, int );
     40void bsp_libc_init( void *, uint32_t, int );
    4141void bsp_pretasking_hook(void);               /* m68k version */
    4242 
  • c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c

    r2a7e204 r0f458a3  
    2727)
    2828{
    29   volatile rtems_unsigned8  *VME_interrupt_enable;
    30   rtems_unsigned8  value;
     29  volatile uint8_t          *VME_interrupt_enable;
     30  uint8_t          value;
    3131
    3232  VME_interrupt_enable = ACC_VIE;
     
    4848)
    4949{
    50   volatile rtems_unsigned8  *VME_interrupt_enable;
    51   rtems_unsigned8  value;
     50  volatile uint8_t          *VME_interrupt_enable;
     51  uint8_t          value;
    5252
    5353  VME_interrupt_enable = ACC_VIE;
  • c/src/lib/libbsp/m68k/dmv152/timer/timer.c

    r2a7e204 r0f458a3  
    2929void Timer_initialize()
    3030{
    31   rtems_unsigned8 data;
     31  uint8_t        data;
    3232
    3333  (void) set_vector( timerisr, TIMER_VECTOR, 0 );  /* install ISR */
     
    5555   */
    5656
    57   data = (*(rtems_unsigned8 *)0x0D00000B);
    58   (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x0F) | 0x60;
     57  data = (*(uint8_t*)0x0D00000B);
     58  (*(uint8_t*)0x0D00000B) = (data & 0x0F) | 0x60;
    5959
    6060}
     
    6666int Read_timer()
    6767{
    68   rtems_unsigned8 data;
    69   rtems_unsigned8  msb, lsb;
    70   rtems_unsigned32 remaining, total;
     68  uint8_t        data;
     69  uint8_t          msb, lsb;
     70  uint32_t        remaining, total;
    7171
    7272  Z8x36_WRITE( TIMER, CT1_CMD_STATUS,  0xce ); /* read the counter value */
Note: See TracChangeset for help on using the changeset viewer.