diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index be5e082d1fc..9c5c4907158 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -202,7 +202,6 @@ HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame) /* V86 TRAP HANDLERS **********************************************************/ -#ifndef _MINIHAL_ DECLSPEC_NORETURN VOID FASTCALL @@ -285,7 +284,6 @@ HalpBiosCall(VOID) /* Exit to V86 mode */ HalpExitToV86((PKTRAP_FRAME)&V86TrapFrame); } -#endif /* FUNCTIONS ******************************************************************/ @@ -443,7 +441,6 @@ HalpRestoreIopm(VOID) while (i--) HalpSavedIoMap[HalpSavedIoMapData[i][0]] = HalpSavedIoMapData[i][1]; } -#ifndef _MINIHAL_ VOID NTAPI HalpMapRealModeMemory(VOID) @@ -531,7 +528,6 @@ HalpSwitchToRealModeTrapHandlers(VOID) // KeRegisterInterruptHandler(6, HalpTrap06); } -#endif VOID NTAPI @@ -641,7 +637,6 @@ HalpUnmapRealModeMemory(VOID) HalpFlushTLB(); } -#ifndef _MINIHAL_ BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -716,6 +711,5 @@ HalpBiosDisplayReset(VOID) return TRUE; #endif } -#endif /* EOF */ diff --git a/hal/halx86/generic/display.c b/hal/halx86/generic/display.c index dc5f821240e..449ddc2986d 100644 --- a/hal/halx86/generic/display.c +++ b/hal/halx86/generic/display.c @@ -31,10 +31,8 @@ VOID NTAPI HalDisplayString(IN PCH String) { -#ifndef _MINIHAL_ /* Call the Inbv driver */ InbvDisplayString(String); -#endif } /* diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 32d510f2a8b..58e640180d8 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bus/isabus.c ../legacy/bus/pcibus.c ../legacy/bussupp.c - ../generic/bios.c ../generic/dma.c - ../generic/display.c ../generic/drive.c ../generic/misc.c ../generic/nmi.c @@ -25,7 +23,6 @@ if(SARCH STREQUAL "xbox") list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/cmos.c - ../generic/profil.c ../xbox/clock.c ../xbox/reboot.c) elseif(SARCH STREQUAL "pc98") @@ -33,14 +30,12 @@ elseif(SARCH STREQUAL "pc98") ../pc98/beep.c ../pc98/clock.c ../pc98/cmos.c - ../pc98/profil.c ../pc98/reboot.c) else() list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/clock.c ../generic/cmos.c - ../generic/profil.c ../generic/reboot.c) endif()