Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 00:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Deprecate STDCALL from HAL

Browse source 
svn path=/trunk/; revision=37755
This commit is contained in:
Stefan Ginsberg 2008-11-29 23:16:39 +00:00
parent f5091d00cd
commit 37ba4af619
18 changed files with 93 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/hal/halppc/generic/beep.c
View file

@ -32,7 +32,7 @@
*/ */
BOOLEAN BOOLEAN
STDCALL NTAPI
HalMakeBeep ( HalMakeBeep (
ULONG Frequency ULONG Frequency
) )

12
reactos/hal/halppc/generic/display.c
View file

@ -250,7 +250,7 @@ HalInitializeDisplay (PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
/* PUBLIC FUNCTIONS *********************************************************/ /* PUBLIC FUNCTIONS *********************************************************/
VOID STDCALL VOID NTAPI
HalReleaseDisplayOwnership(VOID) HalReleaseDisplayOwnership(VOID)
/* /*
* FUNCTION: Release ownership of display back to HAL * FUNCTION: Release ownership of display back to HAL
@ -267,7 +267,7 @@ HalReleaseDisplayOwnership(VOID)
} }
VOID STDCALL VOID NTAPI
HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters)
/* /*
* FUNCTION: * FUNCTION:
@ -280,7 +280,7 @@ HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParamete
HalResetDisplayParameters = ResetDisplayParameters; HalResetDisplayParameters = ResetDisplayParameters;
} }
VOID STDCALL VOID NTAPI
HalDisplayString(IN PCH String) HalDisplayString(IN PCH String)
/* /*
* FUNCTION: Switches the screen to HAL console mode (BSOD) if not there * FUNCTION: Switches the screen to HAL console mode (BSOD) if not there
@ -350,7 +350,7 @@ HalDisplayString(IN PCH String)
KeLowerIrql(OldIrql); KeLowerIrql(OldIrql);
} }
VOID STDCALL VOID NTAPI
HalQueryDisplayParameters(OUT PULONG DispSizeX, HalQueryDisplayParameters(OUT PULONG DispSizeX,
OUT PULONG DispSizeY, OUT PULONG DispSizeY,
OUT PULONG CursorPosX, OUT PULONG CursorPosX,
@ -367,7 +367,7 @@ HalQueryDisplayParameters(OUT PULONG DispSizeX,
} }
VOID STDCALL VOID NTAPI
HalSetDisplayParameters(IN ULONG CursorPosX, HalSetDisplayParameters(IN ULONG CursorPosX,
IN ULONG CursorPosY) IN ULONG CursorPosY)
{ {
@ -376,7 +376,7 @@ HalSetDisplayParameters(IN ULONG CursorPosX,
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalQueryDisplayOwnership(VOID) HalQueryDisplayOwnership(VOID)
{ {
return !HalOwnsDisplay; return !HalOwnsDisplay;

38
reactos/hal/halppc/generic/dma.c
View file

@ -164,7 +164,7 @@ HalpInitDma(VOID)
* by the passed DMA adapter. * by the passed DMA adapter.
*/ */
PHYSICAL_ADDRESS STDCALL PHYSICAL_ADDRESS NTAPI
HalpGetAdapterMaximumPhysicalAddress( HalpGetAdapterMaximumPhysicalAddress(
IN PADAPTER_OBJECT AdapterObject) IN PADAPTER_OBJECT AdapterObject)
{ {
@ -200,7 +200,7 @@ HalpGetAdapterMaximumPhysicalAddress(
* already allocated). * already allocated).
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
HalpGrowMapBuffers( HalpGrowMapBuffers(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN ULONG SizeOfMapBuffers) IN ULONG SizeOfMapBuffers)
@ -329,7 +329,7 @@ HalpGrowMapBuffers(
* @see HalpInitDma * @see HalpInitDma
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID) HalpDmaAllocateMasterAdapter(VOID)
{ {
PADAPTER_OBJECT MasterAdapter; PADAPTER_OBJECT MasterAdapter;
@ -388,7 +388,7 @@ HalpDmaAllocateMasterAdapter(VOID)
* @see HalGetAdapter * @see HalGetAdapter
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateChildAdapter( HalpDmaAllocateChildAdapter(
ULONG NumberOfMapRegisters, ULONG NumberOfMapRegisters,
PDEVICE_DESCRIPTION DeviceDescription) PDEVICE_DESCRIPTION DeviceDescription)
@ -458,7 +458,7 @@ HalpDmaAllocateChildAdapter(
* Setup DMA modes and extended modes for (E)ISA DMA adapter object. * Setup DMA modes and extended modes for (E)ISA DMA adapter object.
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
HalpDmaInitializeEisaAdapter( HalpDmaInitializeEisaAdapter(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PDEVICE_DESCRIPTION DeviceDescription) PDEVICE_DESCRIPTION DeviceDescription)
@ -588,7 +588,7 @@ HalpDmaInitializeEisaAdapter(
* @implemented * @implemented
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalGetAdapter( HalGetAdapter(
PDEVICE_DESCRIPTION DeviceDescription, PDEVICE_DESCRIPTION DeviceDescription,
PULONG NumberOfMapRegisters) PULONG NumberOfMapRegisters)
@ -787,7 +787,7 @@ HalGetAdapter(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
PDMA_ADAPTER STDCALL PDMA_ADAPTER NTAPI
HalpGetDmaAdapter( HalpGetDmaAdapter(
IN PVOID Context, IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_DESCRIPTION DeviceDescription,
@ -805,7 +805,7 @@ HalpGetDmaAdapter(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
VOID STDCALL VOID NTAPI
HalPutDmaAdapter( HalPutDmaAdapter(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -846,7 +846,7 @@ HalPutDmaAdapter(
* @implemented * @implemented
*/ */
PVOID STDCALL PVOID NTAPI
HalAllocateCommonBuffer( HalAllocateCommonBuffer(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
ULONG Length, ULONG Length,
@ -895,7 +895,7 @@ HalAllocateCommonBuffer(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
HalFreeCommonBuffer( HalFreeCommonBuffer(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
ULONG Length, ULONG Length,
@ -915,7 +915,7 @@ HalFreeCommonBuffer(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
ULONG STDCALL ULONG NTAPI
HalpDmaGetDmaAlignment( HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -930,7 +930,7 @@ HalpDmaGetDmaAlignment(
* @implemented * @implemented
*/ */
ULONG STDCALL ULONG NTAPI
HalReadDmaCounter( HalReadDmaCounter(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -1002,7 +1002,7 @@ HalReadDmaCounter(
* at PASSIVE_LEVEL in work item. * at PASSIVE_LEVEL in work item.
*/ */
VOID STDCALL VOID NTAPI
HalpGrowMapBufferWorker(PVOID DeferredContext) HalpGrowMapBufferWorker(PVOID DeferredContext)
{ {
PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext; PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@ -1064,7 +1064,7 @@ HalpGrowMapBufferWorker(PVOID DeferredContext)
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
HalAllocateAdapterChannel( HalAllocateAdapterChannel(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PWAIT_CONTEXT_BLOCK WaitContextBlock, PWAIT_CONTEXT_BLOCK WaitContextBlock,
@ -1235,7 +1235,7 @@ HalAllocateAdapterChannel(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
IoFreeAdapterChannel( IoFreeAdapterChannel(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -1359,7 +1359,7 @@ IoFreeAdapterChannel(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
IoFreeMapRegisters( IoFreeMapRegisters(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN PVOID MapRegisterBase, IN PVOID MapRegisterBase,
@ -1465,7 +1465,7 @@ IoFreeMapRegisters(
* @see IoFlushAdapterBuffers, IoMapTransfer * @see IoFlushAdapterBuffers, IoMapTransfer
*/ */
VOID STDCALL VOID NTAPI
HalpCopyBufferMap( HalpCopyBufferMap(
PMDL Mdl, PMDL Mdl,
PROS_MAP_REGISTER_ENTRY MapRegisterBase, PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@ -1554,7 +1554,7 @@ HalpCopyBufferMap(
* @unimplemented. * @unimplemented.
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
IoFlushAdapterBuffers( IoFlushAdapterBuffers(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PMDL Mdl, PMDL Mdl,
@ -1661,7 +1661,7 @@ IoFlushAdapterBuffers(
* @implemented * @implemented
*/ */
PHYSICAL_ADDRESS STDCALL PHYSICAL_ADDRESS NTAPI
IoMapTransfer( IoMapTransfer(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl, IN PMDL Mdl,

16
reactos/hal/halppc/generic/irql.c
View file

@ -61,7 +61,7 @@ static ULONG HalpPendingInterruptCount[NR_IRQS];
#else #else
VOID STDCALL VOID NTAPI
KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); KiInterruptDispatch2 (ULONG Irq, KIRQL old_level);
#endif #endif
@ -69,7 +69,7 @@ KiInterruptDispatch2 (ULONG Irq, KIRQL old_level);
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
#undef KeGetCurrentIrql #undef KeGetCurrentIrql
KIRQL STDCALL KeGetCurrentIrql (VOID) KIRQL NTAPI KeGetCurrentIrql (VOID)
/* /*
* PURPOSE: Returns the current irq level * PURPOSE: Returns the current irq level
* RETURNS: The current irq level * RETURNS: The current irq level
@ -277,7 +277,7 @@ KfRaiseIrql (KIRQL NewIrql)
* Calls KfRaiseIrql * Calls KfRaiseIrql
*/ */
KIRQL STDCALL KIRQL NTAPI
KeRaiseIrqlToDpcLevel (VOID) KeRaiseIrqlToDpcLevel (VOID)
{ {
return KfRaiseIrql (DISPATCH_LEVEL); return KfRaiseIrql (DISPATCH_LEVEL);
@ -301,14 +301,14 @@ KeRaiseIrqlToDpcLevel (VOID)
* Calls KfRaiseIrql * Calls KfRaiseIrql
*/ */
KIRQL STDCALL KIRQL NTAPI
KeRaiseIrqlToSynchLevel (VOID) KeRaiseIrqlToSynchLevel (VOID)
{ {
return KfRaiseIrql (DISPATCH_LEVEL); return KfRaiseIrql (DISPATCH_LEVEL);
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalBeginSystemInterrupt (KIRQL Irql, HalBeginSystemInterrupt (KIRQL Irql,
ULONG Vector, ULONG Vector,
PKIRQL OldIrql) PKIRQL OldIrql)
@ -347,7 +347,7 @@ HalBeginSystemInterrupt (KIRQL Irql,
} }
VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
/* /*
* FUNCTION: Finish a system interrupt and restore the specified irq level. * FUNCTION: Finish a system interrupt and restore the specified irq level.
*/ */
@ -357,7 +357,7 @@ VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
} }
BOOLEAN BOOLEAN
STDCALL NTAPI
HalDisableSystemInterrupt( HalDisableSystemInterrupt(
ULONG Vector, ULONG Vector,
KIRQL Irql) KIRQL Irql)
@ -383,7 +383,7 @@ HalDisableSystemInterrupt(
BOOLEAN BOOLEAN
STDCALL NTAPI
HalEnableSystemInterrupt( HalEnableSystemInterrupt(
ULONG Vector, ULONG Vector,
KIRQL Irql, KIRQL Irql,

4
reactos/hal/halppc/generic/isa.c
View file

@ -34,7 +34,7 @@ BOOLEAN HalIsaProbe(VOID)
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler, HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler,
ULONG BusNumber, ULONG BusNumber,
PHYSICAL_ADDRESS BusAddress, PHYSICAL_ADDRESS BusAddress,
@ -59,7 +59,7 @@ HalpTranslateIsaBusAddress(PBUS_HANDLER BusHandler,
return Result; return Result;
} }
ULONG STDCALL ULONG NTAPI
HalpGetIsaInterruptVector(PVOID BusHandler, HalpGetIsaInterruptVector(PVOID BusHandler,
ULONG BusNumber, ULONG BusNumber,
ULONG BusInterruptLevel, ULONG BusInterruptLevel,

24
reactos/hal/halppc/generic/portio.c
View file

@ -193,7 +193,7 @@ __asm__("\t.globl SetPhysByte\n"
"blr" "blr"
); );
VOID STDCALL VOID NTAPI
READ_PORT_BUFFER_UCHAR (PUCHAR Port, READ_PORT_BUFFER_UCHAR (PUCHAR Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count) ULONG Count)
@ -201,7 +201,7 @@ READ_PORT_BUFFER_UCHAR (PUCHAR Port,
while(Count--) { *Buffer++ = GetPhysByte((ULONG)Port); } while(Count--) { *Buffer++ = GetPhysByte((ULONG)Port); }
} }
VOID STDCALL VOID NTAPI
READ_PORT_BUFFER_USHORT (PUSHORT Port, READ_PORT_BUFFER_USHORT (PUSHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count) ULONG Count)
@ -209,7 +209,7 @@ READ_PORT_BUFFER_USHORT (PUSHORT Port,
while(Count--) { *Buffer++ = GetPhysWord((ULONG)Port); } while(Count--) { *Buffer++ = GetPhysWord((ULONG)Port); }
} }
VOID STDCALL VOID NTAPI
READ_PORT_BUFFER_ULONG (PULONG Port, READ_PORT_BUFFER_ULONG (PULONG Port,
PULONG Buffer, PULONG Buffer,
ULONG Count) ULONG Count)
@ -217,25 +217,25 @@ READ_PORT_BUFFER_ULONG (PULONG Port,
while(Count--) { *Buffer++ = GetPhys((ULONG)Port); } while(Count--) { *Buffer++ = GetPhys((ULONG)Port); }
} }
UCHAR STDCALL UCHAR NTAPI
READ_PORT_UCHAR (PUCHAR Port) READ_PORT_UCHAR (PUCHAR Port)
{ {
return GetPhys((ULONG)Port); return GetPhys((ULONG)Port);
} }
USHORT STDCALL USHORT NTAPI
READ_PORT_USHORT (PUSHORT Port) READ_PORT_USHORT (PUSHORT Port)
{ {
return GetPhysWord((ULONG)Port); return GetPhysWord((ULONG)Port);
} }
ULONG STDCALL ULONG NTAPI
READ_PORT_ULONG (PULONG Port) READ_PORT_ULONG (PULONG Port)
{ {
return GetPhys((ULONG)Port); return GetPhys((ULONG)Port);
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, WRITE_PORT_BUFFER_UCHAR (PUCHAR Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count) ULONG Count)
@ -243,7 +243,7 @@ WRITE_PORT_BUFFER_UCHAR (PUCHAR Port,
while(Count--) { SetPhysByte((ULONG)Port, *Buffer++); } while(Count--) { SetPhysByte((ULONG)Port, *Buffer++); }
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_BUFFER_USHORT (PUSHORT Port, WRITE_PORT_BUFFER_USHORT (PUSHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count) ULONG Count)
@ -251,7 +251,7 @@ WRITE_PORT_BUFFER_USHORT (PUSHORT Port,
while(Count--) { SetPhysWord((ULONG)Port, *Buffer++); } while(Count--) { SetPhysWord((ULONG)Port, *Buffer++); }
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_BUFFER_ULONG (PULONG Port, WRITE_PORT_BUFFER_ULONG (PULONG Port,
PULONG Buffer, PULONG Buffer,
ULONG Count) ULONG Count)
@ -259,21 +259,21 @@ WRITE_PORT_BUFFER_ULONG (PULONG Port,
while(Count--) { SetPhys((ULONG)Port, *Buffer++); } while(Count--) { SetPhys((ULONG)Port, *Buffer++); }
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_UCHAR (PUCHAR Port, WRITE_PORT_UCHAR (PUCHAR Port,
UCHAR Value) UCHAR Value)
{ {
SetPhysByte((ULONG)Port, Value); SetPhysByte((ULONG)Port, Value);
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_USHORT (PUSHORT Port, WRITE_PORT_USHORT (PUSHORT Port,
USHORT Value) USHORT Value)
{ {
SetPhysWord((ULONG)Port, Value); SetPhysWord((ULONG)Port, Value);
} }
VOID STDCALL VOID NTAPI
WRITE_PORT_ULONG (PULONG Port, WRITE_PORT_ULONG (PULONG Port,
ULONG Value) ULONG Value)
{ {

4
reactos/hal/halppc/generic/processor.c
View file

@ -22,7 +22,7 @@
#define INITIAL_STALL_COUNT 0x10000 #define INITIAL_STALL_COUNT 0x10000
VOID STDCALL VOID NTAPI
HalInitializeProcessor(ULONG ProcessorNumber, HalInitializeProcessor(ULONG ProcessorNumber,
PLOADER_PARAMETER_BLOCK LoaderBlock) PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
@ -30,7 +30,7 @@ HalInitializeProcessor(ULONG ProcessorNumber,
KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT;
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalAllProcessorsStarted (VOID) HalAllProcessorsStarted (VOID)
{ {
DPRINT("HalAllProcessorsStarted()\n"); DPRINT("HalAllProcessorsStarted()\n");

2
reactos/hal/halppc/generic/reboot.c
View file

@ -22,7 +22,7 @@ HalReboot (VOID)
} }
VOID STDCALL VOID NTAPI
HalReturnToFirmware ( HalReturnToFirmware (
FIRMWARE_REENTRY Action FIRMWARE_REENTRY Action
) )

6
reactos/hal/halppc/include/haldma.h
View file

@ -367,16 +367,16 @@ typedef struct _GROW_WORK_ITEM {
#define MAP_BASE_SW_SG 1 #define MAP_BASE_SW_SG 1
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID); HalpDmaAllocateMasterAdapter(VOID);
PDMA_ADAPTER STDCALL PDMA_ADAPTER NTAPI
HalpGetDmaAdapter( HalpGetDmaAdapter(
IN PVOID Context, IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_DESCRIPTION DeviceDescription,
OUT PULONG NumberOfMapRegisters); OUT PULONG NumberOfMapRegisters);
ULONG STDCALL ULONG NTAPI
HalpDmaGetDmaAlignment( HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject); PADAPTER_OBJECT AdapterObject);

2
reactos/hal/halppc/include/halp.h
View file

@ -36,7 +36,7 @@
(UCHAR)(((int / 10) << 4) + (int % 10)) (UCHAR)(((int / 10) << 4) + (int % 10))
/* adapter.c */ /* adapter.c */
PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
/* bus.c */ /* bus.c */
VOID NTAPI HalpInitNonBusHandler (VOID); VOID NTAPI HalpInitNonBusHandler (VOID);

38
reactos/hal/halx86/generic/dma.c
View file

@ -164,7 +164,7 @@ HalpInitDma(VOID)
* by the passed DMA adapter. * by the passed DMA adapter.
*/ */
PHYSICAL_ADDRESS STDCALL PHYSICAL_ADDRESS NTAPI
HalpGetAdapterMaximumPhysicalAddress( HalpGetAdapterMaximumPhysicalAddress(
IN PADAPTER_OBJECT AdapterObject) IN PADAPTER_OBJECT AdapterObject)
{ {
@ -200,7 +200,7 @@ HalpGetAdapterMaximumPhysicalAddress(
* already allocated). * already allocated).
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
HalpGrowMapBuffers( HalpGrowMapBuffers(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN ULONG SizeOfMapBuffers) IN ULONG SizeOfMapBuffers)
@ -329,7 +329,7 @@ HalpGrowMapBuffers(
* @see HalpInitDma * @see HalpInitDma
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID) HalpDmaAllocateMasterAdapter(VOID)
{ {
PADAPTER_OBJECT MasterAdapter; PADAPTER_OBJECT MasterAdapter;
@ -388,7 +388,7 @@ HalpDmaAllocateMasterAdapter(VOID)
* @see HalGetAdapter * @see HalGetAdapter
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateChildAdapter( HalpDmaAllocateChildAdapter(
ULONG NumberOfMapRegisters, ULONG NumberOfMapRegisters,
PDEVICE_DESCRIPTION DeviceDescription) PDEVICE_DESCRIPTION DeviceDescription)
@ -458,7 +458,7 @@ HalpDmaAllocateChildAdapter(
* Setup DMA modes and extended modes for (E)ISA DMA adapter object. * Setup DMA modes and extended modes for (E)ISA DMA adapter object.
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
HalpDmaInitializeEisaAdapter( HalpDmaInitializeEisaAdapter(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PDEVICE_DESCRIPTION DeviceDescription) PDEVICE_DESCRIPTION DeviceDescription)
@ -588,7 +588,7 @@ HalpDmaInitializeEisaAdapter(
* @implemented * @implemented
*/ */
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalGetAdapter( HalGetAdapter(
PDEVICE_DESCRIPTION DeviceDescription, PDEVICE_DESCRIPTION DeviceDescription,
PULONG NumberOfMapRegisters) PULONG NumberOfMapRegisters)
@ -787,7 +787,7 @@ HalGetAdapter(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
PDMA_ADAPTER STDCALL PDMA_ADAPTER NTAPI
HalpGetDmaAdapter( HalpGetDmaAdapter(
IN PVOID Context, IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_DESCRIPTION DeviceDescription,
@ -805,7 +805,7 @@ HalpGetDmaAdapter(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
VOID STDCALL VOID NTAPI
HalPutDmaAdapter( HalPutDmaAdapter(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -846,7 +846,7 @@ HalPutDmaAdapter(
* @implemented * @implemented
*/ */
PVOID STDCALL PVOID NTAPI
HalAllocateCommonBuffer( HalAllocateCommonBuffer(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
ULONG Length, ULONG Length,
@ -895,7 +895,7 @@ HalAllocateCommonBuffer(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
HalFreeCommonBuffer( HalFreeCommonBuffer(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
ULONG Length, ULONG Length,
@ -915,7 +915,7 @@ HalFreeCommonBuffer(
* @see HalGetAdapter * @see HalGetAdapter
*/ */
ULONG STDCALL ULONG NTAPI
HalpDmaGetDmaAlignment( HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -930,7 +930,7 @@ HalpDmaGetDmaAlignment(
* @implemented * @implemented
*/ */
ULONG STDCALL ULONG NTAPI
HalReadDmaCounter( HalReadDmaCounter(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -1002,7 +1002,7 @@ HalReadDmaCounter(
* at PASSIVE_LEVEL in work item. * at PASSIVE_LEVEL in work item.
*/ */
VOID STDCALL VOID NTAPI
HalpGrowMapBufferWorker(PVOID DeferredContext) HalpGrowMapBufferWorker(PVOID DeferredContext)
{ {
PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext; PGROW_WORK_ITEM WorkItem = (PGROW_WORK_ITEM)DeferredContext;
@ -1064,7 +1064,7 @@ HalpGrowMapBufferWorker(PVOID DeferredContext)
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
HalAllocateAdapterChannel( HalAllocateAdapterChannel(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PWAIT_CONTEXT_BLOCK WaitContextBlock, PWAIT_CONTEXT_BLOCK WaitContextBlock,
@ -1235,7 +1235,7 @@ HalAllocateAdapterChannel(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
IoFreeAdapterChannel( IoFreeAdapterChannel(
PADAPTER_OBJECT AdapterObject) PADAPTER_OBJECT AdapterObject)
{ {
@ -1359,7 +1359,7 @@ IoFreeAdapterChannel(
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
IoFreeMapRegisters( IoFreeMapRegisters(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN PVOID MapRegisterBase, IN PVOID MapRegisterBase,
@ -1465,7 +1465,7 @@ IoFreeMapRegisters(
* @see IoFlushAdapterBuffers, IoMapTransfer * @see IoFlushAdapterBuffers, IoMapTransfer
*/ */
VOID STDCALL VOID NTAPI
HalpCopyBufferMap( HalpCopyBufferMap(
PMDL Mdl, PMDL Mdl,
PROS_MAP_REGISTER_ENTRY MapRegisterBase, PROS_MAP_REGISTER_ENTRY MapRegisterBase,
@ -1554,7 +1554,7 @@ HalpCopyBufferMap(
* @unimplemented. * @unimplemented.
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
IoFlushAdapterBuffers( IoFlushAdapterBuffers(
PADAPTER_OBJECT AdapterObject, PADAPTER_OBJECT AdapterObject,
PMDL Mdl, PMDL Mdl,
@ -1663,7 +1663,7 @@ IoFlushAdapterBuffers(
* @implemented * @implemented
*/ */
PHYSICAL_ADDRESS STDCALL PHYSICAL_ADDRESS NTAPI
IoMapTransfer( IoMapTransfer(
IN PADAPTER_OBJECT AdapterObject, IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl, IN PMDL Mdl,

2
reactos/hal/halx86/generic/pci.c
View file

@ -520,7 +520,7 @@ HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice)
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
static ULONG STDCALL static ULONG NTAPI
PciSize(ULONG Base, ULONG Mask) PciSize(ULONG Base, ULONG Mask)
{ {
ULONG Size = Mask & Base; /* Find the significant bits */ ULONG Size = Mask & Base; /* Find the significant bits */

6
reactos/hal/halx86/include/haldma.h
View file

@ -367,16 +367,16 @@ typedef struct _GROW_WORK_ITEM {
#define MAP_BASE_SW_SG 1 #define MAP_BASE_SW_SG 1
PADAPTER_OBJECT STDCALL PADAPTER_OBJECT NTAPI
HalpDmaAllocateMasterAdapter(VOID); HalpDmaAllocateMasterAdapter(VOID);
PDMA_ADAPTER STDCALL PDMA_ADAPTER NTAPI
HalpGetDmaAdapter( HalpGetDmaAdapter(
IN PVOID Context, IN PVOID Context,
IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_DESCRIPTION DeviceDescription,
OUT PULONG NumberOfMapRegisters); OUT PULONG NumberOfMapRegisters);
ULONG STDCALL ULONG NTAPI
HalpDmaGetDmaAlignment( HalpDmaGetDmaAlignment(
PADAPTER_OBJECT AdapterObject); PADAPTER_OBJECT AdapterObject);

2
reactos/hal/halx86/include/halp.h
View file

@ -30,7 +30,7 @@
(UCHAR)(((int / 10) << 4) + (int % 10)) (UCHAR)(((int / 10) << 4) + (int % 10))
/* adapter.c */ /* adapter.c */
PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses);
/* bus.c */ /* bus.c */
VOID NTAPI HalpInitNonBusHandler (VOID); VOID NTAPI HalpInitNonBusHandler (VOID);

2
reactos/hal/halx86/mp/ipi_mp.c
View file

@ -15,7 +15,7 @@
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
VOID STDCALL VOID NTAPI
HalRequestIpi(KAFFINITY TargetProcessors) HalRequestIpi(KAFFINITY TargetProcessors)
{ {
/* FIXME: SMP HAL is...very broken */ /* FIXME: SMP HAL is...very broken */

18
reactos/hal/halx86/mp/mpsirql.c
View file

@ -21,7 +21,7 @@
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
#undef KeGetCurrentIrql #undef KeGetCurrentIrql
KIRQL STDCALL KeGetCurrentIrql (VOID) KIRQL NTAPI KeGetCurrentIrql (VOID)
/* /*
* PURPOSE: Returns the current irq level * PURPOSE: Returns the current irq level
* RETURNS: The current irq level * RETURNS: The current irq level
@ -160,7 +160,7 @@ KfLowerIrql (KIRQL NewIrql)
* NOTES * NOTES
*/ */
#undef KeLowerIrql #undef KeLowerIrql
VOID STDCALL VOID NTAPI
KeLowerIrql (KIRQL NewIrql) KeLowerIrql (KIRQL NewIrql)
{ {
KfLowerIrql (NewIrql); KfLowerIrql (NewIrql);
@ -234,7 +234,7 @@ KfRaiseIrql (KIRQL NewIrql)
* Calls KfRaiseIrql * Calls KfRaiseIrql
*/ */
#undef KeRaiseIrql #undef KeRaiseIrql
VOID STDCALL VOID NTAPI
KeRaiseIrql (KIRQL NewIrql, KeRaiseIrql (KIRQL NewIrql,
PKIRQL OldIrql) PKIRQL OldIrql)
{ {
@ -259,7 +259,7 @@ KeRaiseIrql (KIRQL NewIrql,
* Calls KfRaiseIrql * Calls KfRaiseIrql
*/ */
KIRQL STDCALL KIRQL NTAPI
KeRaiseIrqlToDpcLevel (VOID) KeRaiseIrqlToDpcLevel (VOID)
{ {
return KfRaiseIrql (DISPATCH_LEVEL); return KfRaiseIrql (DISPATCH_LEVEL);
@ -283,14 +283,14 @@ KeRaiseIrqlToDpcLevel (VOID)
* Calls KfRaiseIrql * Calls KfRaiseIrql
*/ */
KIRQL STDCALL KIRQL NTAPI
KeRaiseIrqlToSynchLevel (VOID) KeRaiseIrqlToSynchLevel (VOID)
{ {
return KfRaiseIrql (CLOCK2_LEVEL); return KfRaiseIrql (CLOCK2_LEVEL);
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalBeginSystemInterrupt (KIRQL Irql, HalBeginSystemInterrupt (KIRQL Irql,
ULONG Vector, ULONG Vector,
PKIRQL OldIrql) PKIRQL OldIrql)
@ -317,7 +317,7 @@ HalBeginSystemInterrupt (KIRQL Irql,
} }
VOID STDCALL VOID NTAPI
HalEndSystemInterrupt (KIRQL Irql, HalEndSystemInterrupt (KIRQL Irql,
ULONG Unknown2) ULONG Unknown2)
/* /*
@ -336,7 +336,7 @@ HalEndSystemInterrupt (KIRQL Irql,
HalpLowerIrql (Irql, TRUE); HalpLowerIrql (Irql, TRUE);
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalDisableSystemInterrupt (ULONG Vector, HalDisableSystemInterrupt (ULONG Vector,
KIRQL Irql) KIRQL Irql)
{ {
@ -358,7 +358,7 @@ HalDisableSystemInterrupt (ULONG Vector,
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalEnableSystemInterrupt (ULONG Vector, HalEnableSystemInterrupt (ULONG Vector,
KIRQL Irql, KIRQL Irql,
KINTERRUPT_MODE InterruptMode) KINTERRUPT_MODE InterruptMode)

4
reactos/hal/halx86/mp/processor_mp.c
View file

@ -20,7 +20,7 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID STDCALL VOID NTAPI
HalInitializeProcessor(ULONG ProcessorNumber, HalInitializeProcessor(ULONG ProcessorNumber,
PLOADER_PARAMETER_BLOCK LoaderBlock) PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
@ -55,7 +55,7 @@ HalInitializeProcessor(ULONG ProcessorNumber,
//HalpCalibrateStallExecution(); //HalpCalibrateStallExecution();
} }
BOOLEAN STDCALL BOOLEAN NTAPI
HalAllProcessorsStarted (VOID) HalAllProcessorsStarted (VOID)
{ {
ULONG CPUs = 0, i; ULONG CPUs = 0, i;

4
reactos/hal/halx86/mp/spinlock.c
View file

@ -26,7 +26,7 @@
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
#undef KeAcquireSpinLock #undef KeAcquireSpinLock
VOID STDCALL VOID NTAPI
KeAcquireSpinLock ( KeAcquireSpinLock (
PKSPIN_LOCK SpinLock, PKSPIN_LOCK SpinLock,
PKIRQL OldIrql PKIRQL OldIrql
@ -55,7 +55,7 @@ KeAcquireSpinLockRaiseToSynch (
} }
#undef KeReleaseSpinLock #undef KeReleaseSpinLock
VOID STDCALL VOID NTAPI
KeReleaseSpinLock ( KeReleaseSpinLock (
PKSPIN_LOCK SpinLock, PKSPIN_LOCK SpinLock,
KIRQL NewIrql KIRQL NewIrql