Changeset bde7f268 in rtems


Ignore:
Timestamp:
Mar 31, 2004, 3:52:40 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
94993c0
Parents:
d352678
Message:

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

  • bootloader/misc.c, bootloader/pci.c, console/inch.c, include/bsp.h, pci/pci.c, startup/bspstart.c, startup/sbrk.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/powerpc/shared
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/shared/ChangeLog

    rd352678 rbde7f268  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * bootloader/misc.c, bootloader/pci.c, console/inch.c,
     4        include/bsp.h, pci/pci.c, startup/bspstart.c, startup/sbrk.c:
     5        Convert to using c99 fixed size types.
     6
    172004-03-05      Joel Sherrill <joel@OARcorp.com>
    28
  • c/src/lib/libbsp/powerpc/shared/bootloader/misc.c

    rd352678 rbde7f268  
    238238/* this is from rtems_bsp_delay from libcpu */
    239239void
    240 boot_udelay(unsigned32 _microseconds)
    241 {
    242    unsigned32 start, ticks, now;
     240boot_udelay(uint32_t  _microseconds)
     241{
     242   uint32_t  start, ticks, now;
    243243
    244244   ticks = _microseconds * ticks_per_ms / 1000;
  • c/src/lib/libbsp/powerpc/shared/bootloader/pci.c

    rd352678 rbde7f268  
    11161116static struct _addr_start
    11171117{
    1118       unsigned32 start_pcimem;
    1119       unsigned32 start_pciio;
    1120       unsigned32 start_prefetch;
     1118      uint32_t  start_pcimem;
     1119      uint32_t  start_pciio;
     1120      uint32_t  start_prefetch;
    11211121} astart;
    11221122
     
    11811181      {
    11821182         struct _addr_start   addrhold;
    1183          unsigned8            base8, limit8;
    1184          unsigned16           base16, limit16, ubase16, ulimit16;
     1183         uint8_t              base8, limit8;
     1184         uint16_t             base16, limit16, ubase16, ulimit16;
    11851185
    11861186         /* save the base address values */
     
    12131213         else
    12141214         {
    1215             base8    = (unsigned8) ((addrhold.start_pciio >> 8) & 0xf0);
    1216             ubase16  = (unsigned16)(addrhold.start_pciio >> 16);
    1217             limit8   = (unsigned8) ((astart.start_pciio >> 8 ) & 0xf0);
    1218             ulimit16 = (unsigned16)(astart.start_pciio >> 16);
     1215            base8    = (uint8_t) ((addrhold.start_pciio >> 8) & 0xf0);
     1216            ubase16  = (uint16_t)(addrhold.start_pciio >> 16);
     1217            limit8   = (uint8_t) ((astart.start_pciio >> 8 ) & 0xf0);
     1218            ulimit16 = (uint16_t)(astart.start_pciio >> 16);
    12191219            astart.start_pciio += 0x1000;
    12201220         }
     
    12411241         else
    12421242         {
    1243             limit16= (unsigned16)((astart.start_pcimem >> 16) & 0xfff0);
    1244             base16 = (unsigned16)((addrhold.start_pcimem >> 16) & 0xfff0);
     1243            limit16= (uint16_t)((astart.start_pcimem >> 16) & 0xfff0);
     1244            base16 = (uint16_t)((addrhold.start_pcimem >> 16) & 0xfff0);
    12451245            astart.start_pcimem += 0x100000;
    12461246         }
     
    12621262         else
    12631263         {
    1264             limit16= (unsigned16)((addrhold.start_prefetch >> 16) & 0xfff0);
    1265             base16 = (unsigned16)((astart.start_prefetch >> 16) & 0xfff0);
     1264            limit16= (uint16_t)((addrhold.start_prefetch >> 16) & 0xfff0);
     1265            base16 = (uint16_t)((astart.start_prefetch >> 16) & 0xfff0);
    12661266            astart.start_prefetch -= 0x100000;
    12671267         }
     
    12781278
    12791279#ifdef WRITE_BRIDGE_ENABLE
    1280          pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_BRIDGE_CONTROL, (unsigned16)( PCI_BRIDGE_CTL_PARITY |
     1280         pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_BRIDGE_CONTROL, (uint16_t)( PCI_BRIDGE_CTL_PARITY |
    12811281                                                                                                     PCI_BRIDGE_CTL_SERR ));
    12821282
    1283          pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_COMMAND, (unsigned16)( PCI_COMMAND_IO |
     1283         pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_COMMAND, (uint16_t)( PCI_COMMAND_IO |
    12841284                                                                                              PCI_COMMAND_MEMORY |
    12851285                                                                                              PCI_COMMAND_MASTER |
  • c/src/lib/libbsp/powerpc/shared/console/inch.c

    rd352678 rbde7f268  
    6060
    6161static char             kbd_buffer[KBD_BUF_SIZE];
    62 static rtems_unsigned16 kbd_first = 0;
    63 static rtems_unsigned16 kbd_last  = 0;
    64 static rtems_unsigned16 kbd_end   = KBD_BUF_SIZE - 1;
     62static uint16_t        kbd_first = 0;
     63static uint16_t        kbd_last  = 0;
     64static uint16_t        kbd_end   = KBD_BUF_SIZE - 1;
    6565
    6666/*-------------------------------------------------------------------------+
  • c/src/lib/libbsp/powerpc/shared/include/bsp.h

    rd352678 rbde7f268  
    134134#define Cause_tm27_intr()  \
    135135  do { \
    136     unsigned32 _clicks = 8; \
     136    uint32_t  _clicks = 8; \
    137137    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
    138138  } while (0)
     
    141141#define Clear_tm27_intr() \
    142142  do { \
    143     unsigned32 _clicks = 0xffffffff; \
     143    uint32_t  _clicks = 0xffffffff; \
    144144    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
    145145  } while (0)
     
    147147#define Lower_tm27_intr() \
    148148  do { \
    149     unsigned32 _msr = 0; \
     149    uint32_t  _msr = 0; \
    150150    _ISR_Set_level( 0 ); \
    151151    asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
  • c/src/lib/libbsp/powerpc/shared/pci/pci.c

    rd352678 rbde7f268  
    283283{
    284284   int          pbus, pslot;
    285    unsigned8    bussec, buspri;
    286    unsigned16   devid, vendorid, dclass;
     285   uint8_t      bussec, buspri;
     286   uint16_t     devid, vendorid, dclass;
    287287
    288288   for(pbus=0; pbus< BusCountPCI(); pbus++)
     
    338338{
    339339   unsigned char        cvalue;
    340    unsigned16           devid;
     340   uint16_t             devid;
    341341   int                  ismatch, i, j, pbus, pslot, int_pin, int_name;
    342342
  • c/src/lib/libbsp/powerpc/shared/startup/bspstart.c

    rd352678 rbde7f268  
    113113 
    114114void bsp_postdriver_hook(void);
    115 void bsp_libc_init( void *, unsigned32, int );
     115void bsp_libc_init( void *, uint32_t, int );
    116116
    117117/*
     
    131131void bsp_pretasking_hook(void)
    132132{
    133     rtems_unsigned32        heap_start;   
    134     rtems_unsigned32        heap_size;
    135     rtems_unsigned32        heap_sbrk_spared;
    136         extern rtems_unsigned32 _bsp_sbrk_init(rtems_unsigned32, rtems_unsigned32*);
    137 
    138     heap_start = ((rtems_unsigned32) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
     133    uint32_t                heap_start;   
     134    uint32_t                heap_size;
     135    uint32_t                heap_sbrk_spared;
     136        extern uint32_t         _bsp_sbrk_init(uint32_t, uint32_t*);
     137
     138    heap_start = ((uint32_t) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
    139139    if (heap_start & (CPU_ALIGNMENT-1))
    140140        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
     
    221221
    222222 /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
    223   *((unsigned32 *)stack) = 0;
     223  *((uint32_t*)stack) = 0;
    224224
    225225  /*
     
    233233
    234234  /* make sure it's properly aligned */
    235   (unsigned32)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
     235  (uint32_t)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
    236236
    237237  /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
    238   *((unsigned32 *)intrStack) = 0;
     238  *((uint32_t*)intrStack) = 0;
    239239
    240240  _write_SPRG1((unsigned int)intrStack);
  • c/src/lib/libbsp/powerpc/shared/startup/sbrk.c

    rd352678 rbde7f268  
    2828#include <unistd.h>
    2929
    30 static rtems_unsigned32 remaining_start=0;
    31 static rtems_unsigned32 remaining_size=0;
     30static uint32_t        remaining_start=0;
     31static uint32_t        remaining_size=0;
    3232
    3333#define LIMIT_32M  0x02000000
    3434
    35 rtems_unsigned32
    36 _bsp_sbrk_init(rtems_unsigned32 heap_start, rtems_unsigned32 *heap_size_p)
     35uint32_t       
     36_bsp_sbrk_init(uint32_t         heap_start, uint32_t        *heap_size_p)
    3737{
    38   rtems_unsigned32 rval=0;
     38  uint32_t        rval=0;
    3939
    4040  remaining_start =  heap_start;
Note: See TracChangeset for help on using the changeset viewer.