mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 01:15:09 +00:00
fix build
svn path=/trunk/; revision=52176
This commit is contained in:
Timo Kreuzer
parent
a3dee99b18
commit
14531e0020
17 changed files with 24 additions and 54 deletions
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
#include <asm.inc>
|
||||
|
||||
#include <arch.h>
|
||||
|
||||
.text
|
||||
.code16
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
PUBLIC ChainLoadBiosBootSectorCode
|
||||
ChainLoadBiosBootSectorCode:
|
||||
.code64
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
EXTERN(DriveMapInt13HandlerStart)
|
||||
Int13Handler:
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
/*
|
||||
* U32 CpuidSupported(VOID);
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
|
||||
.p2align 2 /* force 4-byte alignment */
|
||||
EXTERN(i386idt)
|
||||
/* Exception 0 - Divide By Zero */
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -199,7 +197,7 @@ EXTERN(PnpBiosGetDeviceNode)
|
|||
mov al, [rsi]
|
||||
mov _pnp_node_number, al
|
||||
|
||||
/* convert pointer to node buffer to segment/offset */
|
||||
/* convert pointer to node buffer to segment/offset */
|
||||
mov eax, [rbp + 0x0C]
|
||||
shr eax, 4
|
||||
and eax, 0xf000
|
||||
|
|
@ -215,7 +213,7 @@ EXTERN(PnpBiosGetDeviceNode)
|
|||
mov ax, _pnp_bios_data_segment
|
||||
push ax
|
||||
|
||||
/* push control flag */
|
||||
/* push control flag */
|
||||
push 0x0001
|
||||
|
||||
/* push pointer to node buffer (segment/offset) */
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
#include <ver.h>
|
||||
|
||||
#define SCREEN_ATTR 0x1f /* Bright white on blue background */
|
||||
|
|
@ -517,7 +516,7 @@ i386PrintTextLoop2:
|
|||
jmp i386PrintTextLoop
|
||||
|
||||
i386PrintTextDone:
|
||||
|
||||
|
||||
ret
|
||||
|
||||
/************************************************************************/
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
|
||||
Int386_REGS:
|
||||
|
|
|
|||
|
|
@ -23,8 +23,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
#include <multiboot.h>
|
||||
|
||||
/*
|
||||
|
|
@ -33,7 +32,7 @@
|
|||
*/
|
||||
.code64
|
||||
.globl PageDirectoryStart
|
||||
|
||||
|
||||
.globl pml4_startup
|
||||
.globl pdp_startup
|
||||
.globl pd_startup
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
EXTERN(_ChainLoadBiosBootSectorCode)
|
||||
.code32
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
EXTERN(_DriveMapInt13HandlerStart)
|
||||
Int13Handler:
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
/*
|
||||
* U32 CpuidSupported(VOID);
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
|
||||
.p2align 2 /* force 4-byte alignment */
|
||||
|
|
|
|||
|
|
@ -20,9 +20,8 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
#include <arch.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -144,7 +143,7 @@ EXTERN(_PnpBiosGetDeviceNodeCount)
|
|||
movzwl %ax,%ecx
|
||||
movl %ecx,_pnp_result
|
||||
|
||||
|
||||
|
||||
call switch_to_prot
|
||||
.code32
|
||||
|
||||
|
|
@ -196,14 +195,14 @@ EXTERN(_PnpBiosGetDeviceNode)
|
|||
movb (%esi),%al
|
||||
movb %al,_pnp_node_number
|
||||
|
||||
/* convert pointer to node buffer to segment/offset */
|
||||
/* convert pointer to node buffer to segment/offset */
|
||||
movl 0x0C(%ebp),%eax
|
||||
shrl $4,%eax
|
||||
andl $0xf000,%eax
|
||||
movw %ax,_pnp_buffer_segment
|
||||
movw %ax,_pnp_buffer_segment
|
||||
movl 0x0C(%ebp),%eax
|
||||
andl $0xffff,%eax
|
||||
movw %ax,_pnp_buffer_offset
|
||||
movw %ax,_pnp_buffer_offset
|
||||
|
||||
call switch_to_real
|
||||
.code16
|
||||
|
|
@ -212,7 +211,7 @@ EXTERN(_PnpBiosGetDeviceNode)
|
|||
movw _pnp_bios_data_segment,%ax
|
||||
pushw %ax
|
||||
|
||||
/* push control flag */
|
||||
/* push control flag */
|
||||
pushw $0x0001
|
||||
|
||||
/* push pointer to node buffer (segment/offset) */
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
#include <ver.h>
|
||||
|
||||
#define SCREEN_ATTR 0x1f /* Bright white on blue background */
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
|
||||
#include <arch/pc/x86common.h>
|
||||
|
||||
.code32
|
||||
EXTERN(_BootNewLinuxKernel)
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
.text
|
||||
.code16
|
||||
|
||||
#define ASM
|
||||
#include <arch.h>
|
||||
#include <arch/pc/x86common.h>
|
||||
#include <multiboot.h>
|
||||
|
||||
/*
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
*/
|
||||
.code32
|
||||
.globl _PageDirectoryStart
|
||||
|
||||
|
||||
.globl _startup_pagedirectory
|
||||
.globl _lowmem_pagetable
|
||||
.globl _kernel_pagetable
|
||||
|
|
|
|||
Loading…
Reference in a new issue