- Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development.

svn path=/trunk/; revision=31376
This commit is contained in:
Aleksey Bragin 2007-12-21 14:58:18 +00:00
parent be15618a7f
commit 550a5fa9ed
2 changed files with 29 additions and 26 deletions

View file

@ -3016,11 +3016,6 @@ extern DECL_EXPORT HAL_DISPATCH HalDispatchTable;
#define HalQuerySystemInformation HALDISPATCH->HalQuerySystemInformation #define HalQuerySystemInformation HALDISPATCH->HalQuerySystemInformation
#define HalSetSystemInformation HALDISPATCH->HalSetSystemInformation #define HalSetSystemInformation HALDISPATCH->HalSetSystemInformation
#define HalQueryBusSlots HALDISPATCH->HalQueryBusSlots #define HalQueryBusSlots HALDISPATCH->HalQueryBusSlots
#define HalDeviceControl HALDISPATCH->HalDeviceControl
#define HalIoAssignDriveLetters HALDISPATCH->HalIoAssignDriveLetters
#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable
#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation
#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable
#define HalReferenceHandlerForBus HALDISPATCH->HalReferenceHandlerForBus #define HalReferenceHandlerForBus HALDISPATCH->HalReferenceHandlerForBus
#define HalReferenceBusHandler HALDISPATCH->HalReferenceBusHandler #define HalReferenceBusHandler HALDISPATCH->HalReferenceBusHandler
#define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler #define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler
@ -3034,6 +3029,14 @@ extern DECL_EXPORT HAL_DISPATCH HalDispatchTable;
#define HalEndOfBoot HALDISPATCH->HalEndOfBoot #define HalEndOfBoot HALDISPATCH->HalEndOfBoot
#define HalMirrorVerify HALDISPATCH->HalMirrorVerify #define HalMirrorVerify HALDISPATCH->HalMirrorVerify
#ifndef _NTOSKRNL_
#define HalDeviceControl HALDISPATCH->HalDeviceControl
#define HalIoAssignDriveLetters HALDISPATCH->HalIoAssignDriveLetters
#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable
#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation
#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable
#endif
typedef enum _FILE_INFORMATION_CLASS { typedef enum _FILE_INFORMATION_CLASS {
FileDirectoryInformation = 1, FileDirectoryInformation = 1,
FileFullDirectoryInformation, FileFullDirectoryInformation,

View file

@ -2228,10 +2228,10 @@ HalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
IN ULONG MbrTypeIdentifier, IN ULONG MbrTypeIdentifier,
OUT PVOID *MbrBuffer) OUT PVOID *MbrBuffer)
{ {
HalDispatchTable.HalExamineMBR(DeviceObject, HALDISPATCH->HalExamineMBR(DeviceObject,
SectorSize, SectorSize,
MbrTypeIdentifier, MbrTypeIdentifier,
MbrBuffer); MbrBuffer);
} }
/* /*
@ -2244,10 +2244,10 @@ IoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject,
IN BOOLEAN ReturnRecognizedPartitions, IN BOOLEAN ReturnRecognizedPartitions,
IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer)
{ {
return HalIoReadPartitionTable(DeviceObject, return HALDISPATCH->HalIoReadPartitionTable(DeviceObject,
SectorSize, SectorSize,
ReturnRecognizedPartitions, ReturnRecognizedPartitions,
PartitionBuffer); PartitionBuffer);
} }
/* /*
@ -2260,10 +2260,10 @@ IoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
IN ULONG PartitionNumber, IN ULONG PartitionNumber,
IN ULONG PartitionType) IN ULONG PartitionType)
{ {
return HalIoSetPartitionInformation(DeviceObject, return HALDISPATCH->HalIoSetPartitionInformation(DeviceObject,
SectorSize, SectorSize,
PartitionNumber, PartitionNumber,
PartitionType); PartitionType);
} }
/* /*
@ -2277,11 +2277,11 @@ IoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
IN ULONG NumberOfHeads, IN ULONG NumberOfHeads,
IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
{ {
return HalIoWritePartitionTable(DeviceObject, return HALDISPATCH->HalIoWritePartitionTable(DeviceObject,
SectorSize, SectorSize,
SectorsPerTrack, SectorsPerTrack,
NumberOfHeads, NumberOfHeads,
PartitionBuffer); PartitionBuffer);
} }
/* /*
@ -2294,10 +2294,10 @@ IoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
OUT PUCHAR NtSystemPath, OUT PUCHAR NtSystemPath,
OUT PSTRING NtSystemPathString) OUT PSTRING NtSystemPathString)
{ {
HalIoAssignDriveLetters(LoaderBlock, HALDISPATCH->HalIoAssignDriveLetters(LoaderBlock,
NtDeviceName, NtDeviceName,
NtSystemPath, NtSystemPath,
NtSystemPathString); NtSystemPathString);
} }
/* EOF */ /* EOF */