diff options
author | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 |
commit | 8bde7f776c77b343aca29b8c7b58464d915ac245 (patch) | |
tree | 20f1fd99975215e7c658454a15cdb4ed4694e2d4 /lib_i386/realmode.c | |
parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
download | u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.zip u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.gz u-boot-imx-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.bz2 |
* Code cleanup:
- remove trailing white space, trailing empty lines, C++ comments, etc.
- split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)
* Patches by Kenneth Johansson, 25 Jun 2003:
- major rework of command structure
(work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'lib_i386/realmode.c')
-rw-r--r-- | lib_i386/realmode.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/lib_i386/realmode.c b/lib_i386/realmode.c index d7bb81c..6cf2738 100644 --- a/lib_i386/realmode.c +++ b/lib_i386/realmode.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se - * + * * See file CREDITS for list of people who contributed to this * project. * @@ -37,39 +37,39 @@ int realmode_setup(void) { /* copy the realmode switch code */ if (i386boot_realmode_size > (REALMODE_MAILBOX-REALMODE_BASE)) { - printf("realmode switch too large (%ld bytes, max is %d)\n", + printf("realmode switch too large (%ld bytes, max is %d)\n", i386boot_realmode_size, (REALMODE_MAILBOX-REALMODE_BASE)); return -1; } - + memcpy(REALMODE_BASE, (void*)i386boot_realmode, i386boot_realmode_size); asm("wbinvd\n"); - + return 0; } - + int enter_realmode(u16 seg, u16 off, struct pt_regs *in, struct pt_regs *out) { - + /* setup out thin bios emulation */ if (bios_setup()) { return -1; } - + if (realmode_setup()) { return -1; } - + in->eip = off; in->xcs = seg; if (3>(in->esp & 0xffff)) { printf("Warning: entering realmode with sp < 4 will fail\n"); } - + memcpy(REALMODE_MAILBOX, in, sizeof(struct pt_regs)); asm("wbinvd\n"); - - __asm__ volatile ( + + __asm__ volatile ( "lcall $0x20,%0\n" : : "i" (&realmode_enter) ); asm("wbinvd\n"); @@ -88,9 +88,8 @@ int enter_realmode_int(u8 lvl, struct pt_regs *in, struct pt_regs *out) writeb(lvl, 0x701); writeb(0xcb, 0x702); /* lret */ asm("wbinvd\n"); - - enter_realmode(0x00, 0x700, in, out); - + + enter_realmode(0x00, 0x700, in, out); + return out->eflags&1; } - |