Changeset 090760c in rtems


Ignore:
Timestamp:
Mar 31, 2004, 4:20:42 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
945ace0d
Parents:
5601b2b2
Message:

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

  • clock/ckinit.c, include/bsp.h, shmsupp/addrconv.c, shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/i960/cvme961
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i960/cvme961/ChangeLog

    r5601b2b2 r090760c  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * clock/ckinit.c, include/bsp.h, shmsupp/addrconv.c,
     4        shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c,
     5        startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size
     6        types.
     7
    182004-02-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • c/src/lib/libbsp/i960/cvme961/clock/ckinit.c

    r5601b2b2 r090760c  
    2525#define CLOCK_VECTOR 5
    2626
    27 rtems_unsigned32 Clock_isrs;              /* ISRs until next tick */
     27uint32_t        Clock_isrs;              /* ISRs until next tick */
    2828i960_isr_entry   Old_ticker;
    29 volatile rtems_unsigned32 Clock_driver_ticks;
     29volatile uint32_t        Clock_driver_ticks;
    3030                                          /* ticks since initialization */
    3131
     
    9494)
    9595{
    96     rtems_unsigned32 isrlevel;
     96    uint32_t        isrlevel;
    9797    rtems_libio_ioctl_args_t *args = pargp;
    9898 
  • c/src/lib/libbsp/i960/cvme961/include/bsp.h

    r5601b2b2 r090760c  
    7373
    7474#define rtems_bsp_delay( microseconds ) \
    75   { register rtems_unsigned32 _delay=(microseconds); \
    76     register rtems_unsigned32 _tmp = 0; /* initialized to avoid warning */ \
     75  { register uint32_t        _delay=(microseconds); \
     76    register uint32_t        _tmp = 0; /* initialized to avoid warning */ \
    7777    asm volatile( "0: \
    7878                     remo      3,31,%0 ; \
  • c/src/lib/libbsp/i960/cvme961/shmsupp/addrconv.c

    r5601b2b2 r090760c  
    2929)
    3030{
    31   rtems_unsigned32 workaddr = (rtems_unsigned32) address;
     31  uint32_t         workaddr = (uint32_t) address;
    3232
    3333  if ( workaddr >= 0xffff0000 )
    3434    workaddr = (workaddr & 0xffff) | 0xb4000000;
    35   return ( (rtems_unsigned32 *)workaddr );
     35  return ( (uint32_t*)workaddr );
    3636}
  • c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c

    r5601b2b2 r090760c  
    5555
    5656void Shm_Get_configuration(
    57   rtems_unsigned32   localnode,
     57  uint32_t           localnode,
    5858  shm_config_table **shmcfg
    5959)
     
    6161#if ( USE_ONBOARD_RAM == 1 )
    6262   if ( Shm_RTEMS_MP_Configuration->node == MASTER )
    63      BSP_shm_cfgtbl.base   = (rtems_unsigned32 *)0x00300000;
     63     BSP_shm_cfgtbl.base   = (uint32_t*)0x00300000;
    6464   else
    65      BSP_shm_cfgtbl.base   = (rtems_unsigned32 *)0x10300000;
     65     BSP_shm_cfgtbl.base   = (uint32_t*)0x10300000;
    6666#else
    67    BSP_shm_cfgtbl.base     = (rtems_unsigned32 *)0x20000000;
     67   BSP_shm_cfgtbl.base     = (uint32_t*)0x20000000;
    6868#endif
    6969
     
    8787   BSP_shm_cfgtbl.poll_intr    = INTR_MODE;
    8888   BSP_shm_cfgtbl.Intr.address =
    89         (rtems_unsigned32 *) (0xffff0021|((localnode-1) << 12));
     89        (uint32_t*) (0xffff0021|((localnode-1) << 12));
    9090                                                          /* use ICMS0 */
    9191   BSP_shm_cfgtbl.Intr.value   = 1;
  • c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c

    r5601b2b2 r090760c  
    4545)
    4646{
    47   rtems_unsigned32 isr_level, oldlock;
     47  uint32_t        isr_level, oldlock;
    4848
    4949  rtems_interrupt_disable( isr_level );
     
    6767)
    6868{
    69   rtems_unsigned32 isr_level;
     69  uint32_t        isr_level;
    7070
    7171  lq_cb->lock = SHM_UNLOCK_VALUE;
  • c/src/lib/libbsp/i960/cvme961/shmsupp/mpisr.c

    r5601b2b2 r090760c  
    2626)
    2727{
    28   rtems_unsigned32 vic_vector;
     28  uint32_t        vic_vector;
    2929
    3030  /* enable_tracing(); */
    31   vic_vector = (*(volatile rtems_unsigned8 *)0xb6000007);
     31  vic_vector = (*(volatile uint8_t*)0xb6000007);
    3232                                           /* reset intr by reading */
    3333                                           /*   vector at IPL=3 */
    3434  Shm_Interrupt_count += 1;
    3535  rtems_multiprocessing_announce();
    36   (*(volatile rtems_unsigned8 *)0xa000005f) = 0; /* clear ICMS0 */
     36  (*(volatile uint8_t*)0xa000005f) = 0; /* clear ICMS0 */
    3737  i960_clear_intr( 6 );
    3838
     
    5353void Shm_setvec()
    5454{
    55   rtems_unsigned32 isrlevel;
     55  uint32_t        isrlevel;
    5656
    5757  rtems_interrupt_disable( isrlevel );
    5858                                        /* set SQSIO4 CTL REG for */
    5959                                        /*   VME slave address */
    60     (*(rtems_unsigned8 *)0xc00000b0) =
     60    (*(uint8_t*)0xc00000b0) =
    6161      (Shm_RTEMS_MP_Configuration->node - 1) | 0x10;
    6262    set_vector( Shm_isr_cvme961, 6, 1 );
    6363                                        /* set ICMS Bector Base Register */
    64     (*(rtems_unsigned8 *)0xa0000053) = 0x60;  /* XINT6 vector is 0x62 */
     64    (*(uint8_t*)0xa0000053) = 0x60;  /* XINT6 vector is 0x62 */
    6565                                        /* set  ICMS Intr Control Reg */
    66     (*(rtems_unsigned8 *)0xa0000047) = 0xeb;  /* ICMS0 enabled, IPL=0 */
    67     (*(rtems_unsigned8 *)0xa000005f) = 0;     /* clear ICMS0 */
     66    (*(uint8_t*)0xa0000047) = 0xeb;  /* ICMS0 enabled, IPL=0 */
     67    (*(uint8_t*)0xa000005f) = 0;     /* clear ICMS0 */
    6868  rtems_interrupt_enable( isrlevel );
    6969}
  • c/src/lib/libbsp/i960/cvme961/startup/bspstart.c

    r5601b2b2 r090760c  
    4141 
    4242void bsp_postdriver_hook(void);
    43 void bsp_libc_init( void *, unsigned32, int );
     43void bsp_libc_init( void *, uint32_t, int );
    4444
    4545/*
     
    6060{
    6161    extern int end;
    62     rtems_unsigned32        heap_start;
     62    uint32_t                heap_start;
    6363
    64     heap_start = (rtems_unsigned32) &end;
     64    heap_start = (uint32_t) &end;
    6565    if (heap_start & (CPU_ALIGNMENT-1))
    6666        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
     
    8383  /* set node number in SQSIO4 CTL REG */
    8484
    85   *((rtems_unsigned32 *)0xc00000b0) =
     85  *((uint32_t*)0xc00000b0) =
    8686       (Configuration.User_multiprocessing_table) ?
    8787          Configuration.User_multiprocessing_table->node : 0;
  • c/src/lib/libbsp/i960/cvme961/timer/timer.c

    r5601b2b2 r090760c  
    7575int Read_timer()
    7676{
    77   rtems_unsigned8  msb, lsb;
    78   rtems_unsigned32 remaining, total;
     77  uint8_t          msb, lsb;
     78  uint32_t        remaining, total;
    7979
    8080  Z8x36_WRITE( TIMER, CT1_CMD_STATUS,  0xce );  /* read the counter value */
Note: See TracChangeset for help on using the changeset viewer.