summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-07 14:52:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-07 14:52:48 +0000
commitc3538f33cc41b8e5eed916218cbd1f233cf9d9fd (patch)
tree67772aed6ff0f282936edf6fdc588395362d7d28 /c
parentPatch rtems-rc-20000104-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-c3538f33cc41b8e5eed916218cbd1f233cf9d9fd.tar.bz2
Patch from Emmanuel Raguet <raguet@crf.canon.fr> which corrects the following
problems: - unclosed comment in pc386/start/start16.S - bad #endif in pc386/startup/ldseg.S
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/start16.S8
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/ldsegs.S2
2 files changed, 5 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/start/start16.S b/c/src/lib/libbsp/i386/pc386/start/start16.S
index 92e04468de..d452e40310 100644
--- a/c/src/lib/libbsp/i386/pc386/start/start16.S
+++ b/c/src/lib/libbsp/i386/pc386/start/start16.S
@@ -141,15 +141,15 @@ _start16:
delay:
_delay:
/*
- outb %al, $0xED # about 1uS delay on most machines
+ outb %al, $0x80 # about 1uS delay on most machines
*/
-/*
-
+/*
movl $0x200, %eax
delay1:
dec %eax
jnz delay1
- ret
+*/
+ ret
/*----------------------------------------------------------------------------+
| empty_8042
diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
index e232088ffb..802afab9d3 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
+++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
@@ -78,8 +78,8 @@ _delay:
delay1:
dec eax
jnz delay1
- ret
#endif
+ ret
/*-------------------------------------------------------------------------+
| Function: _load_segments