Changeset 96efaf67 in rtems


Ignore:
Timestamp:
May 28, 2000, 5:45:17 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Children:
9c948846
Parents:
3704a9a
Message:

Renamed delay() to avoid conflicts since it is a common name that
was in particular used by the ttcp test.

Location:
c/src/lib/libbsp/i386/pc386
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/include/bsp.h

    r3704a9a r96efaf67  
    144144#define Lower_tm27_intr()
    145145
     146/* does anyone need this? if so, report it so we can rename this macro */
     147#if 0
    146148/*-------------------------------------------------------------------------+
    147149| Simple spin delay in microsecond units for device drivers.
     
    153155  asm volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \
    154156}
     157#endif
    155158
    156159/*-------------------------------------------------------------------------+
  • c/src/lib/libbsp/i386/pc386/start/start16.S

    r3704a9a r96efaf67  
    110110        call    empty_8042
    111111
    112         call    delay
    113         call    delay
    114         call    delay
     112        call    pc386_delay
     113        call    pc386_delay
     114        call    pc386_delay
    115115
    116116        movl    %cs:HDRSTART + HDROFF, %eax     #
     
    119119
    120120/*----------------------------------------------------------------------------+
    121 | delay
     121| pc386_delay
    122122+------------------------------------------------------------------------------
    123123| Delay is needed after doing I/O.
     
    132132+----------------------------------------------------------------------------*/
    133133        .p2align 4
    134         .globl _delay
    135         .globl delay
    136 delay:
    137 _delay:
     134        .globl _pc386_delay
     135        .globl pc386_delay
     136pc386_delay:
     137_pc386_delay:
    138138        pushl   %eax
    139139#if defined(USE_OUTB_FOR_DELAY)
     
    143143
    144144        movl    $0x200, %eax
    145 delay1:
     145pc386_delay1:
    146146        dec     %eax
    147         jnz     delay1
     147        jnz     pc386_delay1
    148148#endif
    149149        popl    %eax
     
    163163empty_8042:
    164164_empty_8042:
    165         call    delay
     165        call    pc386_delay
    166166        inb     $0x64, %al      # 8042 status port
    167167        testb   $0x01, %al      # output buffer?
    168168        jz      no_output
    169         call    delay
     169        call    pc386_delay
    170170        in      $0x60, %al      # read it
    171171        jmp     empty_8042
  • c/src/lib/libbsp/i386/pc386/startup/ldsegs.S

    r3704a9a r96efaf67  
    5151
    5252/*----------------------------------------------------------------------------+
    53 | delay
     53| pc386_delay
    5454+------------------------------------------------------------------------------
    5555| Delay is needed after doing I/O.
     
    6565       
    6666        .p2align 4
    67         .globl _delay
    68         .globl delay
    69 delay:
    70 _delay:
     67        .globl _pc386_delay
     68        .globl pc386_delay
     69pc386_delay:
     70_pc386_delay:
    7171#ifdef  DELAY_USE_OUTB
    7272        outb    al, $0x80       # about 1uS delay on most machines
    7373#else
    7474        movl    $0x200, eax
    75 delay1:
     75pc386_delay1:
    7676        dec     eax
    77         jnz     delay1
     77        jnz     pc386_delay1
    7878#endif
    7979        ret
     
    124124        movb    $0x11, al               /* initialization sequence          */
    125125        outb    al, $0x20               /* send it to 8259A-1               */
    126         call    SYM(delay)
     126        call    SYM(pc386_delay)
    127127        outb    al, $0xA0               /* and to 8259A-2                   */
    128         call    SYM(delay)
     128        call    SYM(pc386_delay)
    129129       
    130130        movb    $0x20, al               /* start of hardware int's (0x20)   */
    131131        outb    al, $0x21
    132         call    SYM(delay)
     132        call    SYM(pc386_delay)
    133133        movb    $0x28, al               /* start of hardware int's 2 (0x28) */
    134134        outb    al, $0xA1
    135         call    SYM(delay)
     135        call    SYM(pc386_delay)
    136136       
    137137        movb    $0x04, al               /* 8259-1 is master                 */
    138138        outb    al, $0x21
    139         call    SYM(delay)
     139        call    SYM(pc386_delay)
    140140        movb    $0x02, al               /* 8259-2 is slave                  */
    141141        outb    al, $0xA1
    142         call    SYM(delay)
     142        call    SYM(pc386_delay)
    143143       
    144144        movb    $0x01, al               /* 8086 mode for both               */
    145145        outb    al, $0x21
    146         call    SYM(delay)
    147         outb    al, $0xA1
    148         call    SYM(delay)
     146        call    SYM(pc386_delay)
     147        outb    al, $0xA1
     148        call    SYM(pc386_delay)
    149149       
    150150        movb    $0xFF, al               /* mask off all interrupts for now  */
    151151        outb    al, $0xA1
    152         call    SYM(delay)
     152        call    SYM(pc386_delay)
    153153        movb    $0xFB, al               /* mask all irq's but irq2 which    */
    154154        outb    al, $0x21               /* is cascaded                      */
    155         call    SYM(delay)
     155        call    SYM(pc386_delay)
    156156
    157157        movw    $0xFFFB, SYM(i8259s_cache) /* set up same values in cache */
Note: See TracChangeset for help on using the changeset viewer.