Changeset 2a7e204 in rtems


Ignore:
Timestamp:
Mar 31, 2004, 4:38:00 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
0f458a3
Parents:
f74d9f1f
Message:

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

  • clock/ckinit.c, console/console-recording.h, console/console.c, fatal/bspfatal.c, include/fatal.h, network/network.c, network/uti596.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types.
Location:
c/src/lib/libbsp/m68k/mvme167
Files:
10 edited

Legend:

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

    rf74d9f1f r2a7e204  
     12004-03-31      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * clock/ckinit.c, console/console-recording.h, console/console.c,
     4        fatal/bspfatal.c, include/fatal.h, network/network.c,
     5        network/uti596.h, startup/bspstart.c, timer/timer.c: Convert to
     6        using c99 fixed size types.
     7
    182004-03-05      Joel Sherrill <joel@OARcorp.com>
    29
  • c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c

    rf74d9f1f r2a7e204  
    5757 *  VMEchip2 timer #2 ticks since the driver was initialized.
    5858 */
    59 volatile rtems_unsigned32 Clock_driver_ticks;
     59volatile uint32_t        Clock_driver_ticks;
    6060
    6161
     
    6969 *  ticks cannot occur more frequently than every 1 millisecond.
    7070 */
    71 rtems_unsigned32 Clock_isrs;
     71uint32_t        Clock_isrs;
    7272
    7373
     
    127127    }
    128128    /* Reset the counter */
    129     Clock_isrs = (rtems_unsigned32)-i;
     129    Clock_isrs = (uint32_t)-i;
    130130  }
    131131  else
     
    250250  void *pargp)
    251251{
    252     rtems_unsigned32 isrlevel;
     252    uint32_t        isrlevel;
    253253    rtems_libio_ioctl_args_t *args = pargp;
    254254 
  • c/src/lib/libbsp/m68k/mvme167/console/console-recording.h

    rf74d9f1f r2a7e204  
    140140      unsigned char initial_ier;
    141141      unsigned char final_ier;
    142       rtems_unsigned8 txEmpty;
     142      uint8_t        txEmpty;
    143143    } tx_isr_info;
    144144    struct cd2401_tx_isr_spurious_info {
     
    181181    struct cd2401_first_open_info {
    182182      unsigned char channel;
    183       rtems_unsigned8 init_count;
     183      uint8_t        init_count;
    184184    } first_open_info;
    185185    struct cd2401_last_close_info {
    186186      unsigned char channel;
    187       rtems_unsigned8 init_count;
     187      uint8_t        init_count;
    188188    } last_close_info;
    189189    struct cd2401_start_remote_tx_info {
     
    195195    struct cd2401_set_attribute_info {
    196196      int minor;
    197       rtems_unsigned8 need_reinit;
    198       rtems_unsigned8 txEmpty;
    199       rtems_unsigned8 csize;
    200       rtems_unsigned8 cstopb;
    201       rtems_unsigned8 parodd;
    202       rtems_unsigned8 parenb;
    203       rtems_unsigned8 ignpar;
    204       rtems_unsigned8 inpck;
    205       rtems_unsigned8 hw_flow_ctl;
    206       rtems_unsigned8 sw_flow_ctl;
    207       rtems_unsigned8 extra_flow_ctl;
    208       rtems_unsigned8 icrnl;
    209       rtems_unsigned8 igncr;
    210       rtems_unsigned8 inlcr;
    211       rtems_unsigned8 brkint;
    212       rtems_unsigned8 ignbrk;
    213       rtems_unsigned8 parmrk;
    214       rtems_unsigned8 istrip;
    215       rtems_unsigned16 tx_period;
    216       rtems_unsigned16 rx_period;
    217       rtems_unsigned32 out_baud;
    218       rtems_unsigned32 in_baud;
     197      uint8_t        need_reinit;
     198      uint8_t        txEmpty;
     199      uint8_t        csize;
     200      uint8_t        cstopb;
     201      uint8_t        parodd;
     202      uint8_t        parenb;
     203      uint8_t        ignpar;
     204      uint8_t        inpck;
     205      uint8_t        hw_flow_ctl;
     206      uint8_t        sw_flow_ctl;
     207      uint8_t        extra_flow_ctl;
     208      uint8_t        icrnl;
     209      uint8_t        igncr;
     210      uint8_t        inlcr;
     211      uint8_t        brkint;
     212      uint8_t        ignbrk;
     213      uint8_t        parmrk;
     214      uint8_t        istrip;
     215      uint16_t        tx_period;
     216      uint16_t        rx_period;
     217      uint32_t        out_baud;
     218      uint32_t        in_baud;
    219219    } set_attribute_info;
    220220    struct cd2401_drain_output_info {
    221       rtems_unsigned8 txEmpty;
    222       rtems_unsigned8 own_buf_A;
    223       rtems_unsigned8 own_buf_B;
     221      uint8_t        txEmpty;
     222      uint8_t        own_buf_A;
     223      uint8_t        own_buf_B;
    224224    } drain_output_info;
    225225    struct cd2401_delay_info {
     
    273273  unsigned char initial_ier,
    274274  unsigned char final_ier,
    275   rtems_unsigned8 txEmpty
     275  uint8_t        txEmpty
    276276)
    277277{
     
    362362  unsigned char ch,
    363363  unsigned char status,
    364   rtems_unsigned32 spur_dev,
    365   rtems_unsigned32 spur_cnt
     364  uint32_t        spur_dev,
     365  uint32_t        spur_cnt
    366366)
    367367{
     
    381381void cd2401_record_re_isr_spurious_info(
    382382  unsigned char ch,
    383   rtems_unsigned32 spur_dev,
    384   rtems_unsigned32 spur_cnt
     383  uint32_t        spur_dev,
     384  uint32_t        spur_cnt
    385385)
    386386{
     
    399399void cd2401_record_modem_isr_spurious_info(
    400400  unsigned char ch,
    401   rtems_unsigned32 spur_dev,
    402   rtems_unsigned32 spur_cnt
     401  uint32_t        spur_dev,
     402  uint32_t        spur_cnt
    403403)
    404404{
     
    417417void cd2401_record_first_open_info(
    418418  unsigned char ch,
    419   rtems_unsigned8 init_count
     419  uint8_t        init_count
    420420)
    421421{
     
    433433void cd2401_record_last_close_info(
    434434  unsigned char ch,
    435   rtems_unsigned8 init_count
     435  uint8_t        init_count
    436436)
    437437{
     
    477477void cd2401_record_set_attributes_info(
    478478  int minor,
    479   rtems_unsigned8 need_reinit,
    480   rtems_unsigned8 csize,
    481   rtems_unsigned8 cstopb,
    482   rtems_unsigned8 parodd,
    483   rtems_unsigned8 parenb,
    484   rtems_unsigned8 ignpar,
    485   rtems_unsigned8 inpck,
    486   rtems_unsigned8 hw_flow_ctl,
    487   rtems_unsigned8 sw_flow_ctl,
    488   rtems_unsigned8 extra_flow_ctl,
    489   rtems_unsigned8 icrnl,
    490   rtems_unsigned8 igncr,
    491   rtems_unsigned8 inlcr,
    492   rtems_unsigned8 brkint,
    493   rtems_unsigned8 ignbrk,
    494   rtems_unsigned8 parmrk,
    495   rtems_unsigned8 istrip,
    496   rtems_unsigned16 tx_period,
    497   rtems_unsigned16 rx_period,
    498   rtems_unsigned32 out_baud,
    499   rtems_unsigned32 in_baud
     479  uint8_t        need_reinit,
     480  uint8_t        csize,
     481  uint8_t        cstopb,
     482  uint8_t        parodd,
     483  uint8_t        parenb,
     484  uint8_t        ignpar,
     485  uint8_t        inpck,
     486  uint8_t        hw_flow_ctl,
     487  uint8_t        sw_flow_ctl,
     488  uint8_t        extra_flow_ctl,
     489  uint8_t        icrnl,
     490  uint8_t        igncr,
     491  uint8_t        inlcr,
     492  uint8_t        brkint,
     493  uint8_t        ignbrk,
     494  uint8_t        parmrk,
     495  uint8_t        istrip,
     496  uint16_t        tx_period,
     497  uint16_t        rx_period,
     498  uint32_t        out_baud,
     499  uint32_t        in_baud
    500500)
    501501{
     
    533533
    534534void cd2401_record_drain_output_info(
    535   rtems_unsigned8 txEmpty,
    536   rtems_unsigned8 own_buf_A,
    537   rtems_unsigned8 own_buf_B
     535  uint8_t        txEmpty,
     536  uint8_t        own_buf_A,
     537  uint8_t        own_buf_B
    538538)
    539539{
  • c/src/lib/libbsp/m68k/mvme167/console/console.c

    rf74d9f1f r2a7e204  
    136136/* Utility functions */
    137137void cd2401_udelay( unsigned long delay );
    138 void cd2401_chan_cmd( rtems_unsigned8 channel, rtems_unsigned8 cmd, rtems_unsigned8 wait );
    139 rtems_unsigned16 cd2401_bitrate_divisor( rtems_unsigned32 clkrate, rtems_unsigned32* bitrate );
     138void cd2401_chan_cmd( uint8_t         channel, uint8_t         cmd, uint8_t        wait );
     139uint16_t         cd2401_bitrate_divisor( uint32_t         clkrate, uint32_t        * bitrate );
    140140void cd2401_initialize( void );
    141141void cd2401_interrupts_initialize( rtems_boolean enable );
     
    169169  int len;                      /* Record nb of chars being TX'ed */
    170170  const char *buf;              /* Record where DMA is coming from */
    171   rtems_unsigned32 spur_cnt;    /* Nb of spurious ints so far */
    172   rtems_unsigned32 spur_dev;    /* Indo on last spurious int */
    173   rtems_unsigned32 buserr_addr; /* Faulting address */
    174   rtems_unsigned32 buserr_type; /* Reason of bus error during DMA */
    175   rtems_unsigned8  own_buf_A;   /* If true, buffer A belongs to the driver */
    176   rtems_unsigned8  own_buf_B;   /* If true, buffer B belongs to the driver */
    177   rtems_unsigned8  txEmpty;     /* If true, the output FIFO should be empty */
     171  uint32_t        spur_cnt;    /* Nb of spurious ints so far */
     172  uint32_t        spur_dev;    /* Indo on last spurious int */
     173  uint32_t        buserr_addr; /* Faulting address */
     174  uint32_t        buserr_type; /* Reason of bus error during DMA */
     175  uint8_t          own_buf_A;   /* If true, buffer A belongs to the driver */
     176  uint8_t          own_buf_B;   /* If true, buffer B belongs to the driver */
     177  uint8_t          txEmpty;     /* If true, the output FIFO should be empty */
    178178} CD2401_Channel_Info[4];
    179179
     
    187187 *  section on every startup.
    188188 */
    189 rtems_unsigned8 Init_count;
     189uint8_t        Init_count;
    190190
    191191
     
    256256 */
    257257void cd2401_chan_cmd(
    258   rtems_unsigned8 channel,
    259   rtems_unsigned8 cmd,
    260   rtems_unsigned8 wait
     258  uint8_t        channel,
     259  uint8_t        cmd,
     260  uint8_t        wait
    261261)
    262262{
     
    292292 *    specified bitrate.
    293293 */
    294 rtems_unsigned16 cd2401_bitrate_divisor(
    295   rtems_unsigned32 clkrate,
    296   rtems_unsigned32* bitrate
    297 )
    298 {
    299   rtems_unsigned32 divisor;
    300   rtems_unsigned16 clksource;
     294uint16_t        cd2401_bitrate_divisor(
     295  uint32_t        clkrate,
     296  uint32_t        * bitrate
     297)
     298{
     299  uint32_t        divisor;
     300  uint16_t        clksource;
    301301
    302302  divisor = *bitrate << 3;          /* temporary; multiply by 8 for CLK/8 */
     
    466466)
    467467{
    468   rtems_unsigned8 ch;
     468  uint8_t        ch;
    469469
    470470  /* Get interrupting channel ID */
     
    502502)
    503503{
    504   rtems_unsigned8 ch;
     504  uint8_t        ch;
    505505
    506506  /* Get interrupting channel ID */
     
    538538{
    539539  char c;
    540   rtems_unsigned8 ch, status, nchars, i, total;
     540  uint8_t        ch, status, nchars, i, total;
    541541  char buffer[256];
    542542
     
    585585)
    586586{
    587   rtems_unsigned8 ch, status, buserr, initial_ier, final_ier;
     587  uint8_t        ch, status, buserr, initial_ier, final_ier;
    588588
    589589  status = cd2401->tisr;
     
    616616         (vector << 24) | (buserr << 16) | (cd2401->tir << 8) | cd2401->tisr;
    617617    CD2401_Channel_Info[ch].buserr_addr =
    618         (((rtems_unsigned32)cd2401->tcbadru) << 16) | cd2401->tcbadrl;
     618        (((uint32_t)cd2401->tcbadru) << 16) | cd2401->tcbadrl;
    619619
    620620    cd2401->teoir = 0x80;           /* EOI - terminate bad buffer */
     
    821821)
    822822{
    823   rtems_unsigned8 csize, cstopb, parodd, parenb, ignpar, inpck;
    824   rtems_unsigned8 hw_flow_ctl, sw_flow_ctl, extra_flow_ctl;
    825   rtems_unsigned8 icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip;
    826   rtems_unsigned8 need_reinitialization = FALSE;
    827   rtems_unsigned8 read_enabled;
    828   rtems_unsigned16 tx_period, rx_period;
    829   rtems_unsigned32 out_baud, in_baud;
     823  uint8_t        csize, cstopb, parodd, parenb, ignpar, inpck;
     824  uint8_t        hw_flow_ctl, sw_flow_ctl, extra_flow_ctl;
     825  uint8_t        icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip;
     826  uint8_t        need_reinitialization = FALSE;
     827  uint8_t        read_enabled;
     828  uint16_t        tx_period, rx_period;
     829  uint32_t        out_baud, in_baud;
    830830  rtems_interrupt_level level;
    831831
     
    12031203    CD2401_Channel_Info[minor].len = len;
    12041204    CD2401_Channel_Info[minor].buf = buf;
    1205     cd2401->atbadru = (rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );
    1206     cd2401->atbadrl = (rtems_unsigned16)( (rtems_unsigned32) buf );
     1205    cd2401->atbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 );
     1206    cd2401->atbadrl = (uint16_t)( (uint32_t) buf );
    12071207    cd2401->atbcnt = len;
    12081208    CD2401_RECORD_WRITE_INFO(( len, buf, 'A' ));
     
    12161216    CD2401_Channel_Info[minor].len = len;
    12171217    CD2401_Channel_Info[minor].buf = buf;
    1218     cd2401->btbadru = (rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );
    1219     cd2401->btbadrl = (rtems_unsigned16)( (rtems_unsigned32) buf );
     1218    cd2401->btbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 );
     1219    cd2401->btbadrl = (uint16_t)( (uint32_t) buf );
    12201220    cd2401->btbcnt = len;
    12211221    CD2401_RECORD_WRITE_INFO(( len, buf, 'B' ));
     
    13971397
    13981398  while( (c = _167Bug_pollRead (minor)) == -1 );
    1399   rw_args->buffer[0] = (unsigned8)c;
     1399  rw_args->buffer[0] = (uint8_t)c;
    14001400  if( rw_args->buffer[0] == '\r' )
    14011401      rw_args->buffer[0] = '\n';
     
    14321432{
    14331433  rtems_libio_rw_args_t *rw_args = arg;
    1434   unsigned32 i;
     1434  uint32_t  i;
    14351435  char cr ='\r';
    14361436
  • c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c

    rf74d9f1f r2a7e204  
    6666  Internal_errors_Source  the_source,
    6767  rtems_boolean           is_internal,
    68   rtems_unsigned32        the_error
     68  uint32_t                the_error
    6969)
    7070{
  • c/src/lib/libbsp/m68k/mvme167/include/fatal.h

    rf74d9f1f r2a7e204  
    1616  Internal_errors_Source  the_source,
    1717  rtems_boolean           is_internal,
    18   rtems_unsigned32        the_error
     18  uint32_t                the_error
    1919);
  • c/src/lib/libbsp/m68k/mvme167/network/network.c

    rf74d9f1f r2a7e204  
    134134static void uti596_CU_dump ( i596_dump_result * );
    135135#endif
    136 static int uti596_wait ( uti596_softc_ *, unsigned8 );
    137 static int uti596_issueCA ( uti596_softc_ *, unsigned8 );
     136static int uti596_wait ( uti596_softc_ *, uint8_t);
     137static int uti596_issueCA ( uti596_softc_ *, uint8_t);
    138138static void uti596_addCmd ( i596_cmd * );
    139139static void uti596_addPolledCmd ( i596_cmd * );
     
    445445static int uti596_wait(
    446446  uti596_softc_ *sc,
    447   unsigned8 waitType
     447  uint8_t  waitType
    448448)
    449449{
     
    542542static int uti596_issueCA(
    543543  uti596_softc_ *sc,
    544   unsigned8 waitType
     544  uint8_t  waitType
    545545)
    546546{
  • c/src/lib/libbsp/m68k/mvme167/network/uti596.h

    rf74d9f1f r2a7e204  
    305305 */
    306306typedef volatile struct i596_iscp {
    307     unsigned8 null1;                                    /* Always zero */
    308     unsigned8 busy;                                                                             /* Busy byte */
     307    uint8_t  null1;                                    /* Always zero */
     308    uint8_t  busy;                                                                             /* Busy byte */
    309309    unsigned short scb_offset;                          /* Not used in linear mode */
    310310    unsigned long scb_pointer;          /* Swapped pointer to scb */
  • c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c

    rf74d9f1f r2a7e204  
    4646 */
    4747void bsp_postdriver_hook( void );
    48 void bsp_libc_init( void *, unsigned32, int );
     48void bsp_libc_init( void *, uint32_t, int );
    4949void bsp_pretasking_hook(void);               /* m68k version */
    5050
  • c/src/lib/libbsp/m68k/mvme167/timer/timer.c

    rf74d9f1f r2a7e204  
    4040
    4141/* Number of interrupts since timer was re-initialized */
    42 rtems_unsigned32    Ttimer_val;
     42uint32_t            Ttimer_val;
    4343
    4444/*
     
    109109int Read_timer()
    110110{
    111   rtems_unsigned32    total;
     111  uint32_t            total;
    112112
    113113  total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1;
Note: See TracChangeset for help on using the changeset viewer.