Changeset 96efaf67 in rtems

Timestamp:

05/28/00 17:45:17 (23 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:

• include/bsp.h (modified) (2 diffs)
• start/start16.S (modified) (5 diffs)
• startup/ldsegs.S (modified) (3 diffs)

c/src/lib/libbsp/i386/pc386/include/bsp.h

@@ -144 +144 @@
 #define Lower_tm27_intr()
 
+/* does anyone need this? if so, report it so we can rename this macro */
+#if 0
 /*-------------------------------------------------------------------------+
 | Simple spin delay in microsecond units for device drivers.
@@ -153 +155 @@
   asm volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \
 }
+#endif
 
 /*-------------------------------------------------------------------------+

c/src/lib/libbsp/i386/pc386/start/start16.S

@@ -110 +110 @@
         call    empty_8042
 
-        call    delay
-        call    delay
-        call    delay
+        call    pc386_delay
+        call    pc386_delay
+        call    pc386_delay
 
         movl    %cs:HDRSTART + HDROFF, %eax     #
@@ -119 +119 @@
 
 /*----------------------------------------------------------------------------+
-| delay
+| pc386_delay
 +------------------------------------------------------------------------------
 | Delay is needed after doing I/O. 
@@ -132 +132 @@
 +----------------------------------------------------------------------------*/
         .p2align 4
-        .globl _delay
-        .globl delay
-delay:
-_delay:
+        .globl _pc386_delay
+        .globl pc386_delay
+pc386_delay:
+_pc386_delay:
         pushl   %eax
 #if defined(USE_OUTB_FOR_DELAY)
@@ -143 +143 @@
 
         movl    $0x200, %eax
-delay1:
+pc386_delay1:
         dec     %eax
-        jnz     delay1
+        jnz     pc386_delay1
 #endif
         popl    %eax
@@ -163 +163 @@
 empty_8042:
 _empty_8042:
-        call    delay
+        call    pc386_delay
         inb     $0x64, %al      # 8042 status port
         testb   $0x01, %al      # output buffer?
         jz      no_output
-        call    delay
+        call    pc386_delay
         in      $0x60, %al      # read it
         jmp     empty_8042

c/src/lib/libbsp/i386/pc386/startup/ldsegs.S

@@ -51 +51 @@
 
 /*----------------------------------------------------------------------------+
-| delay
+| pc386_delay
 +------------------------------------------------------------------------------
 | Delay is needed after doing I/O. 
@@ -65 +65 @@
         
         .p2align 4
-        .globl _delay
-        .globl delay
-delay:
-_delay:
+        .globl _pc386_delay
+        .globl pc386_delay
+pc386_delay:
+_pc386_delay:
 #ifdef  DELAY_USE_OUTB
         outb    al, $0x80       # about 1uS delay on most machines
 #else
         movl    $0x200, eax
-delay1:
+pc386_delay1:
         dec     eax
-        jnz     delay1
+        jnz     pc386_delay1
 #endif
         ret
@@ -124 +124 @@
         movb    $0x11, al               /* initialization sequence          */
         outb    al, $0x20               /* send it to 8259A-1               */
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         outb    al, $0xA0               /* and to 8259A-2                   */
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         
         movb    $0x20, al               /* start of hardware int's (0x20)   */
         outb    al, $0x21
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         movb    $0x28, al               /* start of hardware int's 2 (0x28) */
         outb    al, $0xA1
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         
         movb    $0x04, al               /* 8259-1 is master                 */
         outb    al, $0x21
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         movb    $0x02, al               /* 8259-2 is slave                  */
         outb    al, $0xA1
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         
         movb    $0x01, al               /* 8086 mode for both               */
         outb    al, $0x21
-        call    SYM(delay)
-        outb    al, $0xA1
-        call    SYM(delay)
+        call    SYM(pc386_delay)
+        outb    al, $0xA1
+        call    SYM(pc386_delay)
         
         movb    $0xFF, al               /* mask off all interrupts for now  */
         outb    al, $0xA1
-        call    SYM(delay)
+        call    SYM(pc386_delay)
         movb    $0xFB, al               /* mask all irq's but irq2 which    */
         outb    al, $0x21               /* is cascaded                      */
-        call    SYM(delay)
+        call    SYM(pc386_delay)
 
         movw    $0xFFFB, SYM(i8259s_cache) /* set up same values in cache */