[ros-diffs] [sginsberg] 69037: - Add in MSVC support for HAL .init sections by using alloc_text. MSVC support for putting the HAL pci class and vendor tables into .init is still lacking. Put into a _MINIHAL_ g...

Author: sginsberg
Date: Sat Sep  5 18:33:38 2015
New Revision: 69037

URL: http://svn.reactos.org/svn/reactos?rev=69037&view=rev
Log:
- Add in MSVC support for HAL .init sections by using alloc_text. MSVC support for putting
the HAL pci class and vendor tables into .init is still lacking. Put into a _MINIHAL_
guard or freeldr gets REALLY sad.
- Rename INIT_FUNCTION to INIT_SECTION and put it at the top of functions for consistency
with __declspec declarations (it is actually possible to do this via __declspec in newer
MSVC versions).

Modified:
    trunk/reactos/hal/halx86/apic/rtctimer.c
    trunk/reactos/hal/halx86/generic/cmos.c
    trunk/reactos/hal/halx86/generic/dma.c
    trunk/reactos/hal/halx86/generic/halinit.c
    trunk/reactos/hal/halx86/generic/misc.c
    trunk/reactos/hal/halx86/generic/timer.c
    trunk/reactos/hal/halx86/generic/usage.c
    trunk/reactos/hal/halx86/include/halp.h
    trunk/reactos/hal/halx86/legacy/bus/pcibus.c
    trunk/reactos/hal/halx86/legacy/bussupp.c
    trunk/reactos/hal/halx86/legacy/halpcat.c
    trunk/reactos/hal/halx86/pcidata.cmake

Modified: trunk/reactos/hal/halx86/apic/rtctimer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c…
==============================================================================
--- trunk/reactos/hal/halx86/apic/rtctimer.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/rtctimer.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -13,6 +13,9 @@
 #define NDEBUG
 #include <debug.h>
 
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpInitializeClock)
+#endif
 
 /* GLOBALS ********************************************************************/
 
@@ -61,10 +64,9 @@
     HalpReleaseCmosSpinLock();
 }
 
-
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpInitializeClock(VOID)
 {
     ULONG_PTR EFlags;

Modified: trunk/reactos/hal/halx86/generic/cmos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?…
==============================================================================
--- trunk/reactos/hal/halx86/generic/cmos.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/cmos.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -13,6 +13,10 @@
 #define NDEBUG
 #include <debug.h>
 
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpInitializeCmos)
+#endif
+
 /* GLOBALS *******************************************************************/
 
 UCHAR HalpCmosCenturyOffset;
@@ -150,9 +154,9 @@
     return Length - Len;
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpInitializeCmos(VOID)
 {
     /* Set default century offset byte */

Modified: trunk/reactos/hal/halx86/generic/dma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/generic/dma.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/dma.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -76,6 +76,10 @@
 
 #define NDEBUG
 #include <debug.h>
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpInitDma)
+#endif
 
 #define MAX_SG_ELEMENTS 0x10
 
@@ -129,8 +133,8 @@
 /* FUNCTIONS *****************************************************************/
 
 #ifndef _MINIHAL_
+INIT_SECTION
 VOID
-INIT_FUNCTION
 HalpInitDma(VOID)
 {
     /*

Modified: trunk/reactos/hal/halx86/generic/halinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit…
==============================================================================
--- trunk/reactos/hal/halx86/generic/halinit.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/halinit.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -12,15 +12,26 @@
 #define NDEBUG
 #include <debug.h>
 
+VOID
+NTAPI
+HalpGetParameters(
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock
+);
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalInitSystem)
+#pragma alloc_text(INIT, HalpGetParameters)
+#endif
+
 /* GLOBALS *******************************************************************/
 
 BOOLEAN HalpPciLockSettings;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     PCHAR CommandLine;
@@ -65,9 +76,9 @@
 /*
  * @implemented
  */
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalInitSystem(IN ULONG BootPhase,
               IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {

Modified: trunk/reactos/hal/halx86/generic/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?…
==============================================================================
--- trunk/reactos/hal/halx86/generic/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/misc.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -12,6 +12,11 @@
 #define NDEBUG
 #include <debug.h>
 
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpMarkAcpiHal)
+#pragma alloc_text(INIT, HalpReportSerialNumber)
+#endif
+
 /* GLOBALS  *******************************************************************/
 
 BOOLEAN HalpNMIInProgress;
@@ -22,9 +27,9 @@
 /* PRIVATE FUNCTIONS **********************************************************/
 
 #ifndef _MINIHAL_
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpReportSerialNumber(VOID)
 {
     NTSTATUS Status;
@@ -53,9 +58,9 @@
     }
 }
 
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpMarkAcpiHal(VOID)
 {
     NTSTATUS Status;

Modified: trunk/reactos/hal/halx86/generic/timer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c…
==============================================================================
--- trunk/reactos/hal/halx86/generic/timer.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/timer.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -12,6 +12,10 @@
 #include <hal.h>
 #define NDEBUG
 #include <debug.h>
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpInitializeClock)
+#endif
 
 /* GLOBALS *******************************************************************/
 
@@ -107,9 +111,9 @@
     __writeeflags(Flags);
 }
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpInitializeClock(VOID)
 {
     ULONG Increment;

Modified: trunk/reactos/hal/halx86/generic/usage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c…
==============================================================================
--- trunk/reactos/hal/halx86/generic/usage.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/usage.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -11,6 +11,42 @@
 #include <hal.h>
 #define NDEBUG
 #include <debug.h>
+
+VOID
+NTAPI
+HalpGetResourceSortValue(
+    IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor,
+    OUT PULONG Scale,
+    OUT PLARGE_INTEGER Value
+);
+
+VOID
+NTAPI
+HalpBuildPartialFromIdt(
+    IN ULONG Entry,
+    IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor,
+    IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor
+);
+
+VOID
+NTAPI
+HalpBuildPartialFromAddress(
+    IN INTERFACE_TYPE Interface,
+    IN PADDRESS_USAGE CurrentAddress,
+    IN ULONG Element,
+    IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor,
+    IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor
+);
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpBuildPartialFromAddress)
+#pragma alloc_text(INIT, HalpBuildPartialFromIdt)
+#pragma alloc_text(INIT, HalpEnableInterruptHandler)
+#pragma alloc_text(INIT, HalpGetNMICrashFlag)
+#pragma alloc_text(INIT, HalpGetResourceSortValue)
+#pragma alloc_text(INIT, HalpRegisterVector)
+#pragma alloc_text(INIT, HalpReportResourceUsage)
+#endif
 
 /* GLOBALS ********************************************************************/
 
@@ -61,9 +97,9 @@
 /* FUNCTIONS ******************************************************************/
 
 #ifndef _MINIHAL_
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpGetResourceSortValue(IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor,
                          OUT PULONG Scale,
                          OUT PLARGE_INTEGER Value)
@@ -101,9 +137,9 @@
     }
 }
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpBuildPartialFromIdt(IN ULONG Entry,
                         IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor,
                         IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor)
@@ -139,9 +175,9 @@
     TranslatedDescriptor->u.Interrupt.Level = HalpIDTUsage[Entry].Irql;
 }
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpBuildPartialFromAddress(IN INTERFACE_TYPE Interface,
                             IN PADDRESS_USAGE CurrentAddress,
                             IN ULONG Element,
@@ -207,9 +243,9 @@
     }
 }
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpReportResourceUsage(IN PUNICODE_STRING HalName,
                         IN INTERFACE_TYPE InterfaceType)
 {
@@ -486,9 +522,9 @@
 }
 #endif
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpRegisterVector(IN UCHAR Flags,
                    IN ULONG BusVector,
                    IN ULONG SystemVector,
@@ -503,9 +539,9 @@
 }
 
 #ifndef _MINIHAL_
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpEnableInterruptHandler(IN UCHAR Flags,
                            IN ULONG BusVector,
                            IN ULONG SystemVector,
@@ -526,9 +562,9 @@
     HalEnableSystemInterrupt(SystemVector, Irql, Mode);
 }
 
-VOID
-NTAPI
-INIT_FUNCTION
+INIT_SECTION
+VOID
+NTAPI
 HalpGetNMICrashFlag(VOID)
 {
     UNICODE_STRING ValueName;

Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#if defined(__GNUC__) && !defined(_MINIHAL_)
-#define INIT_FUNCTION __attribute__((section ("INIT")))
+#ifdef __GNUC__
+#define INIT_SECTION __attribute__((section ("INIT")))
 #else
-#define INIT_FUNCTION  /* Done via alloc_text for MSC */
+#define INIT_SECTION /* Done via alloc_text for MSC */
 #endif
 
 

Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib…
==============================================================================
--- trunk/reactos/hal/halx86/legacy/bus/pcibus.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -11,6 +11,14 @@
 #include <hal.h>
 #define NDEBUG
 #include <debug.h>
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpInitializePciStubs)
+#pragma alloc_text(INIT, HalpQueryPciRegistryInfo)
+#pragma alloc_text(INIT, HalpRegisterPciDebuggingDeviceInfo)
+#pragma alloc_text(INIT, HalpReleasePciDeviceForDebugging)
+#pragma alloc_text(INIT, HalpSetupPciDeviceForDebugging)
+#endif
 
 /* GLOBALS *******************************************************************/
 
@@ -600,9 +608,9 @@
     return STATUS_SUCCESS;
 }
 
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock,
                                IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice)
 {
@@ -610,18 +618,18 @@
     return STATUS_NOT_IMPLEMENTED;
 }
 
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice)
 {
     DPRINT1("Unimplemented!\n");
     return STATUS_NOT_IMPLEMENTED;
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpRegisterPciDebuggingDeviceInfo(VOID)
 {
     BOOLEAN Found = FALSE;
@@ -854,9 +862,9 @@
     return Length;
 }
 
+INIT_SECTION
 PPCI_REGISTRY_INFO_INTERNAL
 NTAPI
-INIT_FUNCTION
 HalpQueryPciRegistryInfo(VOID)
 {
 #ifndef _MINIHAL_
@@ -1087,9 +1095,9 @@
 #endif
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpInitializePciStubs(VOID)
 {
     PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo;

Modified: trunk/reactos/hal/halx86/legacy/bussupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.…
==============================================================================
--- trunk/reactos/hal/halx86/legacy/bussupp.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy/bussupp.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -11,6 +11,100 @@
 #include <hal.h>
 #define NDEBUG
 #include <debug.h>
+
+PBUS_HANDLER
+NTAPI
+HalpAllocateAndInitPciBusHandler(
+    IN ULONG PciType,
+    IN ULONG BusNo,
+    IN BOOLEAN TestAllocation
+);
+
+VOID
+NTAPI
+HalpFixupPciSupportedRanges(
+    IN ULONG BusCount
+);
+
+NTSTATUS
+NTAPI
+HalpGetChipHacks(
+    IN USHORT VendorId,
+    IN USHORT DeviceId,
+    IN UCHAR RevisionId,
+    IN PULONG HackFlags
+);
+
+BOOLEAN
+NTAPI
+HalpGetPciBridgeConfig(
+    IN ULONG PciType,
+    IN PUCHAR BusCount
+);
+
+BOOLEAN
+NTAPI
+HalpIsBridgeDevice(
+    IN PPCI_COMMON_CONFIG PciData
+);
+
+BOOLEAN
+NTAPI
+HalpIsIdeDevice(
+    IN PPCI_COMMON_CONFIG PciData
+);
+
+BOOLEAN
+NTAPI
+HalpIsRecognizedCard(
+    IN PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo,
+    IN PPCI_COMMON_CONFIG PciData,
+    IN ULONG Flags
+);
+
+BOOLEAN
+NTAPI
+HalpIsValidPCIDevice(
+    IN PBUS_HANDLER BusHandler,
+    IN PCI_SLOT_NUMBER Slot
+);
+
+NTSTATUS
+NTAPI
+HalpMarkChipsetDecode(
+    IN BOOLEAN OverrideEnable
+);
+
+VOID
+NTAPI
+HalpRegisterInternalBusHandlers(
+    VOID
+);
+
+VOID
+NTAPI
+ShowSize(
+    IN ULONG Size
+);
+
+
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+#pragma alloc_text(INIT, HalpAllocateAndInitPciBusHandler)
+#pragma alloc_text(INIT, HalpDebugPciDumpBus)
+#pragma alloc_text(INIT, HalpFixupPciSupportedRanges)
+#pragma alloc_text(INIT, HalpGetChipHacks)
+#pragma alloc_text(INIT, HalpGetPciBridgeConfig)
+#pragma alloc_text(INIT, HalpInitBusHandlers)
+#pragma alloc_text(INIT, HalpInitializePciBus)
+#pragma alloc_text(INIT, HalpIsBridgeDevice)
+#pragma alloc_text(INIT, HalpIsIdeDevice)
+#pragma alloc_text(INIT, HalpIsRecognizedCard)
+#pragma alloc_text(INIT, HalpIsValidPCIDevice)
+#pragma alloc_text(INIT, HalpMarkChipsetDecode)
+#pragma alloc_text(INIT, HalpRegisterKdSupportFunctions)
+#pragma alloc_text(INIT, HalpRegisterInternalBusHandlers)
+#pragma alloc_text(INIT, ShowSize)
+#endif
 
 /* GLOBALS ********************************************************************/
 
@@ -66,9 +160,9 @@
     return Bus;
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpRegisterInternalBusHandlers(VOID)
 {
     PBUS_HANDLER Bus;
@@ -141,9 +235,9 @@
 }
 
 #ifndef _MINIHAL_
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpMarkChipsetDecode(BOOLEAN OverrideEnable)
 {
     NTSTATUS Status;
@@ -189,9 +283,9 @@
     return Status;
 }
 
+INIT_SECTION
 PBUS_HANDLER
 NTAPI
-INIT_FUNCTION
 HalpAllocateAndInitPciBusHandler(IN ULONG PciType,
                                  IN ULONG BusNo,
                                  IN BOOLEAN TestAllocation)
@@ -274,9 +368,9 @@
     return Bus;
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpIsValidPCIDevice(IN PBUS_HANDLER BusHandler,
                      IN PCI_SLOT_NUMBER Slot)
 {
@@ -336,9 +430,9 @@
 
 static BOOLEAN WarningsGiven[5];
 
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpGetChipHacks(IN USHORT VendorId,
                  IN USHORT DeviceId,
                  IN UCHAR RevisionId,
@@ -400,9 +494,9 @@
     return Status;
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpIsRecognizedCard(IN PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo,
                      IN PPCI_COMMON_CONFIG PciData,
                      IN ULONG Flags)
@@ -481,9 +575,9 @@
     return FALSE;
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpIsIdeDevice(IN PPCI_COMMON_CONFIG PciData)
 {
     /* Simple test first */
@@ -534,9 +628,9 @@
     return FALSE;
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpIsBridgeDevice(IN PPCI_COMMON_CONFIG PciData)
 {
     /* Either this is a PCI-to-PCI Bridge, or a CardBUS Bridge */
@@ -548,9 +642,9 @@
              (PciData->SubClass == PCI_SUBCLASS_BR_CARDBUS)));
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpGetPciBridgeConfig(IN ULONG PciType,
                        IN PUCHAR BusCount)
 {
@@ -601,9 +695,9 @@
     return FALSE;
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpFixupPciSupportedRanges(IN ULONG BusCount)
 {
     ULONG i;
@@ -664,9 +758,9 @@
     }
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 ShowSize(ULONG x)
 {
     if (!x) return;
@@ -696,9 +790,9 @@
  */
 #include "pci_classes.h"
 #include "pci_vendors.h"
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpDebugPciDumpBus(IN ULONG i,
                     IN ULONG j,
                     IN ULONG k,
@@ -849,9 +943,9 @@
 }
 #endif
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpInitializePciBus(VOID)
 {
 #ifndef _MINIHAL_
@@ -1114,18 +1208,18 @@
 #endif
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpInitBusHandlers(VOID)
 {
     /* Register the HAL Bus Handler support */
     HalpRegisterInternalBusHandlers();
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpRegisterKdSupportFunctions(VOID)
 {
     /* Register PCI Device Functions */

Modified: trunk/reactos/hal/halx86/legacy/halpcat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpcat.…
==============================================================================
--- trunk/reactos/hal/halx86/legacy/halpcat.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy/halpcat.c	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -12,6 +12,15 @@
 #define NDEBUG
 #include <debug.h>
 
+#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_)
+//#pragma alloc_text(INIT, HaliInitPnpDriver)
+#pragma alloc_text(INIT, HalpBuildAddressMap)
+#pragma alloc_text(INIT, HalpGetDebugPortTable)
+#pragma alloc_text(INIT, HalpIs16BitPortDecodeSupported)
+#pragma alloc_text(INIT, HalpSetupAcpiPhase0)
+#pragma alloc_text(INIT, HalReportResourceUsage)
+#endif
+
 /* GLOBALS ********************************************************************/
 
 /* This determines the HAL type */
@@ -21,18 +30,18 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     /* There is no ACPI on these HALs */
     return STATUS_NO_SUCH_DEVICE;
 }
 
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalpBuildAddressMap(VOID)
 {
     /* FIXME: Inherit ROM blocks from the registry */
@@ -42,18 +51,18 @@
     //HalpAddROMRanges();
 }
 
+INIT_SECTION
 BOOLEAN
 NTAPI
-INIT_FUNCTION
 HalpGetDebugPortTable(VOID)
 {
     /* No ACPI */
     return FALSE;
 }
 
+INIT_SECTION
 ULONG
 NTAPI
-INIT_FUNCTION
 HalpIs16BitPortDecodeSupported(VOID)
 {
     /* Only EISA systems support this */
@@ -61,9 +70,9 @@
 }
 
 #if 0
+INIT_SECTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 HaliInitPnpDriver(VOID)
 {
     /* On PC-AT, this will interface with the PCI driver */
@@ -75,9 +84,9 @@
 /*
  * @implemented
  */
+INIT_SECTION
 VOID
 NTAPI
-INIT_FUNCTION
 HalReportResourceUsage(VOID)
 {
     INTERFACE_TYPE InterfaceType;

Modified: trunk/reactos/hal/halx86/pcidata.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pcidata.cmake?r…
==============================================================================
--- trunk/reactos/hal/halx86/pcidata.cmake	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/pcidata.cmake	[iso-8859-1] Sat Sep  5 18:33:38 2015
@@ -3,11 +3,11 @@
 #
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c
${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h
-    COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids
${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR
ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h
+    COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids
${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR
ClassTable INIT_SECTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h
     DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids)
 
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c
${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h
-    COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids
${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR
VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h
+    COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids
${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR
VendorTable INIT_SECTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h
     DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids)
 #####################################