projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc/85xx: Move code around to prep for NAND_SPL
[oweals/u-boot.git]
/
lib_i386
/
realmode.c
diff --git
a/lib_i386/realmode.c
b/lib_i386/realmode.c
index d7bb81c57f5f529065147ca5020a45e739ab957f..6cf273885b838ed55d1c2d02710a722ee4bc0f98 100644
(file)
--- 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
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
* 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)) {
{
/* 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;
}
i386boot_realmode_size, (REALMODE_MAILBOX-REALMODE_BASE));
return -1;
}
-
+
memcpy(REALMODE_BASE, (void*)i386boot_realmode, i386boot_realmode_size);
asm("wbinvd\n");
memcpy(REALMODE_BASE, (void*)i386boot_realmode, i386boot_realmode_size);
asm("wbinvd\n");
-
+
return 0;
}
return 0;
}
-
+
int enter_realmode(u16 seg, u16 off, struct pt_regs *in, struct pt_regs *out)
{
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;
}
/* setup out thin bios emulation */
if (bios_setup()) {
return -1;
}
-
+
if (realmode_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");
}
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");
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");
"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");
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;
}
return out->eflags&1;
}
-