Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-10 16:18:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HAL]

Browse source 
Convert asm to new syntax, use spec file


svn path=/branches/cmake-bringup/; revision=49681
This commit is contained in:
Timo Kreuzer 2010-11-21 10:10:38 +00:00
parent 45a06d507a
commit 63dde4fa13
7 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hal/CMakeLists.txt
View file

@ -1,4 +1,6 @@
spec2def(hal.dll hal.spec)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
add_definitions( add_definitions(
@ -51,7 +53,8 @@ list(APPEND HAL_SOURCE
${HAL_GENERIC_PCAT_SOURCE} ${HAL_GENERIC_PCAT_SOURCE}
${HAL_GENERIC_UP_SOURCE} ${HAL_GENERIC_UP_SOURCE}
halx86/up/halinit_up.c halx86/up/halinit_up.c
halx86/up/halup.rc) halx86/up/halup.rc
${CMAKE_CURRENT_BINARY_DIR}/hal.def)
add_library(hal SHARED ${HAL_SOURCE}) add_library(hal SHARED ${HAL_SOURCE})
add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE})
@ -63,9 +66,7 @@ set_image_base(hal 0x00010000)
add_importlibs(hal ntoskrnl) add_importlibs(hal ntoskrnl)
target_link_libraries(hal target_link_libraries(hal libcntpr)
${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def
libcntpr)
list(APPEND MINI_HAL_SOURCE list(APPEND MINI_HAL_SOURCE
halx86/generic/legacy/bus/bushndlr.c halx86/generic/legacy/bus/bushndlr.c

7
hal/halx86/amd64/mps.S
View file

@ -8,8 +8,9 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
#include <ksamd64.inc>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -92,5 +93,5 @@ MpsTimerInterrupt:
AFTER AFTER
iret iret
END
/* EOF */ /* EOF */

6
hal/halx86/amd64/systimer.S
View file

@ -7,8 +7,9 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
#include <ksamd64.inc>
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
@ -90,3 +91,4 @@ HalpClockInterrupt:
UNIMPLEMENTED _HalpClockInterrupt UNIMPLEMENTED _HalpClockInterrupt
iret iret
END

2
hal/halx86/generic/bios.c
View file

@ -197,9 +197,9 @@ HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame)
/* V86 TRAP HANDLERS **********************************************************/ /* V86 TRAP HANDLERS **********************************************************/
#ifndef _MINIHAL_ #ifndef _MINIHAL_
DECLSPEC_NORETURN
VOID VOID
FASTCALL FASTCALL
DECLSPEC_NORETURN
HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
{ {
/* Enter the trap */ /* Enter the trap */

7
hal/halx86/generic/i386/systimer.S
View file

@ -7,8 +7,9 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/asm.h>
#include <ks386.inc>
EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC
EXTERN _HalpReleaseCmosSpinLock@0:PROC EXTERN _HalpReleaseCmosSpinLock@0:PROC
@ -39,7 +40,7 @@ EXTERN _HalpPerfCounterCutoff:DWORD
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
.data .data
//ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
PUBLIC _HalpPerfCounter PUBLIC _HalpPerfCounter
_HalpLastPerfCounterLow: .long 0 _HalpLastPerfCounterLow: .long 0

10
hal/halx86/generic/i386/trap.S
View file

@ -8,12 +8,12 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/i386/asm.h>
#include <ks386.inc>
#include <internal/i386/asmmacro.S> #include <internal/i386/asmmacro.S>
.code32 .code
.text
TRAP_ENTRY HalpTrap0D, 0 TRAP_ENTRY HalpTrap0D, 0
TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP
@ -42,4 +42,6 @@ _HalpRealModeStart:
.space 2048 .space 2048
_HalpRealModeEnd: _HalpRealModeEnd:
PUBLIC _HalpRealModeEnd PUBLIC _HalpRealModeEnd
.endcode16
END

4
hal/halx86/mp/i386/mps.S
View file

@ -11,7 +11,9 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ndk/asm.h> #include <asm.inc>
#include <ks386.inc>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/