Changeset 8c93623 in rtems


Ignore:
Timestamp:
Mar 31, 2004, 3:23:51 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
cba5e81
Parents:
ed9e449
Message:

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

  • include/bsp.h, include/canbus.h, include/info.h, network/network.c, startup/bspstart.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/powerpc/eth_comm
Files:
6 edited

Legend:

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

    red9e449 r8c93623  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * include/bsp.h, include/canbus.h, include/info.h,
     4        network/network.c, startup/bspstart.c: Convert to using c99 fixed
     5        size types.
     6
    172004-02-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h

    red9e449 r8c93623  
    114114void bsp_cleanup( void );
    115115
    116 void M860ExecuteRISC( rtems_unsigned16 command );
     116void M860ExecuteRISC( uint16_t  command );
    117117void *M860AllocateBufferDescriptors( int count );
    118118void *M860AllocateRiscTimers( int count );
  • c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h

    red9e449 r8c93623  
    2121
    2222typedef struct i82527_msg_t_ {
    23   rtems_unsigned8  ctrl0 __attribute__ ((packed));    /* Control 0 register */
    24   rtems_unsigned8  ctrl1 __attribute__ ((packed));    /* Control 1 register */
    25   rtems_unsigned32 arb __attribute__ ((packed));      /* Arbitration reg */
    26   rtems_unsigned8  cfg __attribute__ ((packed));      /* Message config reg */
    27   rtems_unsigned8  data[8] __attribute__ ((packed));  /* Actual message */
     23  uint8_t    ctrl0 __attribute__ ((packed));    /* Control 0 register */
     24  uint8_t    ctrl1 __attribute__ ((packed));    /* Control 1 register */
     25  uint32_t  arb __attribute__ ((packed));      /* Arbitration reg */
     26  uint8_t    cfg __attribute__ ((packed));      /* Message config reg */
     27  uint8_t    data[8] __attribute__ ((packed));  /* Actual message */
    2828} i82527_msg_t;
    2929
    3030typedef struct i82527_t_ {
    31   rtems_unsigned8  ctrl __attribute__ ((packed));    /* Control register */
    32   rtems_unsigned8  status __attribute__ ((packed));  /* Status register */
    33   rtems_unsigned8  cir __attribute__ ((packed));     /* CPU interface reg */
    34   rtems_unsigned8  _res0 __attribute__ ((packed));
    35   rtems_unsigned16 hsr __attribute__ ((packed));     /* High speed read */
    36   rtems_unsigned16 gms __attribute__ ((packed));     /* Global Mask - std */
    37   rtems_unsigned32 gml __attribute__ ((packed));     /* Global Mask - long */
    38   rtems_unsigned32 mlm __attribute__ ((packed));     /* Mask last message  */
     31  uint8_t    ctrl __attribute__ ((packed));    /* Control register */
     32  uint8_t    status __attribute__ ((packed));  /* Status register */
     33  uint8_t    cir __attribute__ ((packed));     /* CPU interface reg */
     34  uint8_t    _res0 __attribute__ ((packed));
     35  uint16_t  hsr __attribute__ ((packed));     /* High speed read */
     36  uint16_t  gms __attribute__ ((packed));     /* Global Mask - std */
     37  uint32_t  gml __attribute__ ((packed));     /* Global Mask - long */
     38  uint32_t  mlm __attribute__ ((packed));     /* Mask last message  */
    3939  i82527_msg_t     msg1 __attribute__ ((packed));    /* Message 1 */
    40   rtems_unsigned8  clkout __attribute__ ((packed));  /* CLKOUT register */
     40  uint8_t    clkout __attribute__ ((packed));  /* CLKOUT register */
    4141  i82527_msg_t     msg2 __attribute__ ((packed));    /* Message 2 */
    42   rtems_unsigned8  bcr __attribute__ ((packed));     /* Bus config register */
     42  uint8_t    bcr __attribute__ ((packed));     /* Bus config register */
    4343  i82527_msg_t     msg3 __attribute__ ((packed));    /* Message 3 */
    44   rtems_unsigned8  btr0 __attribute__ ((packed));    /* Bit timing reg 0 */
     44  uint8_t    btr0 __attribute__ ((packed));    /* Bit timing reg 0 */
    4545  i82527_msg_t     msg4 __attribute__ ((packed));    /* Message 4 */
    46   rtems_unsigned8  btr1 __attribute__ ((packed));    /* Bit timing reg 1 */
     46  uint8_t    btr1 __attribute__ ((packed));    /* Bit timing reg 1 */
    4747  i82527_msg_t     msg5 __attribute__ ((packed));    /* Message 5 */
    48   rtems_unsigned8  intr __attribute__ ((packed));    /* Interrupt register */
     48  uint8_t    intr __attribute__ ((packed));    /* Interrupt register */
    4949  i82527_msg_t     msg6 __attribute__ ((packed));    /* Message 6 */
    50   rtems_unsigned8  _res1 __attribute__ ((packed));
     50  uint8_t    _res1 __attribute__ ((packed));
    5151  i82527_msg_t     msg7 __attribute__ ((packed));    /* Message 7 */
    52   rtems_unsigned8  _res2 __attribute__ ((packed));
     52  uint8_t    _res2 __attribute__ ((packed));
    5353  i82527_msg_t     msg8 __attribute__ ((packed));    /* Message 8 */
    54   rtems_unsigned8  _res3 __attribute__ ((packed));
     54  uint8_t    _res3 __attribute__ ((packed));
    5555  i82527_msg_t     msg9 __attribute__ ((packed));    /* Message 9 */
    56   rtems_unsigned8  p1conf __attribute__ ((packed));  /* Port 1 config */
     56  uint8_t    p1conf __attribute__ ((packed));  /* Port 1 config */
    5757  i82527_msg_t     msg10 __attribute__ ((packed));   /* Message 10 */
    58   rtems_unsigned8  p2conf __attribute__ ((packed));  /* Port 2 config */
     58  uint8_t    p2conf __attribute__ ((packed));  /* Port 2 config */
    5959  i82527_msg_t     msg11 __attribute__ ((packed));   /* Message 11 */
    60   rtems_unsigned8  p1in __attribute__ ((packed));    /* Port 1 in */
     60  uint8_t    p1in __attribute__ ((packed));    /* Port 1 in */
    6161  i82527_msg_t     msg12 __attribute__ ((packed));   /* Message 12 */
    62   rtems_unsigned8  p2in __attribute__ ((packed));    /* Port 2 in */
     62  uint8_t    p2in __attribute__ ((packed));    /* Port 2 in */
    6363  i82527_msg_t     msg13 __attribute__ ((packed));   /* Message 13 */
    64   rtems_unsigned8  p1out __attribute__ ((packed));   /* Port 1 out */
     64  uint8_t    p1out __attribute__ ((packed));   /* Port 1 out */
    6565  i82527_msg_t     msg14 __attribute__ ((packed));   /* Message 14 */
    66   rtems_unsigned8  p2out __attribute__ ((packed));   /* Port 2 out */
     66  uint8_t    p2out __attribute__ ((packed));   /* Port 2 out */
    6767  i82527_msg_t     msg15 __attribute__ ((packed));   /* Message 15 */
    68   rtems_unsigned8  sra __attribute__ ((packed));     /* Serial reset address */
     68  uint8_t    sra __attribute__ ((packed));     /* Serial reset address */
    6969} i82527_t;
    7070
  • c/src/lib/libbsp/powerpc/eth_comm/include/info.h

    red9e449 r8c93623  
    1212
    1313typedef struct BoardInfoBlock_ {
    14   rtems_unsigned16       size;         /* size of info block in bytes */
    15   rtems_unsigned8        eth_id[6];    /* ethernet id of ethernet interface */
    16   rtems_unsigned32       cpu_spd;      /* cpu speed in Hz */
    17   rtems_unsigned32       flash_size;   /* size of flash memory in bytes */
    18   rtems_unsigned32       ram_size;     /* size of ram in bytes */
    19   rtems_unsigned32       version;      /* version of firmare (x.y format) */
    20   rtems_unsigned32       if429;        /* mask for arinc429 interface */
    21   rtems_unsigned32       ifcsdb;       /* mask for csdb interface */
    22   rtems_unsigned16       if232;        /* mask for rs232 interface */
    23   rtems_unsigned8        ifcan;        /* mask for canbus interface */
    24   rtems_unsigned8        if568;        /* mask for arinc568 interface */
    25   rtems_unsigned8        fpn[16];      /* Frasca part number in ASCII */
    26   rtems_unsigned16       rev;          /* Board revision */
    27   rtems_unsigned32       ip_num;       /* Board IP number */
     14  uint16_t         size;         /* size of info block in bytes */
     15  uint8_t          eth_id[6];    /* ethernet id of ethernet interface */
     16  uint32_t         cpu_spd;      /* cpu speed in Hz */
     17  uint32_t         flash_size;   /* size of flash memory in bytes */
     18  uint32_t         ram_size;     /* size of ram in bytes */
     19  uint32_t         version;      /* version of firmare (x.y format) */
     20  uint32_t         if429;        /* mask for arinc429 interface */
     21  uint32_t         ifcsdb;       /* mask for csdb interface */
     22  uint16_t         if232;        /* mask for rs232 interface */
     23  uint8_t          ifcan;        /* mask for canbus interface */
     24  uint8_t          if568;        /* mask for arinc568 interface */
     25  uint8_t          fpn[16];      /* Frasca part number in ASCII */
     26  uint16_t         rev;          /* Board revision */
     27  uint32_t         ip_num;       /* Board IP number */
    2828 
    2929} boardinfo_t;
  • c/src/lib/libbsp/powerpc/eth_comm/network/network.c

    red9e449 r8c93623  
    586586m860Enet_retire_tx_bd (struct m860_enet_struct *sc)
    587587{
    588   rtems_unsigned16 status;
     588  uint16_t  status;
    589589  int i;
    590590  int nRetired;
     
    659659  struct ifnet *ifp = &sc->arpcom.ac_if;
    660660  struct mbuf *m;
    661   rtems_unsigned16 status;
     661  uint16_t  status;
    662662  m8xxBufferDescriptor_t *rxBd;
    663663  int rxBdIndex;
     
    739739      m = sc->rxMbuf[rxBdIndex];
    740740      m->m_len = m->m_pkthdr.len = rxBd->length -
    741         sizeof(rtems_unsigned32) -
     741        sizeof(uint32_t) -
    742742        sizeof(struct ether_header);
    743743      eh = mtod (m, struct ether_header *);
     
    796796  struct ifnet *ifp = &sc->arpcom.ac_if;
    797797  struct mbuf *m;
    798   rtems_unsigned16 status;
     798  uint16_t  status;
    799799  m8xxBufferDescriptor_t *rxBd;
    800800  int rxBdIndex;
     
    868868      m = sc->rxMbuf[rxBdIndex];
    869869      m->m_len = m->m_pkthdr.len = rxBd->length -
    870         sizeof(rtems_unsigned32) -
     870        sizeof(uint32_t) -
    871871        sizeof(struct ether_header);
    872872      eh = mtod (m, struct ether_header *);
     
    922922  volatile m8xxBufferDescriptor_t *firstTxBd, *txBd;
    923923  struct mbuf *l = NULL;
    924   rtems_unsigned16 status;
     924  uint16_t  status;
    925925  int nAdded;
    926926 
     
    10421042  volatile m8xxBufferDescriptor_t *firstTxBd, *txBd;
    10431043  /*  struct mbuf *l = NULL; */
    1044   rtems_unsigned16 status;
     1044  uint16_t  status;
    10451045  int nAdded;
    10461046 
  • c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c

    red9e449 r8c93623  
    4747 */
    4848void bsp_postdriver_hook(void);
    49 void bsp_libc_init( void *, unsigned32, int );
     49void bsp_libc_init( void *, uint32_t, int );
    5050
    5151void BSP_panic(char *s)
     
    7979{
    8080  extern int       _end;
    81   rtems_unsigned32  heap_start;
     81  uint32_t    heap_start;
    8282
    8383  /*
     
    9696  }
    9797  */
    98   heap_start = (rtems_unsigned32) &_end;
     98  heap_start = (uint32_t) &_end;
    9999
    100100  /* Align the heap on a natural boundary (4 bytes?) */
     
    116116{
    117117  extern int _end;
    118   rtems_unsigned32  heap_start;
    119   rtems_unsigned32  ws_start;
     118  uint32_t    heap_start;
     119  uint32_t    ws_start;
    120120  ppc_cpu_id_t myCpu;
    121121  ppc_cpu_revision_t myCpuRevision;
     
    162162   */
    163163
    164   heap_start = (rtems_unsigned32) &_end;
     164  heap_start = (uint32_t) &_end;
    165165  if (heap_start & (CPU_ALIGNMENT-1))
    166166    heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
Note: See TracChangeset for help on using the changeset viewer.