From b3ab3efa96979b946f18dc9cb150dc2eb3e1c135 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 27 Aug 2001 01:29:07 +0000 Subject: [PATCH] Fixed callback calling conventions (part 2). svn path=/trunk/; revision=2201 --- reactos/drivers/bus/acpi/ospm/acpisys.c | 5 +- reactos/drivers/bus/acpi/ospm/osl.c | 6 +- reactos/drivers/bus/isapnp/isapnp.c | 3 +- reactos/drivers/dd/beep/beep.c | 4 +- reactos/drivers/dd/blue/blue.c | 25 +- reactos/drivers/dd/floppy/dpc.c | 73 ++- reactos/drivers/dd/floppy/floppy.c | 51 +- reactos/drivers/dd/floppy/floppy.h | 109 ++-- reactos/drivers/dd/floppy/isr.c | 4 +- reactos/drivers/dd/ide/ide.c | 284 ++++++--- reactos/drivers/dd/ide/ide.h | 2 +- reactos/drivers/input/keyboard/keyboard.c | 16 +- reactos/drivers/input/psaux/mouse.c | 3 +- reactos/drivers/input/psaux/psaux.c | 3 +- reactos/drivers/net/ndis/ndis/io.c | 4 +- reactos/drivers/net/ndis/ndis/miniport.c | 2 +- reactos/drivers/net/tcpip/include/ip.h | 2 +- reactos/drivers/net/tcpip/network/ip.c | 2 +- reactos/hal/halx86/include/bus.h | 108 ++-- reactos/hal/halx86/kdbg.c | 6 +- reactos/include/ddk/halddk.h | 707 ---------------------- reactos/include/ddk/halfuncs.h | 309 ++++++++++ reactos/include/ddk/haltypes.h | 276 +++++++++ reactos/include/ddk/iotypes.h | 148 ++--- reactos/include/ddk/ketypes.h | 42 +- reactos/include/ddk/ntddk.h | 8 +- reactos/ntoskrnl/include/internal/ke.h | 8 +- reactos/ntoskrnl/include/internal/ps.h | 19 + reactos/ntoskrnl/io/cleanup.c | 11 +- reactos/ntoskrnl/io/irp.c | 19 +- reactos/ntoskrnl/io/pnproot.c | 3 +- reactos/ntoskrnl/ke/apc.c | 47 +- reactos/ntoskrnl/ke/kthread.c | 25 +- reactos/ntoskrnl/ke/timer.c | 4 +- reactos/ntoskrnl/ps/create.c | 12 +- reactos/ntoskrnl/ps/debug.c | 38 +- reactos/ntoskrnl/ps/kill.c | 45 +- reactos/ntoskrnl/ps/suspend.c | 8 +- 38 files changed, 1256 insertions(+), 1185 deletions(-) delete mode 100644 reactos/include/ddk/halddk.h create mode 100644 reactos/include/ddk/halfuncs.h create mode 100644 reactos/include/ddk/haltypes.h diff --git a/reactos/drivers/bus/acpi/ospm/acpisys.c b/reactos/drivers/bus/acpi/ospm/acpisys.c index a68c78f989b..182497ff39e 100644 --- a/reactos/drivers/bus/acpi/ospm/acpisys.c +++ b/reactos/drivers/bus/acpi/ospm/acpisys.c @@ -1,4 +1,4 @@ -/* $Id: acpisys.c,v 1.3 2001/08/23 17:32:04 chorns Exp $ +/* $Id: acpisys.c,v 1.4 2001/08/27 01:24:36 ekohl Exp $ * * PROJECT: ReactOS ACPI bus driver * FILE: acpi/ospm/acpisys.c @@ -114,6 +114,7 @@ ACPIPowerControl( NTSTATUS +STDCALL ACPIAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) @@ -151,7 +152,7 @@ ACPIAddDevice( NTSTATUS STDCALL DriverEntry( - IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { DbgPrint("Advanced Configuration and Power Interface Bus Driver\n"); diff --git a/reactos/drivers/bus/acpi/ospm/osl.c b/reactos/drivers/bus/acpi/ospm/osl.c index 980bf07769b..f46fd173236 100644 --- a/reactos/drivers/bus/acpi/ospm/osl.c +++ b/reactos/drivers/bus/acpi/ospm/osl.c @@ -37,7 +37,7 @@ static PVOID IVTVirtualAddress = NULL; static PVOID BDAVirtualAddress = NULL; -VOID +VOID STDCALL OslDpcStub( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -193,7 +193,7 @@ acpi_os_get_physical_address(void *virt, ACPI_PHYSICAL_ADDRESS *phys) return AE_OK; } -BOOLEAN +BOOLEAN STDCALL OslIsrStub( PKINTERRUPT Interrupt, PVOID ServiceContext) @@ -228,7 +228,7 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context) Status = IoConnectInterrupt( &AcpiInterrupt, - OslIsrStub, + OslIsrStub, NULL, NULL, Vector, diff --git a/reactos/drivers/bus/isapnp/isapnp.c b/reactos/drivers/bus/isapnp/isapnp.c index 225218e03ee..bdf2171b709 100644 --- a/reactos/drivers/bus/isapnp/isapnp.c +++ b/reactos/drivers/bus/isapnp/isapnp.c @@ -1,4 +1,4 @@ -/* $Id: isapnp.c,v 1.1 2001/05/01 23:00:05 chorns Exp $ +/* $Id: isapnp.c,v 1.2 2001/08/27 01:24:56 ekohl Exp $ * * PROJECT: ReactOS ISA PnP Bus driver * FILE: isapnp.c @@ -1656,6 +1656,7 @@ ISAPNPControl( NTSTATUS +STDCALL ISAPNPAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) diff --git a/reactos/drivers/dd/beep/beep.c b/reactos/drivers/dd/beep/beep.c index f887ff507ca..612b042e130 100644 --- a/reactos/drivers/dd/beep/beep.c +++ b/reactos/drivers/dd/beep/beep.c @@ -1,4 +1,4 @@ -/* $Id: beep.c,v 1.9 2001/08/05 21:48:25 ekohl Exp $ +/* $Id: beep.c,v 1.10 2001/08/27 01:25:17 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -33,7 +33,7 @@ typedef struct _BEEP_DEVICE_EXTENSION /* FUNCTIONS ***************************************************************/ -static VOID +static VOID STDCALL BeepDPC(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c index f951a09484c..81aaea4321e 100644 --- a/reactos/drivers/dd/blue/blue.c +++ b/reactos/drivers/dd/blue/blue.c @@ -1,4 +1,4 @@ -/* $Id: blue.c,v 1.30 2001/07/30 11:49:38 ea Exp $ +/* $Id: blue.c,v 1.31 2001/08/27 01:25:37 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -67,8 +67,9 @@ typedef struct _DEVICE_EXTENSION /* FUNCTIONS **************************************************************/ -NTSTATUS -STDCALL ScrCreate (PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTSTATUS STDCALL +ScrCreate(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PDEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS BaseAddress; @@ -156,8 +157,9 @@ STDCALL ScrCreate (PDEVICE_OBJECT DeviceObject, PIRP Irp) } -NTSTATUS -STDCALL ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTSTATUS STDCALL +ScrWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; @@ -281,8 +283,9 @@ STDCALL ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp) } -NTSTATUS -STDCALL ScrIoControl (PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTSTATUS STDCALL +ScrIoControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); PDEVICE_EXTENSION DeviceExtension; @@ -571,8 +574,9 @@ STDCALL ScrIoControl (PDEVICE_OBJECT DeviceObject, PIRP Irp) } -NTSTATUS -STDCALL ScrDispatch (PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTSTATUS STDCALL +ScrDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status; @@ -599,8 +603,7 @@ STDCALL ScrDispatch (PDEVICE_OBJECT DeviceObject, PIRP Irp) /* * Module entry point */ -NTSTATUS -STDCALL +NTSTATUS STDCALL DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; diff --git a/reactos/drivers/dd/floppy/dpc.c b/reactos/drivers/dd/floppy/dpc.c index b52989bece3..d36847b8b82 100644 --- a/reactos/drivers/dd/floppy/dpc.c +++ b/reactos/drivers/dd/floppy/dpc.c @@ -10,10 +10,11 @@ #include "floppy.h" -VOID FloppyDpc( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) +VOID STDCALL +FloppyDpc(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; @@ -24,30 +25,33 @@ VOID FloppyDpc( PKDPC Dpc, } -VOID FloppyDpcDetect( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) +VOID STDCALL +FloppyDpcDetect(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; KeSetEvent( &ControllerExtension->Event, 0, FALSE ); } -VOID FloppyDpcFailIrp( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) +VOID STDCALL +FloppyDpcFailIrp(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { Irp->IoStatus.Status = STATUS_DEVICE_NOT_READY; CHECKPOINT; IoCompleteRequest( Irp, 0 ); } -VOID FloppyMotorSpindownDpc( PKDPC Dpc, - PVOID Context, - PVOID Arg1, - PVOID Arg2 ) +VOID STDCALL +FloppyMotorSpindownDpc(PKDPC Dpc, + PVOID Context, + PVOID Arg1, + PVOID Arg2 ) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; @@ -60,10 +64,11 @@ VOID FloppyMotorSpindownDpc( PKDPC Dpc, ControllerExtension ); } -VOID FloppyMotorSpinupDpc( PKDPC Dpc, - PVOID Context, - PVOID Arg1, - PVOID Arg2 ) +VOID STDCALL +FloppyMotorSpinupDpc(PKDPC Dpc, + PVOID Context, + PVOID Arg1, + PVOID Arg2) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; @@ -85,10 +90,11 @@ VOID FloppyMotorSpinupDpc( PKDPC Dpc, ControllerExtension->Irp ); } -VOID FloppySeekDpc( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) +VOID STDCALL +FloppySeekDpc(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { PFLOPPY_DEVICE_EXTENSION DeviceExtension = (PFLOPPY_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)DeviceExtension->Controller->ControllerExtension; @@ -117,10 +123,11 @@ VOID FloppySeekDpc( PKDPC Dpc, IoFreeController( DeviceExtension->Controller ); } -VOID FloppyDpcReadWrite( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) +VOID STDCALL +FloppyDpcReadWrite(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; @@ -178,10 +185,12 @@ VOID FloppyDpcReadWrite( PKDPC Dpc, IoCompleteRequest( Irp, 0 ); } } -VOID FloppyDpcDetectMedia( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) + +VOID STDCALL +FloppyDpcDetectMedia(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)Context; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; diff --git a/reactos/drivers/dd/floppy/floppy.c b/reactos/drivers/dd/floppy/floppy.c index e3b0c4ae106..f6d4dcca05c 100644 --- a/reactos/drivers/dd/floppy/floppy.c +++ b/reactos/drivers/dd/floppy/floppy.c @@ -247,7 +247,7 @@ FloppyCreateController(PDRIVER_OBJECT DriverObject, return TRUE; devicecleanup: - IoDeleteDevice( DeviceObject ); + IoDeleteDevice( DeviceObject ); interruptcleanup: IoDisconnectInterrupt(ControllerExtension->Interrupt); controllercleanup: @@ -258,10 +258,11 @@ FloppyCreateController(PDRIVER_OBJECT DriverObject, return FALSE; } -IO_ALLOCATION_ACTION FloppyExecuteSpindown( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterbase, - PVOID Context ) +IO_ALLOCATION_ACTION STDCALL +FloppyExecuteSpindown(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterbase, + PVOID Context) { PFLOPPY_CONTROLLER_EXTENSION ControllerExtension= (PFLOPPY_CONTROLLER_EXTENSION)Context; @@ -273,10 +274,11 @@ IO_ALLOCATION_ACTION FloppyExecuteSpindown( PDEVICE_OBJECT DeviceObject, return DeallocateObject; } -IO_ALLOCATION_ACTION FloppyExecuteReadWrite( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterbase, - PVOID Context ) +IO_ALLOCATION_ACTION STDCALL +FloppyExecuteReadWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterbase, + PVOID Context) { PFLOPPY_DEVICE_EXTENSION DeviceExtension = (PFLOPPY_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)DeviceExtension->Controller->ControllerExtension; @@ -405,17 +407,19 @@ IO_ALLOCATION_ACTION FloppyExecuteReadWrite( PDEVICE_OBJECT DeviceObject, CHECKPOINT; // eventually, the FDC will interrupt and we will read results then return KeepObject; -} +} -NTSTATUS STDCALL FloppyDispatchOpenClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS STDCALL +FloppyDispatchOpenClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { DPRINT("FloppyDispatchOpenClose\n"); return STATUS_SUCCESS; } -NTSTATUS STDCALL FloppyDispatchReadWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS STDCALL +FloppyDispatchReadWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PFLOPPY_DEVICE_EXTENSION DeviceExtension = (PFLOPPY_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)DeviceExtension->Controller->ControllerExtension; @@ -449,10 +453,11 @@ NTSTATUS STDCALL FloppyDispatchReadWrite(PDEVICE_OBJECT DeviceObject, return STATUS_PENDING; } -IO_ALLOCATION_ACTION FloppyAdapterControl( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterBase, - PVOID Context ) +IO_ALLOCATION_ACTION STDCALL +FloppyAdapterControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterBase, + PVOID Context) { PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Context; @@ -463,8 +468,9 @@ IO_ALLOCATION_ACTION FloppyAdapterControl( PDEVICE_OBJECT DeviceObject, return KeepObject; } -NTSTATUS STDCALL FloppyDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS STDCALL +FloppyDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { DPRINT("FloppyDispatchDeviceControl\n"); return(STATUS_UNSUCCESSFUL); @@ -489,8 +495,9 @@ NTSTATUS STDCALL FloppyDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, * RETURNS: * NTSTATUS */ -NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) +NTSTATUS STDCALL +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { DbgPrint("Floppy driver\n"); diff --git a/reactos/drivers/dd/floppy/floppy.h b/reactos/drivers/dd/floppy/floppy.h index 96e07b50a09..4568c479b38 100644 --- a/reactos/drivers/dd/floppy/floppy.h +++ b/reactos/drivers/dd/floppy/floppy.h @@ -180,55 +180,65 @@ typedef struct _FLOPPY_CONTROLLER_PARAMETERS #define FLOPPY_MAX_CONTROLLERS 1 -VOID FloppyDpcDetectMedia( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ); -VOID FloppyDpcFailIrp( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, +VOID STDCALL +FloppyDpcDetectMedia(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); +VOID STDCALL +FloppyDpcFailIrp(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); + +IO_ALLOCATION_ACTION STDCALL +FloppyExecuteReadWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PVOID Context ); - -IO_ALLOCATION_ACTION FloppyExecuteReadWrite( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterbase, - PVOID Context ); - -IO_ALLOCATION_ACTION FloppyExecuteSpindown( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterbase, - PVOID Context ); - -VOID FloppyMotorSpinupDpc( PKDPC Dpc, - PVOID Context, - PVOID Arg1, - PVOID Arg2 ); - -VOID FloppySeekDpc( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ); - -VOID FloppyMotorSpindownDpc( PKDPC Dpc, - PVOID Context, - PVOID Arg1, - PVOID Arg2 ); - -VOID FloppyDpcDetect( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ); - -VOID FloppyDpcReadWrite( PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ); + PVOID MapRegisterbase, + PVOID Context); -VOID FloppyDpc( PKDPC Dpc, +IO_ALLOCATION_ACTION STDCALL +FloppyExecuteSpindown(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterbase, + PVOID Context); + +VOID STDCALL +FloppyMotorSpinupDpc(PKDPC Dpc, + PVOID Context, + PVOID Arg1, + PVOID Arg2); + +VOID STDCALL +FloppySeekDpc(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); + +VOID STDCALL +FloppyMotorSpindownDpc(PKDPC Dpc, + PVOID Context, + PVOID Arg1, + PVOID Arg2); + +VOID STDCALL +FloppyDpcDetect(PKDPC Dpc, PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ); +VOID STDCALL +FloppyDpcReadWrite(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); + +VOID STDCALL +FloppyDpc(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); + BOOLEAN FloppyIsrDetect( PCONTROLLER_OBJECT Controller ); BOOLEAN FloppyIsrReadWrite( PCONTROLLER_OBJECT Controller ); @@ -239,9 +249,12 @@ BOOLEAN FloppyIsrDetectMedia( PCONTROLLER_OBJECT Controller ); BOOLEAN FloppyIsrRecal( PCONTROLLER_OBJECT Controller ); -BOOLEAN FloppyIsr(PKINTERRUPT Interrupt, PVOID ServiceContext); +BOOLEAN STDCALL +FloppyIsr(PKINTERRUPT Interrupt, + PVOID ServiceContext); -IO_ALLOCATION_ACTION FloppyAdapterControl( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID MapRegisterBase, - PVOID Context ); +IO_ALLOCATION_ACTION STDCALL +FloppyAdapterControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterBase, + PVOID Context); diff --git a/reactos/drivers/dd/floppy/isr.c b/reactos/drivers/dd/floppy/isr.c index 4a7ed9a1c02..615f97b6825 100644 --- a/reactos/drivers/dd/floppy/isr.c +++ b/reactos/drivers/dd/floppy/isr.c @@ -157,7 +157,9 @@ BOOLEAN FloppyIsrReadWrite( PCONTROLLER_OBJECT Controller ) // actual ISR, passes controll to handler for current state in state machine -BOOLEAN FloppyIsr(PKINTERRUPT Interrupt, PVOID ServiceContext) +BOOLEAN STDCALL +FloppyIsr(PKINTERRUPT Interrupt, + PVOID ServiceContext) { PCONTROLLER_OBJECT Controller = (PCONTROLLER_OBJECT)ServiceContext; PFLOPPY_CONTROLLER_EXTENSION ControllerExtension = (PFLOPPY_CONTROLLER_EXTENSION)Controller->ControllerExtension; diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c index 65abbf1736c..ff921516670 100644 --- a/reactos/drivers/dd/ide/ide.c +++ b/reactos/drivers/dd/ide/ide.c @@ -1,4 +1,4 @@ -/* $Id: ide.c,v 1.43 2001/08/13 16:43:36 ekohl Exp $ +/* $Id: ide.c,v 1.44 2001/08/27 01:26:38 ekohl Exp $ * * IDE.C - IDE Disk driver * written by Rex Jolliff @@ -146,15 +146,24 @@ static BOOLEAN IDECreateDevices(IN PDRIVER_OBJECT DriverObject, static BOOLEAN IDEGetDriveIdentification(IN int CommandPort, IN int DriveNum, OUT PIDE_DRIVE_IDENTIFY DrvParms); -static NTSTATUS IDECreateDevice(IN PDRIVER_OBJECT DriverObject, +static NTSTATUS IDECreateDiskDevice(IN PDRIVER_OBJECT DriverObject, OUT PDEVICE_OBJECT *DeviceObject, IN PCONTROLLER_OBJECT ControllerObject, IN int UnitNumber, IN ULONG DiskNumber, IN PIDE_DRIVE_IDENTIFY DrvParms, - IN ULONG PartitionIdx, - IN ULONGLONG Offset, - IN ULONGLONG Size); + IN ULONG SectorCount); +static NTSTATUS IDECreatePartitionDevice(IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT *DeviceObject, + IN PCONTROLLER_OBJECT ControllerObject, + IN PVOID DiskDeviceExtension, + IN int UnitNumber, + IN ULONG DiskNumber, + IN PIDE_DRIVE_IDENTIFY DrvParms, + IN PPARTITION_INFORMATION PartitionInfo); +// IN ULONG PartitionIdx, +// IN ULONGLONG Offset, +// IN ULONGLONG Size); static int IDEPolledRead(IN WORD Address, IN BYTE PreComp, IN BYTE SectorCnt, @@ -168,19 +177,21 @@ static NTSTATUS STDCALL IDEDispatchOpenClose(IN PDEVICE_OBJECT pDO, IN PIRP Irp) static NTSTATUS STDCALL IDEDispatchReadWrite(IN PDEVICE_OBJECT pDO, IN PIRP Irp); static NTSTATUS STDCALL IDEDispatchDeviceControl(IN PDEVICE_OBJECT pDO, IN PIRP Irp); static VOID STDCALL IDEStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -static IO_ALLOCATION_ACTION IDEAllocateController(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID MapRegisterBase, - IN PVOID Ccontext); -static BOOLEAN IDEStartController(IN OUT PVOID Context); +static IO_ALLOCATION_ACTION STDCALL +IDEAllocateController(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Ccontext); +static BOOLEAN STDCALL +IDEStartController(IN OUT PVOID Context); VOID IDEBeginControllerReset(PIDE_CONTROLLER_EXTENSION ControllerExtension); -static BOOLEAN IDEIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); +static BOOLEAN STDCALL IDEIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); static VOID IDEDpcForIsr(IN PKDPC Dpc, IN PDEVICE_OBJECT DpcDeviceObject, IN PIRP DpcIrp, IN PVOID DpcContext); static VOID IDEFinishOperation(PIDE_CONTROLLER_EXTENSION ControllerExtension); -static VOID IDEIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); +static VOID STDCALL IDEIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); // ---------------------------------------------------------------- Inlines @@ -467,7 +478,7 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT DiskDeviceObject; PDEVICE_OBJECT PartitionDeviceObject; PIDE_DEVICE_EXTENSION DiskDeviceExtension; - PIDE_DEVICE_EXTENSION PartitionDeviceExtension; +// PIDE_DEVICE_EXTENSION PartitionDeviceExtension; UNICODE_STRING UnicodeDeviceDirName; OBJECT_ATTRIBUTES DeviceDirAttributes; HANDLE Handle; @@ -524,15 +535,13 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, } DPRINT("SectorCount %lu\n", SectorCount); - Status = IDECreateDevice(DriverObject, - &DiskDeviceObject, - ControllerObject, - DriveIdx, - HarddiskIdx, - &DrvParms, - 0, - 0, - SectorCount); + Status = IDECreateDiskDevice(DriverObject, + &DiskDeviceObject, + ControllerObject, + DriveIdx, + HarddiskIdx, + &DrvParms, + SectorCount); if (!NT_SUCCESS(Status)) { DbgPrint("IDECreateDevice call failed for raw device\n"); @@ -543,8 +552,8 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, IoGetConfigurationInformation()->DiskCount++; /* Initialize device extension for the disk device */ - DiskDeviceExtension = (PIDE_DEVICE_EXTENSION)DiskDeviceObject->DeviceExtension; - DiskDeviceExtension->DiskExtension = (PVOID)DiskDeviceExtension; +// DiskDeviceExtension = (PIDE_DEVICE_EXTENSION)DiskDeviceObject->DeviceExtension; +// DiskDeviceExtension->DiskExtension = (PVOID)DiskDeviceExtension; /* * Initialize the controller timer here @@ -587,15 +596,17 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, PartitionEntry->PartitionLength.QuadPart / 512 /* DrvParms.BytesPerSector*/); /* Create device for partition */ - Status = IDECreateDevice(DriverObject, - &PartitionDeviceObject, - ControllerObject, - DriveIdx, - HarddiskIdx, - &DrvParms, - PartitionEntry->PartitionNumber, - PartitionEntry->StartingOffset.QuadPart / 512 /* DrvParms.BytesPerSector*/, - PartitionEntry->PartitionLength.QuadPart / 512 /*DrvParms.BytesPerSector*/); + Status = IDECreatePartitionDevice(DriverObject, + &PartitionDeviceObject, + ControllerObject, + DiskDeviceObject->DeviceExtension, //DiskDeviceExtension, + DriveIdx, + HarddiskIdx, + &DrvParms, + PartitionEntry); +// PartitionEntry->PartitionNumber, +// PartitionEntry->StartingOffset.QuadPart / 512 /* DrvParms.BytesPerSector*/, +// PartitionEntry->PartitionLength.QuadPart / 512 /*DrvParms.BytesPerSector*/); if (!NT_SUCCESS(Status)) { DbgPrint("IDECreateDevice() failed\n"); @@ -603,8 +614,8 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, } /* Initialize pointer to disk device extension */ - PartitionDeviceExtension = (PIDE_DEVICE_EXTENSION)PartitionDeviceObject->DeviceExtension; - PartitionDeviceExtension->DiskExtension = (PVOID)DiskDeviceExtension; +// PartitionDeviceExtension = (PIDE_DEVICE_EXTENSION)PartitionDeviceObject->DeviceExtension; +// PartitionDeviceExtension->DiskExtension = (PVOID)DiskDeviceExtension; } if (PartitionList != NULL) @@ -686,7 +697,118 @@ IDEGetDriveIdentification(IN int CommandPort, } -// IDECreateDevice +// IDECreateDiskDevice +// +// DESCRIPTION: +// Creates a device by calling IoCreateDevice and a sylbolic link for Win32 +// +// RUN LEVEL: +// PASSIVE_LEVEL +// +// ARGUMENTS: +// IN PDRIVER_OBJECT DriverObject The system supplied driver object +// OUT PDEVICE_OBJECT *DeviceObject The created device object +// IN PCONTROLLER_OBJECT ControllerObject The Controller for the device +// IN BOOLEAN LBASupported Does the drive support LBA addressing? +// IN BOOLEAN DMASupported Does the drive support DMA? +// IN int SectorsPerLogCyl Sectors per cylinder +// IN int SectorsPerLogTrk Sectors per track +// IN DWORD Offset First valid sector for this device +// IN DWORD Size Count of valid sectors for this device +// +// RETURNS: +// NTSTATUS +// + +NTSTATUS +IDECreateDiskDevice(IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT *DeviceObject, + IN PCONTROLLER_OBJECT ControllerObject, + IN int UnitNumber, + IN ULONG DiskNumber, + IN PIDE_DRIVE_IDENTIFY DrvParms, + IN ULONG SectorCount) +{ + WCHAR NameBuffer[IDE_MAX_NAME_LENGTH]; + WCHAR ArcNameBuffer[IDE_MAX_NAME_LENGTH + 15]; + UNICODE_STRING DeviceName; + UNICODE_STRING ArcName; + NTSTATUS RC; + PIDE_DEVICE_EXTENSION DeviceExtension; + + // Create a unicode device name + swprintf(NameBuffer, + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + RtlInitUnicodeString(&DeviceName, + NameBuffer); + + // Create the device + RC = IoCreateDevice(DriverObject, + sizeof(IDE_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_DISK, + 0, + TRUE, + DeviceObject); + if (!NT_SUCCESS(RC)) + { + DbgPrint ("IoCreateDevice call failed\n"); + return RC; + } + + // Set the buffering strategy here... + (*DeviceObject)->Flags |= DO_DIRECT_IO; + (*DeviceObject)->AlignmentRequirement = FILE_WORD_ALIGNMENT; + + // Fill out Device extension data + DeviceExtension = (PIDE_DEVICE_EXTENSION) (*DeviceObject)->DeviceExtension; + DeviceExtension->DeviceObject = (*DeviceObject); + DeviceExtension->ControllerObject = ControllerObject; + DeviceExtension->DiskDeviceExtension = DeviceExtension; + DeviceExtension->UnitNumber = UnitNumber; + DeviceExtension->LBASupported = + (DrvParms->Capabilities & IDE_DRID_LBA_SUPPORTED) ? 1 : 0; + DeviceExtension->DMASupported = + (DrvParms->Capabilities & IDE_DRID_DMA_SUPPORTED) ? 1 : 0; + // FIXME: deal with bizarre sector sizes + DeviceExtension->BytesPerSector = 512 /* DrvParms->BytesPerSector */; + DeviceExtension->SectorsPerLogCyl = DrvParms->LogicalHeads * + DrvParms->SectorsPerTrack; + DeviceExtension->SectorsPerLogTrk = DrvParms->SectorsPerTrack; + DeviceExtension->LogicalHeads = DrvParms->LogicalHeads; + DeviceExtension->LogicalCylinders = + (DrvParms->Capabilities & IDE_DRID_LBA_SUPPORTED) ? DrvParms->TMCylinders : DrvParms->LogicalCyls; + DeviceExtension->Offset = 0; + DeviceExtension->Size = SectorCount; + DPRINT("%wZ: offset %lu size %lu \n", + &DeviceName, + DeviceExtension->Offset, + DeviceExtension->Size); + + /* Initialize the DPC object here */ + IoInitializeDpcRequest(*DeviceObject, + IDEDpcForIsr); + + /* assign arc name */ + swprintf(ArcNameBuffer, + L"\\ArcName\\multi(0)disk(0)rdisk(%d)", + DiskNumber); + RtlInitUnicodeString(&ArcName, + ArcNameBuffer); + DPRINT("%wZ ==> %wZ\n", &ArcName, &DeviceName); + RC = IoAssignArcName(&ArcName, + &DeviceName); + if (!NT_SUCCESS(RC)) + { + DbgPrint("IoAssignArcName (%wZ) failed (Status %x)\n", &ArcName, RC); + } + + return RC; +} + + +// IDECreatePartitionDevice // // DESCRIPTION: // Creates a device by calling IoCreateDevice and a sylbolic link for Win32 @@ -710,15 +832,17 @@ IDEGetDriveIdentification(IN int CommandPort, // NTSTATUS -IDECreateDevice(IN PDRIVER_OBJECT DriverObject, - OUT PDEVICE_OBJECT *DeviceObject, - IN PCONTROLLER_OBJECT ControllerObject, - IN int UnitNumber, - IN ULONG DiskNumber, - IN PIDE_DRIVE_IDENTIFY DrvParms, - IN ULONG PartitionNumber, - IN ULONGLONG Offset, - IN ULONGLONG Size) +IDECreatePartitionDevice(IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT *DeviceObject, + IN PCONTROLLER_OBJECT ControllerObject, + IN PVOID DiskDeviceExtension, + IN int UnitNumber, + IN ULONG DiskNumber, + IN PIDE_DRIVE_IDENTIFY DrvParms, + IN PPARTITION_INFORMATION PartitionInfo) +// IN ULONG PartitionNumber, +// IN ULONGLONG Offset, +// IN ULONGLONG Size) { WCHAR NameBuffer[IDE_MAX_NAME_LENGTH]; WCHAR ArcNameBuffer[IDE_MAX_NAME_LENGTH + 15]; @@ -731,7 +855,7 @@ IDECreateDevice(IN PDRIVER_OBJECT DriverObject, swprintf(NameBuffer, L"\\Device\\Harddisk%d\\Partition%d", DiskNumber, - PartitionNumber); + PartitionInfo->PartitionNumber); RtlInitUnicodeString(&DeviceName, NameBuffer); @@ -752,7 +876,7 @@ IDECreateDevice(IN PDRIVER_OBJECT DriverObject, DeviceExtension = (PIDE_DEVICE_EXTENSION) (*DeviceObject)->DeviceExtension; DeviceExtension->DeviceObject = (*DeviceObject); DeviceExtension->ControllerObject = ControllerObject; - DeviceExtension->DiskExtension = NULL; + DeviceExtension->DiskDeviceExtension = DiskDeviceExtension; DeviceExtension->UnitNumber = UnitNumber; DeviceExtension->LBASupported = (DrvParms->Capabilities & IDE_DRID_LBA_SUPPORTED) ? 1 : 0; @@ -766,43 +890,35 @@ IDECreateDevice(IN PDRIVER_OBJECT DriverObject, DeviceExtension->LogicalHeads = DrvParms->LogicalHeads; DeviceExtension->LogicalCylinders = (DrvParms->Capabilities & IDE_DRID_LBA_SUPPORTED) ? DrvParms->TMCylinders : DrvParms->LogicalCyls; - DeviceExtension->Offset = Offset; - DeviceExtension->Size = Size; +// DeviceExtension->Offset = Offset; +// DeviceExtension->Size = Size; + + DeviceExtension->Offset = PartitionInfo->StartingOffset.QuadPart / 512; /* DrvParms.BytesPerSector*/ + DeviceExtension->Size = PartitionInfo->PartitionLength.QuadPart / 512; /*DrvParms.BytesPerSector*/ + DPRINT("%wZ: offset %lu size %lu \n", &DeviceName, DeviceExtension->Offset, DeviceExtension->Size); - // Initialize the DPC object here + /* Initialize the DPC object here */ IoInitializeDpcRequest(*DeviceObject, IDEDpcForIsr); - if (PartitionNumber != 0) - { - DbgPrint("%wZ %luMB\n", &DeviceName, Size / 2048); - } + DbgPrint("%wZ %luMB\n", &DeviceName, DeviceExtension->Size / 2048); /* assign arc name */ - if (PartitionNumber == 0) - { - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)rdisk(%d)", - DiskNumber); - } - else - { - swprintf(ArcNameBuffer, - L"\\ArcName\\multi(0)disk(0)rdisk(%d)partition(%d)", - DiskNumber, - PartitionNumber); - } - RtlInitUnicodeString (&ArcName, - ArcNameBuffer); + swprintf(ArcNameBuffer, + L"\\ArcName\\multi(0)disk(0)rdisk(%d)partition(%d)", + DiskNumber, + PartitionInfo->PartitionNumber); + RtlInitUnicodeString(&ArcName, + ArcNameBuffer); DPRINT("%wZ ==> %wZ\n", &ArcName, &DeviceName); - RC = IoAssignArcName (&ArcName, - &DeviceName); + RC = IoAssignArcName(&ArcName, + &DeviceName); if (!NT_SUCCESS(RC)) { - DbgPrint ("IoAssignArcName (%wZ) failed (Status %x)\n", &ArcName, RC); + DbgPrint("IoAssignArcName (%wZ) failed (Status %x)\n", &ArcName, RC); } return RC; @@ -1098,7 +1214,7 @@ IDEDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, InputLength = IrpStack->Parameters.DeviceIoControl.InputBufferLength; OutputLength = IrpStack->Parameters.DeviceIoControl.OutputBufferLength; DeviceExtension = (PIDE_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - DiskDeviceExtension = (PIDE_DEVICE_EXTENSION)DeviceExtension->DiskExtension; + DiskDeviceExtension = (PIDE_DEVICE_EXTENSION)DeviceExtension->DiskDeviceExtension; Increment = IO_NO_INCREMENT; // A huge switch statement in a Windows program?! who would have thought? @@ -1117,8 +1233,8 @@ IDEDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, Geometry->MediaType = FixedMedia; Geometry->Cylinders.QuadPart = DiskDeviceExtension->LogicalCylinders; - Geometry->TracksPerCylinder = DiskDeviceExtension->SectorsPerLogTrk / - DiskDeviceExtension->SectorsPerLogCyl; + Geometry->TracksPerCylinder = DiskDeviceExtension->SectorsPerLogCyl / + DiskDeviceExtension->SectorsPerLogTrk; Geometry->SectorsPerTrack = DiskDeviceExtension->SectorsPerLogTrk; Geometry->BytesPerSector = DiskDeviceExtension->BytesPerSector; @@ -1278,7 +1394,7 @@ STDCALL IDEStartIo(IN PDEVICE_OBJECT DeviceObject, // IDEAllocateController -static IO_ALLOCATION_ACTION +static IO_ALLOCATION_ACTION STDCALL IDEAllocateController(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -1300,8 +1416,8 @@ IDEAllocateController(IN PDEVICE_OBJECT DeviceObject, // IDEStartController -BOOLEAN -IDEStartController(IN OUT PVOID Context) +BOOLEAN STDCALL +IDEStartController(IN OUT PVOID Context) { BYTE SectorCnt, SectorNum, CylinderLow, CylinderHigh; BYTE DrvHead, Command; @@ -1550,9 +1666,9 @@ IDEBeginControllerReset(PIDE_CONTROLLER_EXTENSION ControllerExtension) // TRUE This ISR handled the interrupt // FALSE Another ISR must handle this interrupt -static BOOLEAN -IDEIsr(IN PKINTERRUPT Interrupt, - IN PVOID ServiceContext) +static BOOLEAN STDCALL +IDEIsr(IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) { BOOLEAN IsLastBlock, AnErrorOccured, RequestIsComplete; BYTE *TargetAddress; @@ -1853,9 +1969,9 @@ IDEFinishOperation(PIDE_CONTROLLER_EXTENSION ControllerExtension) // IN PVOID Context the Controller extension for the // controller the device is on // -static VOID -IDEIoTimer(PDEVICE_OBJECT DeviceObject, - PVOID Context) +static VOID STDCALL +IDEIoTimer(PDEVICE_OBJECT DeviceObject, + PVOID Context) { PIDE_CONTROLLER_EXTENSION ControllerExtension; diff --git a/reactos/drivers/dd/ide/ide.h b/reactos/drivers/dd/ide/ide.h index 81fbc2a3c62..1277ecf1261 100644 --- a/reactos/drivers/dd/ide/ide.h +++ b/reactos/drivers/dd/ide/ide.h @@ -130,7 +130,7 @@ typedef struct _IDE_DEVICE_EXTENSION { PDEVICE_OBJECT DeviceObject; PCONTROLLER_OBJECT ControllerObject; - struct _IDE_DEVICE_EXTESION *DiskExtension; + PVOID DiskDeviceExtension; int UnitNumber; BOOLEAN LBASupported; BOOLEAN DMASupported; diff --git a/reactos/drivers/input/keyboard/keyboard.c b/reactos/drivers/input/keyboard/keyboard.c index e47abfb03b5..f80785a9fec 100644 --- a/reactos/drivers/input/keyboard/keyboard.c +++ b/reactos/drivers/input/keyboard/keyboard.c @@ -407,10 +407,11 @@ static WORD ScanToVirtual(BYTE scanCode) * Keyboard IRQ handler */ -static VOID KbdDpcRoutine(PKDPC Dpc, - PVOID DeferredContext, - PVOID SystemArgument1, - PVOID SystemArgument2) +static VOID STDCALL +KbdDpcRoutine(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) { PIRP Irp = (PIRP)SystemArgument2; PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)SystemArgument1; @@ -431,7 +432,9 @@ static VOID KbdDpcRoutine(PKDPC Dpc, IoStartNextPacket(DeviceObject,FALSE); } -static BOOLEAN KeyboardHandler(PKINTERRUPT Interrupt, PVOID Context) +static BOOLEAN STDCALL +KeyboardHandler(PKINTERRUPT Interrupt, + PVOID Context) { BYTE thisKey; BOOL isDown; @@ -634,7 +637,8 @@ static int InitializeKeyboard(void) /* * Read data from keyboard buffer */ -BOOLEAN KbdSynchronizeRoutine(PVOID Context) +BOOLEAN STDCALL +KbdSynchronizeRoutine(PVOID Context) { PIRP Irp = (PIRP)Context; KEY_EVENT_RECORD* rec = (KEY_EVENT_RECORD *)Irp->AssociatedIrp.SystemBuffer; diff --git a/reactos/drivers/input/psaux/mouse.c b/reactos/drivers/input/psaux/mouse.c index 41c408564dc..47c06ba5852 100644 --- a/reactos/drivers/input/psaux/mouse.c +++ b/reactos/drivers/input/psaux/mouse.c @@ -16,7 +16,8 @@ int mouse_replies_expected = 0; // Handle a mouse event -BOOLEAN ps2_mouse_handler(PKINTERRUPT Interrupt, PVOID ServiceContext) +BOOLEAN STDCALL +ps2_mouse_handler(PKINTERRUPT Interrupt, PVOID ServiceContext) { // char tmpstr[100]; PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)ServiceContext; diff --git a/reactos/drivers/input/psaux/psaux.c b/reactos/drivers/input/psaux/psaux.c index 0352b06164d..290a77c57f1 100644 --- a/reactos/drivers/input/psaux/psaux.c +++ b/reactos/drivers/input/psaux/psaux.c @@ -16,7 +16,8 @@ #include "mouse.h" #include "psaux.h" -BOOLEAN MouseSynchronizeRoutine(PVOID Context) +BOOLEAN STDCALL +MouseSynchronizeRoutine(PVOID Context) { PIRP Irp = (PIRP)Context; PMOUSE_INPUT_DATA rec = (PMOUSE_INPUT_DATA)Irp->AssociatedIrp.SystemBuffer; diff --git a/reactos/drivers/net/ndis/ndis/io.c b/reactos/drivers/net/ndis/ndis/io.c index 95fac28bbd9..8ba5b984297 100644 --- a/reactos/drivers/net/ndis/ndis/io.c +++ b/reactos/drivers/net/ndis/ndis/io.c @@ -11,7 +11,7 @@ #include -VOID HandleDeferredProcessing( +VOID STDCALL HandleDeferredProcessing( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -51,7 +51,7 @@ VOID HandleDeferredProcessing( } -BOOLEAN ServiceRoutine( +BOOLEAN STDCALL ServiceRoutine( IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) /* diff --git a/reactos/drivers/net/ndis/ndis/miniport.c b/reactos/drivers/net/ndis/ndis/miniport.c index 3452248ae6f..23cbcac5fd7 100644 --- a/reactos/drivers/net/ndis/ndis/miniport.c +++ b/reactos/drivers/net/ndis/ndis/miniport.c @@ -613,7 +613,7 @@ MiniDoRequest( } -VOID MiniportDpc( +VOID STDCALL MiniportDpc( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, diff --git a/reactos/drivers/net/tcpip/include/ip.h b/reactos/drivers/net/tcpip/include/ip.h index 31b75dca577..7c8be7189a4 100644 --- a/reactos/drivers/net/tcpip/include/ip.h +++ b/reactos/drivers/net/tcpip/include/ip.h @@ -240,7 +240,7 @@ PADDRESS_ENTRY IPLocateADE( PADDRESS_ENTRY IPGetDefaultADE( UINT AddressType); -VOID IPTimeout( +VOID STDCALL IPTimeout( PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, diff --git a/reactos/drivers/net/tcpip/network/ip.c b/reactos/drivers/net/tcpip/network/ip.c index 0e84da910e3..4e7fcebfbdb 100644 --- a/reactos/drivers/net/tcpip/network/ip.c +++ b/reactos/drivers/net/tcpip/network/ip.c @@ -699,7 +699,7 @@ PADDRESS_ENTRY IPGetDefaultADE( } -VOID IPTimeout( +VOID STDCALL IPTimeout( PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, diff --git a/reactos/hal/halx86/include/bus.h b/reactos/hal/halx86/include/bus.h index 5fb87c56bac..b8ed58d85ea 100644 --- a/reactos/hal/halx86/include/bus.h +++ b/reactos/hal/halx86/include/bus.h @@ -5,66 +5,60 @@ #ifndef __INTERNAL_HAL_BUS_H #define __INTERNAL_HAL_BUS_H -struct _BUS_HANDLER; - -typedef NTSTATUS (STDCALL *pAdjustResourceList) ( - IN struct _BUS_HANDLER *BusHandler, - IN ULONG BusNumber, - IN OUT PCM_RESOURCE_LIST Resources - ); - -typedef NTSTATUS (STDCALL *pAssignSlotResources) ( - IN struct _BUS_HANDLER *BusHandler, - IN ULONG BusNumber, - IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources - ); - -typedef ULONG (STDCALL *pGetSetBusData) ( - IN struct _BUS_HANDLER *BusHandler, - IN ULONG BusNumber, - IN ULONG SlotNumber, - OUT PVOID Buffer, - IN ULONG Offset, - IN ULONG Length - ); - -typedef ULONG (STDCALL *pGetInterruptVector) ( - IN struct _BUS_HANDLER *BusHandler, - IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity - ); - -typedef ULONG (STDCALL *pTranslateBusAddress) ( - IN struct _BUS_HANDLER *BusHandler, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress - ); + +typedef NTSTATUS STDCALL +(*pAdjustResourceList)(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN OUT PCM_RESOURCE_LIST Resources); + +typedef NTSTATUS STDCALL +(*pAssignSlotResources)(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING DriverClassName, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SlotNumber, + IN OUT PCM_RESOURCE_LIST *AllocatedResources); + +typedef ULONG STDCALL +(*pGetSetBusData)(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN ULONG SlotNumber, + OUT PVOID Buffer, + IN ULONG Offset, + IN ULONG Length); + +typedef ULONG STDCALL +(*pGetInterruptVector)(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN ULONG BusInterruptLevel, + IN ULONG BusInterruptVector, + OUT PKIRQL Irql, + OUT PKAFFINITY Affinity); + +typedef ULONG STDCALL +(*pTranslateBusAddress)(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress); typedef struct _BUS_HANDLER { - LIST_ENTRY Entry; - INTERFACE_TYPE InterfaceType; - BUS_DATA_TYPE BusDataType; - ULONG BusNumber; - ULONG RefCount; - - pGetSetBusData GetBusData; - pGetSetBusData SetBusData; - pAdjustResourceList AdjustResourceList; - pAssignSlotResources AssignSlotResources; - pGetInterruptVector GetInterruptVector; - pTranslateBusAddress TranslateBusAddress; -} BUS_HANDLER, *PBUS_HANDLER; + LIST_ENTRY Entry; + INTERFACE_TYPE InterfaceType; + BUS_DATA_TYPE BusDataType; + ULONG BusNumber; + ULONG RefCount; + + pGetSetBusData GetBusData; + pGetSetBusData SetBusData; + pAdjustResourceList AdjustResourceList; + pAssignSlotResources AssignSlotResources; + pGetInterruptVector GetInterruptVector; + pTranslateBusAddress TranslateBusAddress; +} BUS_HANDLER; /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/kdbg.c b/reactos/hal/halx86/kdbg.c index bcb0bc71120..1f3ea8b67bd 100644 --- a/reactos/hal/halx86/kdbg.c +++ b/reactos/hal/halx86/kdbg.c @@ -1,4 +1,4 @@ -/* $Id: kdbg.c,v 1.1 2001/08/21 20:18:27 chorns Exp $ +/* $Id: kdbg.c,v 1.2 2001/08/27 01:23:50 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -57,9 +57,7 @@ /* GLOBAL VARIABLES *********************************************************/ -ULONG -__declspec(dllexport) -KdComPortInUse = 0; /* EXPORTED */ +ULONG EXPORTED KdComPortInUse = 0; /* STATIC VARIABLES *********************************************************/ diff --git a/reactos/include/ddk/halddk.h b/reactos/include/ddk/halddk.h deleted file mode 100644 index 451ad310209..00000000000 --- a/reactos/include/ddk/halddk.h +++ /dev/null @@ -1,707 +0,0 @@ -/* $Id: halddk.h,v 1.10 2001/08/21 20:13:05 chorns Exp $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/hal/ddk.h - * PURPOSE: HAL provided defintions for device drivers - * PROGRAMMER: David Welch (welch@mcmail.com) - * REVISION HISTORY: - * 23/06/98: Taken from linux system.h - */ - - -#ifndef __INCLUDE_DDK_HALDDK_H -#define __INCLUDE_DDK_HALDDK_H - -/* HalReturnToFirmware */ -#define FIRMWARE_HALT 1 -#define FIRMWARE_REBOOT 3 - - -enum -{ - DEVICE_DESCRIPTION_VERSION, - DEVICE_DESCRIPTION_VERSION1, -}; - -typedef ULONG DMA_WIDTH; -typedef ULONG DMA_SPEED; - -/* - * PURPOSE: Types for HalGetBusData - */ -typedef enum _BUS_DATA_TYPE -{ - ConfigurationSpaceUndefined = -1, - Cmos, - EisaConfiguration, - Pos, - CbusConfiguration, - PCIConfiguration, - VMEConfiguration, - NuBusConfiguration, - PCMCIAConfiguration, - MPIConfiguration, - MPSAConfiguration, - PNPISAConfiguration, - MaximumBusDataType, -} BUS_DATA_TYPE, *PBUS_DATA_TYPE; - -typedef struct _DEVICE_DESCRIPTION -{ - ULONG Version; - BOOLEAN Master; - BOOLEAN ScatterGather; - BOOLEAN DemandMode; - BOOLEAN AutoInitialize; - BOOLEAN Dma32BitAddress; - BOOLEAN IgnoreCount; - BOOLEAN Reserved1; - BOOLEAN Reserved2; - ULONG BusNumber; - ULONG DmaChannel; - INTERFACE_TYPE InterfaceType; - DMA_WIDTH DmaWidth; - DMA_SPEED DmaSpeed; - ULONG MaximumLength; - ULONG DmaPort; -} DEVICE_DESCRIPTION, *PDEVICE_DESCRIPTION; - -typedef BOOLEAN (*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); - -/* Hal dispatch table */ - -typedef enum _HAL_QUERY_INFORMATION_CLASS -{ - HalInstalledBusInformation, - HalProfileSourceInformation, - HalSystemDockInformation, - HalPowerInformation, - HalProcessorSpeedInformation, - HalCallbackInformation, - HalMapRegisterInformation, - HalMcaLogInformation, - HalFrameBufferCachingInformation, - HalDisplayBiosInformation - /* information levels >= 0x8000000 reserved for OEM use */ -} HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; - - -typedef enum _HAL_SET_INFORMATION_CLASS -{ - HalProfileSourceInterval, - HalProfileSourceInterruptHandler, - HalMcaRegisterDriver -} HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; - - -typedef -NTSTATUS -(*pHalQuerySystemInformation) ( - IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength - ); - - -typedef -NTSTATUS -(*pHalSetSystemInformation) ( - IN HAL_SET_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN PVOID Buffer - ); - - -typedef -NTSTATUS -(*pHalQueryBusSlots) ( -// IN PBUS_HANDLER BusHandler, - IN PVOID BusHandler, - IN ULONG BufferSize, - OUT PULONG SlotNumbers, - OUT PULONG ReturnedLength - ); - - -/* Control codes of HalDeviceControl function */ -#define BCTL_EJECT 0x0001 -#define BCTL_QUERY_DEVICE_ID 0x0002 -#define BCTL_QUERY_DEVICE_UNIQUE_ID 0x0003 -#define BCTL_QUERY_DEVICE_CAPABILITIES 0x0004 -#define BCTL_QUERY_DEVICE_RESOURCES 0x0005 -#define BCTL_QUERY_DEVICE_RESOURCE_REQUIREMENTS 0x0006 -#define BCTL_QUERY_EJECT 0x0007 -#define BCTL_SET_LOCK 0x0008 -#define BCTL_SET_POWER 0x0009 -#define BCTL_SET_RESUME 0x000A -#define BCTL_SET_DEVICE_RESOURCES 0x000B - -/* Defines for BCTL structures */ -typedef struct -{ - BOOLEAN PowerSupported; - BOOLEAN ResumeSupported; - BOOLEAN LockSupported; - BOOLEAN EjectSupported; - BOOLEAN Removable; -} BCTL_DEVICE_CAPABILITIES, *PBCTL_DEVICE_CAPABILITIES; - - -typedef struct _DEVICE_CONTROL_CONTEXT -{ - NTSTATUS Status; -// PDEVICE_HANDLER_OBJECT DeviceHandler; - PVOID DeviceHandler; - PDEVICE_OBJECT DeviceObject; - ULONG ControlCode; - PVOID Buffer; - PULONG BufferLength; - PVOID Context; -} DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; - - -typedef -VOID -(*PDEVICE_CONTROL_COMPLETION) ( - IN PDEVICE_CONTROL_CONTEXT ControlContext - ); - - -typedef -NTSTATUS -(*pHalDeviceControl) ( -// IN PDEVICE_HANDLER_OBJECT DeviceHandler, - IN PVOID DeviceHandler, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN OUT PVOID Buffer OPTIONAL, - IN OUT PULONG BufferLength OPTIONAL, - IN PVOID Context, - IN PDEVICE_CONTROL_COMPLETION CompletionRoutine - ); - - -typedef -VOID -(FASTCALL *pHalExamineMBR) ( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID * Buffer - ); - -typedef -VOID -(FASTCALL *pHalIoAssignDriveLetters) ( - IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString - ); - -typedef -NTSTATUS -(FASTCALL *pHalIoReadPartitionTable) ( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION * PartitionBuffer - ); - -typedef -NTSTATUS -(FASTCALL *pHalIoSetPartitionInformation) ( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType - ); - -typedef -NTSTATUS -(FASTCALL *pHalIoWritePartitionTable) ( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer - ); - -typedef -//PBUS_HANDLER -PVOID -(FASTCALL *pHalHandlerForBus) ( - IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber - ); - -typedef -VOID -(FASTCALL *pHalReferenceBusHandler) ( -// IN PBUS_HANDLER BusHandler - IN PVOID BusHandler - ); - -typedef struct _HAL_DISPATCH -{ - ULONG Version; - pHalQuerySystemInformation HalQuerySystemInformation; - pHalSetSystemInformation HalSetSystemInformation; - pHalQueryBusSlots HalQueryBusSlots; - pHalDeviceControl HalDeviceControl; - pHalExamineMBR HalExamineMBR; - pHalIoAssignDriveLetters HalIoAssignDriveLetters; - pHalIoReadPartitionTable HalIoReadPartitionTable; - pHalIoSetPartitionInformation HalIoSetPartitionInformation; - pHalIoWritePartitionTable HalIoWritePartitionTable; - pHalHandlerForBus HalReferenceHandlerForBus; - pHalReferenceBusHandler HalReferenceBusHandler; - pHalReferenceBusHandler HalDereferenceBusHandler; -} HAL_DISPATCH, *PHAL_DISPATCH; - -#define HAL_DISPATCH_VERSION 1 - -#ifdef __NTOSKRNL__ -extern HAL_DISPATCH EXPORTED HalDispatchTable; -#else -extern HAL_DISPATCH IMPORTED HalDispatchTable; -#endif - - -/* Hal private dispatch table */ - -typedef struct _HAL_PRIVATE_DISPATCH -{ - ULONG Version; - - -} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; - -#define HAL_PRIVATE_DISPATCH_VERSION 1 - -#ifdef __NTOSKRNL__ -extern HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable; -#else -extern HAL_PRIVATE_DISPATCH IMPORTED HalPrivateDispatchTable; -#endif - - -VOID -STDCALL -HalAcquireDisplayOwnership ( - PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters - ); - -NTSTATUS -STDCALL -HalAdjustResourceList ( - PCM_RESOURCE_LIST Resources - ); - -NTSTATUS -STDCALL -HalAllocateAdapterChannel ( - IN PADAPTER_OBJECT AdapterObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context - ); - -PVOID -STDCALL -HalAllocateCommonBuffer ( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PPHYSICAL_ADDRESS LogicalAddress, - BOOLEAN CacheEnabled - ); - -PVOID -STDCALL -HalAllocateCrashDumpRegisters ( - IN PADAPTER_OBJECT AdapterObject, - IN OUT PULONG NumberOfMapRegisters - ); - -BOOLEAN -STDCALL -HalAllProcessorsStarted ( - VOID - ); - -NTSTATUS -STDCALL -HalAssignSlotResources ( - PUNICODE_STRING RegistryPath, - PUNICODE_STRING DriverClassName, - PDRIVER_OBJECT DriverObject, - PDEVICE_OBJECT DeviceObject, - INTERFACE_TYPE BusType, - ULONG BusNumber, - ULONG SlotNumber, - PCM_RESOURCE_LIST *AllocatedResources - ); - -BOOLEAN STDCALL HalBeginSystemInterrupt (ULONG Vector, - KIRQL Irql, - PKIRQL OldIrql); - -VOID -STDCALL -HalCalibratePerformanceCounter ( - ULONG Count - ); - -/* -FASTCALL -HalClearSoftwareInterrupt -*/ - -BOOLEAN STDCALL HalDisableSystemInterrupt (ULONG Vector, - ULONG Unknown2); - -VOID -STDCALL -HalDisplayString ( - IN PCH String - ); - -BOOLEAN STDCALL HalEnableSystemInterrupt (ULONG Vector, - ULONG Unknown2, - ULONG Unknown3); - -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, - ULONG Unknown2); - - -/* Is this function really exported ?? */ -VOID -HalExamineMBR ( - PDEVICE_OBJECT DeviceObject, - ULONG SectorSize, - ULONG MBRTypeIdentifier, - PVOID Buffer - ); - -BOOLEAN -STDCALL -HalFlushCommonBuffer ( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6, - ULONG Unknown7, - ULONG Unknown8 - ); - -VOID -STDCALL -HalFreeCommonBuffer ( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PHYSICAL_ADDRESS LogicalAddress, - PVOID VirtualAddress, - BOOLEAN CacheEnabled - ); - -PADAPTER_OBJECT -STDCALL -HalGetAdapter ( - PDEVICE_DESCRIPTION DeviceDescription, - PULONG NumberOfMapRegisters - ); - -ULONG -STDCALL -HalGetBusData ( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Length - ); - -ULONG -STDCALL -HalGetBusDataByOffset ( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length - ); - -/* Is this function really exported ?? */ -ULONG -HalGetDmaAlignmentRequirement ( - VOID - ); - -BOOLEAN -STDCALL -HalGetEnvironmentVariable ( - IN PCH Name, - OUT PCH Value, - IN USHORT ValueLength - ); - -ULONG -STDCALL -HalGetInterruptVector ( - INTERFACE_TYPE InterfaceType, - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity - ); - -VOID -STDCALL -HalInitializeProcessor ( - ULONG ProcessorNumber, - PVOID ProcessorStack - ); - -BOOLEAN -STDCALL -HalInitSystem ( - ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock - ); - -BOOLEAN -STDCALL -HalMakeBeep ( - ULONG Frequency - ); - -VOID -STDCALL -HalQueryDisplayParameters ( - PULONG DispSizeX, - PULONG DispSizeY, - PULONG CursorPosX, - PULONG CursorPosY - ); - -VOID -STDCALL -HalQueryRealTimeClock ( - PTIME_FIELDS Time - ); - -/* Is this function really exported ?? */ -VOID -HalQuerySystemInformation(VOID); - -ULONG -STDCALL -HalReadDmaCounter ( - PADAPTER_OBJECT AdapterObject - ); - -VOID -STDCALL -HalReportResourceUsage ( - VOID - ); - -VOID -STDCALL -HalRequestIpi ( - ULONG Unknown - ); - -/* -FASTCALL -HalRequestSoftwareInterrupt -*/ - -VOID -STDCALL -HalReturnToFirmware ( - ULONG Action - ); - -ULONG -STDCALL -HalSetBusData ( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Length - ); - -ULONG -STDCALL -HalSetBusDataByOffset ( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length - ); - -VOID -STDCALL -HalSetDisplayParameters ( - ULONG CursorPosX, - ULONG CursorPosY - ); - -BOOLEAN -STDCALL -HalSetEnvironmentVariable ( - IN PCH Name, - IN PCH Value - ); - -/* -HalSetProfileInterval -*/ - -VOID -STDCALL -HalSetRealTimeClock ( - PTIME_FIELDS Time - ); - -/* -HalSetTimeIncrement -*/ - -BOOLEAN -STDCALL -HalStartNextProcessor ( - ULONG Unknown1, - ULONG Unknown2 - ); - -/* -HalStartProfileInterrupt -*/ - -/* -HalStopProfileInterrupt -*/ - -ULONG -FASTCALL -HalSystemVectorDispatchEntry ( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 - ); - -BOOLEAN -STDCALL -HalTranslateBusAddress ( - INTERFACE_TYPE InterfaceType, - ULONG BusNumber, - PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, - PPHYSICAL_ADDRESS TranslatedAddress - ); - -/* - * Kernel debugger section - */ - -typedef struct _KD_PORT_INFORMATION -{ - ULONG ComPort; - ULONG BaudRate; - ULONG BaseAddress; -} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; - - -#if defined(__NTOSKRNL__) -extern ULONG KdComPortInUse __declspec(dllexport); -#endif - -#if defined(__HAL__) -extern ULONG KdComPortInUse __declspec(dllimport); -#endif - -BOOLEAN -STDCALL -KdPortInitialize (PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2); - -BOOLEAN -STDCALL -KdPortGetByte (PUCHAR ByteRecieved); - -BOOLEAN -STDCALL -KdPortPollByte (PUCHAR ByteRecieved); - -VOID -STDCALL -KdPortPutByte (UCHAR ByteToSend); - - -/* - * Port I/O functions - */ - -VOID -STDCALL -READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); - -VOID -STDCALL -READ_PORT_BUFFER_ULONG (PULONG Port, PULONG Value, ULONG Count); - -VOID -STDCALL -READ_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Value, ULONG Count); - -UCHAR -STDCALL -READ_PORT_UCHAR (PUCHAR Port); - -ULONG -STDCALL -READ_PORT_ULONG (PULONG Port); - -USHORT -STDCALL -READ_PORT_USHORT (PUSHORT Port); - -VOID -STDCALL -WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); - -VOID -STDCALL -WRITE_PORT_BUFFER_ULONG (PULONG Port, PULONG Value, ULONG Count); - -VOID -STDCALL -WRITE_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Value, ULONG Count); - -VOID -STDCALL -WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value); - -VOID -STDCALL -WRITE_PORT_ULONG (PULONG Port, ULONG Value); - -VOID -STDCALL -WRITE_PORT_USHORT (PUSHORT Port, USHORT Value); - - -#endif /* __INCLUDE_DDK_HALDDK_H */ diff --git a/reactos/include/ddk/halfuncs.h b/reactos/include/ddk/halfuncs.h new file mode 100644 index 00000000000..646c0162630 --- /dev/null +++ b/reactos/include/ddk/halfuncs.h @@ -0,0 +1,309 @@ +#ifndef __INCLUDE_DDK_HALFUNCS_H +#define __INCLUDE_DDK_HALFUNCS_H +/* $Id: halfuncs.h,v 1.1 2001/08/27 01:18:57 ekohl Exp $ */ + +VOID STDCALL +HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); + +NTSTATUS STDCALL +HalAdjustResourceList(PCM_RESOURCE_LIST Resources); + +NTSTATUS STDCALL +HalAllocateAdapterChannel(IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context); + +PVOID STDCALL +HalAllocateCommonBuffer(PADAPTER_OBJECT AdapterObject, + ULONG Length, + PPHYSICAL_ADDRESS LogicalAddress, + BOOLEAN CacheEnabled); + +PVOID STDCALL +HalAllocateCrashDumpRegisters(IN PADAPTER_OBJECT AdapterObject, + IN OUT PULONG NumberOfMapRegisters); + +BOOLEAN STDCALL +HalAllProcessorsStarted(VOID); + +NTSTATUS STDCALL +HalAssignSlotResources( + PUNICODE_STRING RegistryPath, + PUNICODE_STRING DriverClassName, + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT DeviceObject, + INTERFACE_TYPE BusType, + ULONG BusNumber, + ULONG SlotNumber, + PCM_RESOURCE_LIST *AllocatedResources + ); + +BOOLEAN STDCALL +HalBeginSystemInterrupt(ULONG Vector, + KIRQL Irql, + PKIRQL OldIrql); + +VOID STDCALL +HalCalibratePerformanceCounter(ULONG Count); + +/* +FASTCALL +HalClearSoftwareInterrupt +*/ + +BOOLEAN STDCALL +HalDisableSystemInterrupt(ULONG Vector, + ULONG Unknown2); + +VOID STDCALL +HalDisplayString(IN PCH String); + +BOOLEAN STDCALL +HalEnableSystemInterrupt(ULONG Vector, + ULONG Unknown2, + ULONG Unknown3); + +VOID STDCALL +HalEndSystemInterrupt(KIRQL Irql, + ULONG Unknown2); + + +/* Is this function really exported ?? */ +VOID +HalExamineMBR(PDEVICE_OBJECT DeviceObject, + ULONG SectorSize, + ULONG MBRTypeIdentifier, + PVOID Buffer); + +BOOLEAN STDCALL +HalFlushCommonBuffer(ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5, + ULONG Unknown6, + ULONG Unknown7, + ULONG Unknown8); + +VOID STDCALL +HalFreeCommonBuffer(PADAPTER_OBJECT AdapterObject, + ULONG Length, + PHYSICAL_ADDRESS LogicalAddress, + PVOID VirtualAddress, + BOOLEAN CacheEnabled); + +PADAPTER_OBJECT STDCALL +HalGetAdapter(PDEVICE_DESCRIPTION DeviceDescription, + PULONG NumberOfMapRegisters); + +ULONG STDCALL +HalGetBusData(BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length); + +ULONG STDCALL +HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length); + +/* Is this function really exported ?? */ +ULONG +HalGetDmaAlignmentRequirement(VOID); + +BOOLEAN STDCALL +HalGetEnvironmentVariable(IN PCH Name, + OUT PCH Value, + IN USHORT ValueLength); + +ULONG STDCALL +HalGetInterruptVector(INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + ULONG BusInterruptLevel, + ULONG BusInterruptVector, + PKIRQL Irql, + PKAFFINITY Affinity); + +VOID STDCALL +HalInitializeProcessor(ULONG ProcessorNumber, + PVOID ProcessorStack); + +BOOLEAN STDCALL +HalInitSystem(ULONG BootPhase, + PLOADER_PARAMETER_BLOCK LoaderBlock); + +BOOLEAN STDCALL +HalMakeBeep(ULONG Frequency); + +VOID STDCALL +HalQueryDisplayParameters(PULONG DispSizeX, + PULONG DispSizeY, + PULONG CursorPosX, + PULONG CursorPosY); + +VOID STDCALL +HalQueryRealTimeClock(PTIME_FIELDS Time); + +/* Is this function really exported ?? */ +VOID +HalQuerySystemInformation(VOID); + +ULONG STDCALL +HalReadDmaCounter(PADAPTER_OBJECT AdapterObject); + +VOID STDCALL +HalReportResourceUsage(VOID); + +VOID STDCALL +HalRequestIpi(ULONG Unknown); + +/* +FASTCALL +HalRequestSoftwareInterrupt +*/ + +VOID STDCALL +HalReturnToFirmware(ULONG Action); + +ULONG STDCALL +HalSetBusData(BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length); + +ULONG STDCALL +HalSetBusDataByOffset(BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length); + +VOID STDCALL +HalSetDisplayParameters(ULONG CursorPosX, + ULONG CursorPosY); + +BOOLEAN STDCALL +HalSetEnvironmentVariable(IN PCH Name, + IN PCH Value); + +/* +HalSetProfileInterval +*/ + +VOID STDCALL +HalSetRealTimeClock(PTIME_FIELDS Time); + +/* +HalSetTimeIncrement +*/ + +BOOLEAN STDCALL +HalStartNextProcessor(ULONG Unknown1, + ULONG Unknown2); + +/* +HalStartProfileInterrupt +*/ + +/* +HalStopProfileInterrupt +*/ + +ULONG FASTCALL +HalSystemVectorDispatchEntry(ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3); + +BOOLEAN STDCALL +HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, + PPHYSICAL_ADDRESS TranslatedAddress); + + +/* + * Kernel debugger support functions + */ + +BOOLEAN STDCALL +KdPortInitialize(PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2); + +BOOLEAN STDCALL +KdPortGetByte(PUCHAR ByteRecieved); + +BOOLEAN STDCALL +KdPortPollByte(PUCHAR ByteRecieved); + +VOID STDCALL +KdPortPutByte(UCHAR ByteToSend); + + +/* + * Port I/O functions + */ + +VOID STDCALL +READ_PORT_BUFFER_UCHAR(PUCHAR Port, + PUCHAR Value, + ULONG Count); + +VOID STDCALL +READ_PORT_BUFFER_ULONG(PULONG Port, + PULONG Value, + ULONG Count); + +VOID STDCALL +READ_PORT_BUFFER_USHORT(PUSHORT Port, + PUSHORT Value, + ULONG Count); + +UCHAR STDCALL +READ_PORT_UCHAR(PUCHAR Port); + +ULONG STDCALL +READ_PORT_ULONG(PULONG Port); + +USHORT STDCALL +READ_PORT_USHORT(PUSHORT Port); + +VOID STDCALL +WRITE_PORT_BUFFER_UCHAR(PUCHAR Port, + PUCHAR Value, + ULONG Count); + +VOID STDCALL +WRITE_PORT_BUFFER_ULONG(PULONG Port, + PULONG Value, + ULONG Count); + +VOID STDCALL +WRITE_PORT_BUFFER_USHORT(PUSHORT Port, + PUSHORT Value, + ULONG Count); + +VOID STDCALL +WRITE_PORT_UCHAR(PUCHAR Port, + UCHAR Value); + +VOID STDCALL +WRITE_PORT_ULONG(PULONG Port, + ULONG Value); + +VOID STDCALL +WRITE_PORT_USHORT(PUSHORT Port, + USHORT Value); + +#endif /* __INCLUDE_DDK_HALDDK_H */ + +/* EOF */ diff --git a/reactos/include/ddk/haltypes.h b/reactos/include/ddk/haltypes.h new file mode 100644 index 00000000000..fbffd262285 --- /dev/null +++ b/reactos/include/ddk/haltypes.h @@ -0,0 +1,276 @@ +/* $Id: haltypes.h,v 1.1 2001/08/27 01:18:57 ekohl Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/ddk/haltypes.h + * PURPOSE: HAL provided defintions for device drivers + * PROGRAMMER: David Welch (welch@mcmail.com) + * REVISION HISTORY: + * 23/06/98: Taken from linux system.h + */ + + +#ifndef __INCLUDE_DDK_HALTYPES_H +#define __INCLUDE_DDK_HALTYPES_H + + +/* HalReturnToFirmware */ +#define FIRMWARE_HALT 1 +#define FIRMWARE_REBOOT 3 + +enum +{ + DEVICE_DESCRIPTION_VERSION, + DEVICE_DESCRIPTION_VERSION1, +}; + +typedef ULONG DMA_WIDTH; +typedef ULONG DMA_SPEED; + +/* + * PURPOSE: Types for HalGetBusData + */ +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + MaximumBusDataType, +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; + +typedef struct _DEVICE_DESCRIPTION +{ + ULONG Version; + BOOLEAN Master; + BOOLEAN ScatterGather; + BOOLEAN DemandMode; + BOOLEAN AutoInitialize; + BOOLEAN Dma32BitAddress; + BOOLEAN IgnoreCount; + BOOLEAN Reserved1; + BOOLEAN Reserved2; + ULONG BusNumber; + ULONG DmaChannel; + INTERFACE_TYPE InterfaceType; + DMA_WIDTH DmaWidth; + DMA_SPEED DmaSpeed; + ULONG MaximumLength; + ULONG DmaPort; +} DEVICE_DESCRIPTION, *PDEVICE_DESCRIPTION; + + +/* Hal dispatch table */ + +typedef enum _HAL_QUERY_INFORMATION_CLASS +{ + HalInstalledBusInformation, + HalProfileSourceInformation, + HalSystemDockInformation, + HalPowerInformation, + HalProcessorSpeedInformation, + HalCallbackInformation, + HalMapRegisterInformation, + HalMcaLogInformation, + HalFrameBufferCachingInformation, + HalDisplayBiosInformation + /* information levels >= 0x8000000 reserved for OEM use */ +} HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; + + +typedef enum _HAL_SET_INFORMATION_CLASS +{ + HalProfileSourceInterval, + HalProfileSourceInterruptHandler, + HalMcaRegisterDriver +} HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; + + +typedef struct _BUS_HANDLER *PBUS_HANDLER; +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; + + +typedef BOOLEAN STDCALL +(*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); + +typedef NTSTATUS STDCALL +(*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength); + + +typedef NTSTATUS STDCALL +(*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN PVOID Buffer); + + +typedef NTSTATUS STDCALL +(*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler, + IN ULONG BufferSize, + OUT PULONG SlotNumbers, + OUT PULONG ReturnedLength); + + +/* Control codes of HalDeviceControl function */ +#define BCTL_EJECT 0x0001 +#define BCTL_QUERY_DEVICE_ID 0x0002 +#define BCTL_QUERY_DEVICE_UNIQUE_ID 0x0003 +#define BCTL_QUERY_DEVICE_CAPABILITIES 0x0004 +#define BCTL_QUERY_DEVICE_RESOURCES 0x0005 +#define BCTL_QUERY_DEVICE_RESOURCE_REQUIREMENTS 0x0006 +#define BCTL_QUERY_EJECT 0x0007 +#define BCTL_SET_LOCK 0x0008 +#define BCTL_SET_POWER 0x0009 +#define BCTL_SET_RESUME 0x000A +#define BCTL_SET_DEVICE_RESOURCES 0x000B + +/* Defines for BCTL structures */ +typedef struct +{ + BOOLEAN PowerSupported; + BOOLEAN ResumeSupported; + BOOLEAN LockSupported; + BOOLEAN EjectSupported; + BOOLEAN Removable; +} BCTL_DEVICE_CAPABILITIES, *PBCTL_DEVICE_CAPABILITIES; + + +typedef struct _DEVICE_CONTROL_CONTEXT +{ + NTSTATUS Status; + PDEVICE_HANDLER_OBJECT DeviceHandler; + PDEVICE_OBJECT DeviceObject; + ULONG ControlCode; + PVOID Buffer; + PULONG BufferLength; + PVOID Context; +} DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; + + +typedef VOID STDCALL +(*PDEVICE_CONTROL_COMPLETION)(IN PDEVICE_CONTROL_CONTEXT ControlContext); + + +typedef NTSTATUS STDCALL +(*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN OUT PVOID Buffer OPTIONAL, + IN OUT PULONG BufferLength OPTIONAL, + IN PVOID Context, + IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); + +typedef VOID FASTCALL +(*pHalExamineMBR)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); + +typedef VOID FASTCALL +(*pHalIoAssignDriveLetters)(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); + +typedef NTSTATUS FASTCALL +(*pHalIoReadPartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +typedef NTSTATUS FASTCALL +(*pHalIoSetPartitionInformation)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +typedef NTSTATUS FASTCALL +(*pHalIoWritePartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +typedef PBUS_HANDLER FASTCALL +(*pHalHandlerForBus)(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber); + +typedef VOID FASTCALL +(*pHalReferenceBusHandler)(IN PBUS_HANDLER BusHandler); + + +typedef struct _HAL_DISPATCH +{ + ULONG Version; + pHalQuerySystemInformation HalQuerySystemInformation; + pHalSetSystemInformation HalSetSystemInformation; + pHalQueryBusSlots HalQueryBusSlots; + pHalDeviceControl HalDeviceControl; + pHalExamineMBR HalExamineMBR; + pHalIoAssignDriveLetters HalIoAssignDriveLetters; + pHalIoReadPartitionTable HalIoReadPartitionTable; + pHalIoSetPartitionInformation HalIoSetPartitionInformation; + pHalIoWritePartitionTable HalIoWritePartitionTable; + pHalHandlerForBus HalReferenceHandlerForBus; + pHalReferenceBusHandler HalReferenceBusHandler; + pHalReferenceBusHandler HalDereferenceBusHandler; +} HAL_DISPATCH, *PHAL_DISPATCH; + +#define HAL_DISPATCH_VERSION 1 + +#ifdef __NTOSKRNL__ +extern HAL_DISPATCH EXPORTED HalDispatchTable; +#else +extern HAL_DISPATCH IMPORTED HalDispatchTable; +#endif + + +/* Hal private dispatch table */ + +typedef struct _HAL_PRIVATE_DISPATCH +{ + ULONG Version; +} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; + +#define HAL_PRIVATE_DISPATCH_VERSION 1 + + +#ifdef __NTOSKRNL__ +extern HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable; +#else +extern HAL_PRIVATE_DISPATCH IMPORTED HalPrivateDispatchTable; +#endif + + + +/* + * Kernel debugger section + */ + +typedef struct _KD_PORT_INFORMATION +{ + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + + +#ifdef __NTHAL__ +extern ULONG EXPORTED KdComPortInUse; +#else +extern ULONG IMPORTED KdComPortInUse; +#endif + +#endif /* __INCLUDE_DDK_HALTYPES_H */ + +/* EOF */ \ No newline at end of file diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h index f0306bd5bb8..c535a4853d2 100644 --- a/reactos/include/ddk/iotypes.h +++ b/reactos/include/ddk/iotypes.h @@ -1,4 +1,4 @@ -/* $Id: iotypes.h,v 1.30 2001/06/11 19:45:29 ekohl Exp $ +/* $Id: iotypes.h,v 1.31 2001/08/27 01:18:57 ekohl Exp $ * */ @@ -61,29 +61,33 @@ typedef struct _SHARE_ACCESS /* FUNCTION TYPES ************************************************************/ -typedef VOID (*PDRIVER_REINITIALIZE)(struct _DRIVER_OBJECT* DriverObject, - PVOID Context, - ULONG Count); - -typedef NTSTATUS (*PIO_QUERY_DEVICE_ROUTINE)(PVOID Context, - PUNICODE_STRING Pathname, - INTERFACE_TYPE BusType, - ULONG BusNumber, - PKEY_VALUE_FULL_INFORMATION* BI, - CONFIGURATION_TYPE ControllerType, - ULONG ControllerNumber, - PKEY_VALUE_FULL_INFORMATION* CI, - CONFIGURATION_TYPE PeripheralType, - ULONG PeripheralNumber, - PKEY_VALUE_FULL_INFORMATION* PI); - -typedef NTSTATUS (*PIO_COMPLETION_ROUTINE)(struct _DEVICE_OBJECT* DeviceObject, - struct _IRP* Irp, - PVOID Context); - -typedef VOID (*PIO_APC_ROUTINE) (PVOID ApcContext, - struct _IO_STATUS_BLOCK* IoStatusBlock, - ULONG Reserved); +typedef VOID STDCALL +(*PDRIVER_REINITIALIZE)(struct _DRIVER_OBJECT* DriverObject, + PVOID Context, + ULONG Count); + +typedef NTSTATUS STDCALL +(*PIO_QUERY_DEVICE_ROUTINE)(PVOID Context, + PUNICODE_STRING Pathname, + INTERFACE_TYPE BusType, + ULONG BusNumber, + PKEY_VALUE_FULL_INFORMATION* BI, + CONFIGURATION_TYPE ControllerType, + ULONG ControllerNumber, + PKEY_VALUE_FULL_INFORMATION* CI, + CONFIGURATION_TYPE PeripheralType, + ULONG PeripheralNumber, + PKEY_VALUE_FULL_INFORMATION* PI); + +typedef NTSTATUS STDCALL +(*PIO_COMPLETION_ROUTINE)(struct _DEVICE_OBJECT* DeviceObject, + struct _IRP* Irp, + PVOID Context); + +typedef VOID STDCALL +(*PIO_APC_ROUTINE)(PVOID ApcContext, + struct _IO_STATUS_BLOCK* IoStatusBlock, + ULONG Reserved); /* STRUCTURE TYPES ***********************************************************/ @@ -118,7 +122,7 @@ typedef struct _IO_RESOURCE_DESCRIPTOR /* * Reserved for system use */ - UCHAR Spare1; + UCHAR Spare1; USHORT Flags; @@ -186,7 +190,7 @@ typedef struct _IO_RESOURCE_REQUIREMENTS_LIST ULONG SlotNumber; ULONG Reserved[3]; ULONG AlternativeLists; - IO_RESOURCE_LIST List[1]; + IO_RESOURCE_LIST List[1]; } IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST; typedef struct @@ -440,14 +444,16 @@ typedef struct _IO_MAILSLOT_CREATE_BUFFER /* * Driver entry point declaration */ -typedef NTSTATUS (*PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT* DriverObject, - PUNICODE_STRING RegistryPath); +typedef NTSTATUS STDCALL +(*PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT* DriverObject, + PUNICODE_STRING RegistryPath); /* * Driver cancel declaration */ -typedef NTSTATUS (*PDRIVER_CANCEL)(struct _DEVICE_OBJECT* DeviceObject, - struct _IRP* RegistryPath); +typedef NTSTATUS STDCALL +(*PDRIVER_CANCEL)(struct _DEVICE_OBJECT* DeviceObject, + struct _IRP* RegistryPath); typedef struct _SECTION_OBJECT_POINTERS @@ -487,7 +493,7 @@ typedef struct _IO_COMPLETION_CONTEXT /* * ReactOS specific flags */ -#define FO_DIRECT_CACHE_READ 0x72000001 +#define FO_DIRECT_CACHE_READ 0x72000001 #define FO_DIRECT_CACHE_WRITE 0x72000002 #define FO_DIRECT_CACHE_PAGING_READ 0x72000004 #define FO_DIRECT_CACHE_PAGING_WRITE 0x72000008 @@ -498,7 +504,7 @@ typedef struct _FILE_OBJECT CSHORT Type; CSHORT Size; struct _DEVICE_OBJECT* DeviceObject; - struct _VPB* Vpb; + struct _VPB* Vpb; PVOID FsContext; PVOID FsContext2; PSECTION_OBJECT_POINTERS SectionObjectPointers; @@ -573,7 +579,7 @@ typedef struct _IRP LIST_ENTRY ListEntry; struct _IO_STACK_LOCATION* CurrentStackLocation; PFILE_OBJECT OriginalFileObject; - } Overlay; + } Overlay; KAPC Apc; ULONG CompletionKey; } Tail; @@ -618,7 +624,7 @@ typedef struct _DEVICE_OBJECT union { LIST_ENTRY ListHead; - WAIT_CONTEXT_BLOCK Wcb; + WAIT_CONTEXT_BLOCK Wcb; } Queue; ULONG AlignmentRequirement; KDEVICE_QUEUE DeviceQueue; @@ -635,7 +641,9 @@ typedef struct _DEVICE_OBJECT /* * Dispatch routine type declaration */ -typedef NTSTATUS STDCALL (*PDRIVER_DISPATCH)(struct _DEVICE_OBJECT*, IRP*); +typedef NTSTATUS STDCALL +(*PDRIVER_DISPATCH)(struct _DEVICE_OBJECT*, + IRP*); /* @@ -643,16 +651,15 @@ typedef NTSTATUS STDCALL (*PDRIVER_DISPATCH)(struct _DEVICE_OBJECT*, IRP*); */ //typedef NTSTATUS (*PFAST_IO_DISPATCH)(struct _DEVICE_OBJECT*, IRP*); //FIXME : this type is ok for read and write, but not for all routines -typedef BOOLEAN STDCALL (*PFAST_IO_ROUTINE) ( - IN struct _FILE_OBJECT *FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN struct _DEVICE_OBJECT *DeviceObject - ); +typedef BOOLEAN STDCALL +(*PFAST_IO_ROUTINE)(IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); typedef struct _FAST_IO_DISPATCH { ULONG SizeOfFastIoDispatch; @@ -688,18 +695,19 @@ typedef struct _FAST_IO_DISPATCH { /* * Dispatch routine type declaration */ -typedef VOID STDCALL (*PDRIVER_STARTIO)(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +typedef VOID STDCALL +(*PDRIVER_STARTIO)(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); /* * Dispatch routine type declaration */ -typedef NTSTATUS (*PDRIVER_UNLOAD)(struct _DRIVER_OBJECT*); +typedef NTSTATUS STDCALL +(*PDRIVER_UNLOAD)(struct _DRIVER_OBJECT*); -typedef -NTSTATUS -(*PDRIVER_ADD_DEVICE)( - IN struct _DRIVER_OBJECT *DriverObject, - IN struct _DEVICE_OBJECT *PhysicalDeviceObject); +typedef NTSTATUS STDCALL +(*PDRIVER_ADD_DEVICE)(IN struct _DRIVER_OBJECT *DriverObject, + IN struct _DEVICE_OBJECT *PhysicalDeviceObject); typedef struct _DRIVER_EXTENSION @@ -757,13 +765,15 @@ typedef struct _CONFIGURATION_INFORMATION BOOLEAN AtDiskSecondaryAddressClaimed; } CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION; -typedef VOID (*PIO_DPC_ROUTINE)(PKDPC Dpc, - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context); +typedef VOID STDCALL +(*PIO_DPC_ROUTINE)(PKDPC Dpc, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); -typedef VOID (*PIO_TIMER_ROUTINE)(PDEVICE_OBJECT DeviceObject, - PVOID Context); +typedef VOID STDCALL +(*PIO_TIMER_ROUTINE)(PDEVICE_OBJECT DeviceObject, + PVOID Context); #if WINDOWS_STRUCTS_DOESNT_ALREADY_DEFINE_THIS typedef struct _PARTITION_INFORMATION @@ -787,21 +797,15 @@ typedef struct _DRIVER_LAYOUT_INFORMATION } DRIVER_LAYOUT_INFORMATION, *PDRIVER_LAYOUT_INFORMATION; -typedef -IO_ALLOCATION_ACTION -(*PDRIVER_CONTROL) ( - PDEVICE_OBJECT DeviceObject, - PIRP irp, - PVOID MapRegisterBase, - PVOID Context - ); +typedef IO_ALLOCATION_ACTION STDCALL +(*PDRIVER_CONTROL)(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterBase, + PVOID Context); #if (_WIN32_WINNT >= 0x0400) -typedef -VOID -(*PFSDNOTIFICATIONPROC) ( - IN PDEVICE_OBJECT PtrTargetFileSystemDeviceObject, - IN BOOLEAN DriverActive - ); +typedef VOID STDCALL +(*PFSDNOTIFICATIONPROC)(IN PDEVICE_OBJECT PtrTargetFileSystemDeviceObject, + IN BOOLEAN DriverActive); #endif // (_WIN32_WINNT >= 0x0400) #endif /* __INCLUDE_DDK_IOTYPES_H */ diff --git a/reactos/include/ddk/ketypes.h b/reactos/include/ddk/ketypes.h index a654926608b..32ab700b17a 100644 --- a/reactos/include/ddk/ketypes.h +++ b/reactos/include/ddk/ketypes.h @@ -64,21 +64,29 @@ struct _KMUTANT; typedef LONG KPRIORITY; -typedef VOID (*PKBUGCHECK_CALLBACK_ROUTINE)(PVOID Buffer, ULONG Length); -typedef BOOLEAN (*PKSYNCHRONIZE_ROUTINE)(PVOID SynchronizeContext); +typedef VOID STDCALL +(*PKBUGCHECK_CALLBACK_ROUTINE)(PVOID Buffer, + ULONG Length); + +typedef BOOLEAN STDCALL +(*PKSYNCHRONIZE_ROUTINE)(PVOID SynchronizeContext); struct _KAPC; -typedef VOID (*PKNORMAL_ROUTINE)(PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2); -typedef VOID (*PKKERNEL_ROUTINE)(struct _KAPC* Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2); +typedef VOID STDCALL +(*PKNORMAL_ROUTINE)(PVOID NormalContext, + PVOID SystemArgument1, + PVOID SystemArgument2); + +typedef VOID STDCALL +(*PKKERNEL_ROUTINE)(struct _KAPC* Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2); -typedef VOID (*PKRUNDOWN_ROUTINE)(struct _KAPC* Apc); +typedef VOID STDCALL +(*PKRUNDOWN_ROUTINE)(struct _KAPC* Apc); struct _DISPATCHER_HEADER; @@ -209,8 +217,11 @@ struct _KDPC; * SystemArgument[1-2] = Undocumented. * */ -typedef VOID (*PKDEFERRED_ROUTINE)(struct _KDPC* Dpc, PVOID DeferredContext, - PVOID SystemArgument1, PVOID SystemArgument2); +typedef VOID STDCALL +(*PKDEFERRED_ROUTINE)(struct _KDPC* Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2); /* * PURPOSE: Defines a delayed procedure call object @@ -243,8 +254,9 @@ typedef struct _WAIT_CONTEXT_BLOCK struct _KINTERRUPT; -typedef BOOLEAN (*PKSERVICE_ROUTINE)(struct _KINTERRUPT* Interrupt, - PVOID ServiceContext); +typedef BOOLEAN STDCALL +(*PKSERVICE_ROUTINE)(struct _KINTERRUPT* Interrupt, + PVOID ServiceContext); typedef struct _KINTERRUPT { diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h index eb62c0411bf..b161791c717 100644 --- a/reactos/include/ddk/ntddk.h +++ b/reactos/include/ddk/ntddk.h @@ -1,4 +1,4 @@ -/* $Id: ntddk.h,v 1.24 2001/07/06 21:31:30 ekohl Exp $ +/* $Id: ntddk.h,v 1.25 2001/08/27 01:18:57 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -23,6 +23,7 @@ extern "C" #define STATIC static + #include #include #include @@ -51,9 +52,7 @@ extern "C" #include #include #include -#if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__) -#include -#endif /*__NTOSKRNL__ || __NTDRIVER__ || __NTHAL__ */ +#include #include #include @@ -61,6 +60,7 @@ extern "C" #include #if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__) #include +#include #include #include #include diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index eb70e3bd0ec..e9d70218438 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -141,10 +141,10 @@ BOOLEAN KeDispatcherObjectWake(DISPATCHER_HEADER* hdr); #if 0 VOID KiInterruptDispatch(ULONG irq); #endif -VOID KeExpireTimers( PKDPC Apc, - PVOID Arg1, - PVOID Arg2, - PVOID Arg3 ); +VOID STDCALL KeExpireTimers(PKDPC Apc, + PVOID Arg1, + PVOID Arg2, + PVOID Arg3); VOID KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, ULONG Size, ULONG SignalState); diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h index 52a2a9d9ef1..03fff4e4b2f 100644 --- a/reactos/ntoskrnl/include/internal/ps.h +++ b/reactos/ntoskrnl/include/internal/ps.h @@ -575,6 +575,25 @@ PsPrepareForApplicationProcessorInit(ULONG Id); NTSTATUS STDCALL PsIdleThreadMain(PVOID Context); +VOID STDCALL +PiSuspendThreadRundownRoutine(PKAPC Apc); +VOID STDCALL +PiSuspendThreadKernelRoutine(PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArguemnt2); +VOID STDCALL +PiSuspendThreadNormalRoutine(PVOID NormalContext, + PVOID SystemArgument1, + PVOID SystemArgument2); + +VOID STDCALL +PiTimeoutThread(struct _KDPC *dpc, + PVOID Context, + PVOID arg1, + PVOID arg2); + #endif /* ASSEMBLER */ #endif /* __INCLUDE_INTERNAL_PS_H */ diff --git a/reactos/ntoskrnl/io/cleanup.c b/reactos/ntoskrnl/io/cleanup.c index 65e6f41d76b..00efa116ba0 100644 --- a/reactos/ntoskrnl/io/cleanup.c +++ b/reactos/ntoskrnl/io/cleanup.c @@ -21,11 +21,12 @@ /* FUNCTIONS ***************************************************************/ -VOID IopCompleteRequest1(struct _KAPC* Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) +VOID STDCALL +IopCompleteRequest1(struct _KAPC* Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) { PIRP Irp; CCHAR PriorityBoost; diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c index 4fb6dbc609d..09f59152dd8 100644 --- a/reactos/ntoskrnl/io/irp.c +++ b/reactos/ntoskrnl/io/irp.c @@ -1,4 +1,4 @@ -/* $Id: irp.c,v 1.37 2001/05/01 23:08:19 chorns Exp $ +/* $Id: irp.c,v 1.38 2001/08/27 01:20:50 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -185,11 +185,12 @@ IoAllocateIrp (CCHAR StackSize, BOOLEAN ChargeQuota) } -VOID IopCompleteRequest(struct _KAPC* Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) +VOID STDCALL +IopCompleteRequest(struct _KAPC* Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) { DPRINT("IopCompleteRequest(Apc %x, SystemArgument1 %x, " "(*SystemArgument1) %x\n", Apc, SystemArgument1, @@ -199,9 +200,9 @@ VOID IopCompleteRequest(struct _KAPC* Apc, } -VOID -FASTCALL -IofCompleteRequest (PIRP Irp, CCHAR PriorityBoost) +VOID FASTCALL +IofCompleteRequest(PIRP Irp, + CCHAR PriorityBoost) /* * FUNCTION: Indicates the caller has finished all processing for a given * I/O request and is returning the given IRP to the I/O manager diff --git a/reactos/ntoskrnl/io/pnproot.c b/reactos/ntoskrnl/io/pnproot.c index 39a5cf2caaa..c3e4801058d 100644 --- a/reactos/ntoskrnl/io/pnproot.c +++ b/reactos/ntoskrnl/io/pnproot.c @@ -1,4 +1,4 @@ -/* $Id: pnproot.c,v 1.3 2001/08/14 21:14:05 hbirr Exp $ +/* $Id: pnproot.c,v 1.4 2001/08/27 01:20:50 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -229,6 +229,7 @@ PnpRootPowerControl( } NTSTATUS +STDCALL PnpRootAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c index e12738db131..dd88ccbfb9d 100644 --- a/reactos/ntoskrnl/ke/apc.c +++ b/reactos/ntoskrnl/ke/apc.c @@ -109,7 +109,7 @@ KiDeliverNormalApc(VOID) &NormalRoutine, &NormalContext, &SystemArgument1, - &SystemArgument2); + &SystemArgument2); NormalRoutine(NormalContext, SystemArgument1, SystemArgument2); KeAcquireSpinLock(&PiApcLock, &oldlvl); @@ -267,7 +267,7 @@ KiDeliverApc(ULONG Unknown1, &Apc->NormalRoutine, &Apc->NormalContext, &Apc->SystemArgument1, - &Apc->SystemArgument2); + &Apc->SystemArgument2); KeAcquireSpinLock(&PiApcLock, &oldlvl); Thread->Tcb.ApcState.KernelApcInProgress--; @@ -432,14 +432,14 @@ KeRemoveQueueApc (PKAPC Apc) VOID STDCALL -KeInitializeApc (PKAPC Apc, - PKTHREAD Thread, - UCHAR StateIndex, - PKKERNEL_ROUTINE KernelRoutine, - PKRUNDOWN_ROUTINE RundownRoutine, - PKNORMAL_ROUTINE NormalRoutine, - UCHAR Mode, - PVOID Context) +KeInitializeApc(PKAPC Apc, + PKTHREAD Thread, + UCHAR StateIndex, + PKKERNEL_ROUTINE KernelRoutine, + PKRUNDOWN_ROUTINE RundownRoutine, + PKNORMAL_ROUTINE NormalRoutine, + UCHAR Mode, + PVOID Context) /* * FUNCTION: Initialize an APC object * ARGUMENTS: @@ -453,7 +453,7 @@ KeInitializeApc (PKAPC Apc, * Mode = APC mode * Context = Parameter to be passed to the APC routine */ -{ +{ DPRINT("KeInitializeApc(Apc %x, Thread %x, StateIndex %d, " "KernelRoutine %x, RundownRoutine %x, NormalRoutine %x, Mode %d, " "Context %x)\n",Apc,Thread,StateIndex,KernelRoutine,RundownRoutine, @@ -479,25 +479,28 @@ KeInitializeApc (PKAPC Apc, } } -VOID NtQueueApcRundownRoutine(PKAPC Apc) +VOID STDCALL +NtQueueApcRundownRoutine(PKAPC Apc) { ExFreePool(Apc); } -VOID NtQueueApcKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) +VOID STDCALL +NtQueueApcKernelRoutine(PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) { ExFreePool(Apc); } -NTSTATUS STDCALL NtQueueApcThread(HANDLE ThreadHandle, - PKNORMAL_ROUTINE ApcRoutine, - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2) +NTSTATUS STDCALL +NtQueueApcThread(HANDLE ThreadHandle, + PKNORMAL_ROUTINE ApcRoutine, + PVOID NormalContext, + PVOID SystemArgument1, + PVOID SystemArgument2) { PKAPC Apc; PETHREAD Thread; diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c index 0369ed7a2a9..bb6e4a390d0 100644 --- a/reactos/ntoskrnl/ke/kthread.c +++ b/reactos/ntoskrnl/ke/kthread.c @@ -37,20 +37,8 @@ /* EXTERN ********************************************************************/ -extern VOID -PiTimeoutThread(struct _KDPC Dpc, PVOID Context, PVOID Arg1, PVOID Arg2); -VOID -PiSuspendThreadRundownRoutine(PKAPC Apc); -VOID -PiSuspendThreadKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2); -VOID -PiSuspendThreadNormalRoutine(PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2); +//extern VOID +//PiTimeoutThread(struct _KDPC Dpc, PVOID Context, PVOID Arg1, PVOID Arg2); /* FUNCTIONS *****************************************************************/ @@ -119,7 +107,7 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First) 0, &StackArea, FALSE); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) { @@ -234,14 +222,15 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First) * Initialize ReactOS specific members */ Thread->ProcessThreadListEntry.Flink = NULL; - Thread->ProcessThreadListEntry.Blink = NULL; - KeInitializeDpc(&Thread->TimerDpc, (PKDEFERRED_ROUTINE)PiTimeoutThread, + Thread->ProcessThreadListEntry.Blink = NULL; + KeInitializeDpc(&Thread->TimerDpc, + (PKDEFERRED_ROUTINE)PiTimeoutThread, Thread); Thread->LastEip = 0; /* * Do x86 specific part */ - + } diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c index 723e88bdbc1..466e8958a02 100644 --- a/reactos/ntoskrnl/ke/timer.c +++ b/reactos/ntoskrnl/ke/timer.c @@ -1,4 +1,4 @@ -/* $Id: timer.c,v 1.46 2001/07/30 03:05:29 rex Exp $ +/* $Id: timer.c,v 1.47 2001/08/27 01:21:50 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -382,7 +382,7 @@ HandleExpiredTimer(PKTIMER current) } } -VOID +VOID STDCALL KeExpireTimers(PKDPC Dpc, PVOID Context1, PVOID Arg1, diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c index 9227f88a109..decb9ffd2b7 100644 --- a/reactos/ntoskrnl/ps/create.c +++ b/reactos/ntoskrnl/ps/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.39 2001/08/26 17:30:21 ekohl Exp $ +/* $Id: create.c,v 1.40 2001/08/27 01:22:21 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -256,10 +256,10 @@ PsReferenceImpersonationToken(PETHREAD Thread, return(Thread->ImpersonationInfo->Token); } -VOID -PiTimeoutThread(struct _KDPC *dpc, - PVOID Context, - PVOID arg1, +VOID STDCALL +PiTimeoutThread(struct _KDPC *dpc, + PVOID Context, + PVOID arg1, PVOID arg2) { // wake up the thread, and tell it it timed out @@ -270,7 +270,7 @@ PiTimeoutThread(struct _KDPC *dpc, KeRemoveAllWaitsThread((PETHREAD)Context, Status); } -VOID +VOID PiBeforeBeginThread(CONTEXT c) { DPRINT("PiBeforeBeginThread(Eip %x)\n", c.Eip); diff --git a/reactos/ntoskrnl/ps/debug.c b/reactos/ntoskrnl/ps/debug.c index cdddf14c2f8..652bf0e9090 100644 --- a/reactos/ntoskrnl/ps/debug.c +++ b/reactos/ntoskrnl/ps/debug.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: debug.c,v 1.3 2001/03/16 18:11:24 dwelch Exp $ +/* $Id: debug.c,v 1.4 2001/08/27 01:22:21 ekohl Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/debug.c @@ -50,8 +50,9 @@ /* FUNCTIONS ***************************************************************/ -VOID KeContextToTrapFrame(PCONTEXT Context, - PKTRAP_FRAME TrapFrame) +VOID +KeContextToTrapFrame(PCONTEXT Context, + PKTRAP_FRAME TrapFrame) { if (Context->ContextFlags & CONTEXT_CONTROL) { @@ -96,8 +97,9 @@ VOID KeContextToTrapFrame(PCONTEXT Context, } } -VOID KeTrapFrameToContext(PKTRAP_FRAME TrapFrame, - PCONTEXT Context) +VOID +KeTrapFrameToContext(PKTRAP_FRAME TrapFrame, + PCONTEXT Context) { if (Context->ContextFlags & CONTEXT_CONTROL) { @@ -144,7 +146,7 @@ VOID KeTrapFrameToContext(PKTRAP_FRAME TrapFrame, * FIXME: Implement this case */ } -#if 0 +#if 0 if (Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) { /* @@ -154,7 +156,8 @@ VOID KeTrapFrameToContext(PKTRAP_FRAME TrapFrame, #endif } -VOID KeGetContextRundownRoutine(PKAPC Apc) +VOID STDCALL +KeGetContextRundownRoutine(PKAPC Apc) { PKEVENT Event; PNTSTATUS Status; @@ -165,11 +168,12 @@ VOID KeGetContextRundownRoutine(PKAPC Apc) KeSetEvent(Event, IO_NO_INCREMENT, FALSE); } -VOID KeGetContextKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) +VOID STDCALL +KeGetContextKernelRoutine(PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) /* * FUNCTION: This routine is called by an APC sent by NtGetContextThread to * copy the context of a thread into a buffer. @@ -189,8 +193,9 @@ VOID KeGetContextKernelRoutine(PKAPC Apc, KeSetEvent(Event, IO_NO_INCREMENT, FALSE); } -NTSTATUS STDCALL NtGetContextThread (IN HANDLE ThreadHandle, - OUT PCONTEXT Context) +NTSTATUS STDCALL +NtGetContextThread(IN HANDLE ThreadHandle, + OUT PCONTEXT Context) { PETHREAD Thread; NTSTATUS Status; @@ -260,8 +265,9 @@ NTSTATUS STDCALL NtGetContextThread (IN HANDLE ThreadHandle, } } -NTSTATUS STDCALL NtSetContextThread (IN HANDLE ThreadHandle, - IN PCONTEXT Context) +NTSTATUS STDCALL +NtSetContextThread(IN HANDLE ThreadHandle, + IN PCONTEXT Context) { UNIMPLEMENTED; } diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c index 72736c6afeb..478919e3f98 100644 --- a/reactos/ntoskrnl/ps/kill.c +++ b/reactos/ntoskrnl/ps/kill.c @@ -1,4 +1,4 @@ -/* $Id: kill.c,v 1.46 2001/07/28 07:57:24 ea Exp $ +/* $Id: kill.c,v 1.47 2001/08/27 01:22:21 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -36,8 +36,9 @@ VOID PsTerminateCurrentThread(NTSTATUS ExitStatus); /* FUNCTIONS *****************************************************************/ -VOID -PiTerminateProcessThreads(PEPROCESS Process, NTSTATUS ExitStatus) +VOID +PiTerminateProcessThreads(PEPROCESS Process, + NTSTATUS ExitStatus) { KIRQL oldlvl; PLIST_ENTRY current_entry; @@ -73,7 +74,7 @@ PiTerminateProcessThreads(PEPROCESS Process, NTSTATUS ExitStatus) DPRINT("Finished PiTerminateProcessThreads()\n"); } -VOID +VOID PsReapThreads(VOID) { PLIST_ENTRY current_entry; @@ -120,7 +121,8 @@ PsReapThreads(VOID) KeReleaseSpinLock(&PiThreadListLock, oldIrql); } -VOID PsTerminateCurrentThread(NTSTATUS ExitStatus) +VOID +PsTerminateCurrentThread(NTSTATUS ExitStatus) /* * FUNCTION: Terminates the current thread */ @@ -144,13 +146,13 @@ VOID PsTerminateCurrentThread(NTSTATUS ExitStatus) KeBugCheck(0); } -VOID +VOID STDCALL PiTerminateThreadRundownRoutine(PKAPC Apc) { ExFreePool(Apc); } -VOID +VOID STDCALL PiTerminateThreadKernelRoutine(PKAPC Apc, PKNORMAL_ROUTINE* NormalRoutine, PVOID* NormalContext, @@ -160,7 +162,7 @@ PiTerminateThreadKernelRoutine(PKAPC Apc, ExFreePool(Apc); } -VOID +VOID STDCALL PiTerminateThreadNormalRoutine(PVOID NormalContext, PVOID SystemArgument1, PVOID SystemArgument2) @@ -168,8 +170,9 @@ PiTerminateThreadNormalRoutine(PVOID NormalContext, PsTerminateCurrentThread(PsGetCurrentThread()->ExitStatus); } -VOID -PsTerminateOtherThread(PETHREAD Thread, NTSTATUS ExitStatus) +VOID +PsTerminateOtherThread(PETHREAD Thread, + NTSTATUS ExitStatus) /* * FUNCTION: Terminate a thread when calling from another thread's context * NOTES: This function must be called with PiThreadListLock held @@ -197,8 +200,9 @@ PsTerminateOtherThread(PETHREAD Thread, NTSTATUS ExitStatus) KernelMode); } -NTSTATUS STDCALL -PiTerminateProcess(PEPROCESS Process, NTSTATUS ExitStatus) +NTSTATUS STDCALL +PiTerminateProcess(PEPROCESS Process, + NTSTATUS ExitStatus) { DPRINT("PiTerminateProcess(Process %x, ExitStatus %x) RC %d HC %d\n", Process, ExitStatus, ObGetReferenceCount(Process), @@ -220,8 +224,9 @@ PiTerminateProcess(PEPROCESS Process, NTSTATUS ExitStatus) return(STATUS_SUCCESS); } -NTSTATUS STDCALL NtTerminateProcess(IN HANDLE ProcessHandle, - IN NTSTATUS ExitStatus) +NTSTATUS STDCALL +NtTerminateProcess(IN HANDLE ProcessHandle, + IN NTSTATUS ExitStatus) { NTSTATUS Status; PEPROCESS Process; @@ -251,8 +256,9 @@ NTSTATUS STDCALL NtTerminateProcess(IN HANDLE ProcessHandle, } -NTSTATUS STDCALL NtTerminateThread(IN HANDLE ThreadHandle, - IN NTSTATUS ExitStatus) +NTSTATUS STDCALL +NtTerminateThread(IN HANDLE ThreadHandle, + IN NTSTATUS ExitStatus) { PETHREAD Thread; NTSTATUS Status; @@ -282,7 +288,8 @@ NTSTATUS STDCALL NtTerminateThread(IN HANDLE ThreadHandle, } -NTSTATUS STDCALL PsTerminateSystemThread(NTSTATUS ExitStatus) +NTSTATUS STDCALL +PsTerminateSystemThread(NTSTATUS ExitStatus) /* * FUNCTION: Terminates the current thread * ARGUMENTS: @@ -294,7 +301,7 @@ NTSTATUS STDCALL PsTerminateSystemThread(NTSTATUS ExitStatus) return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS STDCALL NtCallTerminatePorts(PETHREAD Thread) { KIRQL oldIrql; @@ -317,7 +324,7 @@ NtCallTerminatePorts(PETHREAD Thread) return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS STDCALL NtRegisterThreadTerminatePort(HANDLE TerminationPortHandle) { NTSTATUS Status; diff --git a/reactos/ntoskrnl/ps/suspend.c b/reactos/ntoskrnl/ps/suspend.c index ec3ed202f0e..98fa5978067 100644 --- a/reactos/ntoskrnl/ps/suspend.c +++ b/reactos/ntoskrnl/ps/suspend.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: suspend.c,v 1.5 2001/03/18 19:35:14 dwelch Exp $ +/* $Id: suspend.c,v 1.6 2001/08/27 01:22:22 ekohl Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/suspend.c @@ -41,12 +41,12 @@ /* FUNCTIONS *****************************************************************/ -VOID +VOID STDCALL PiSuspendThreadRundownRoutine(PKAPC Apc) { } -VOID +VOID STDCALL PiSuspendThreadKernelRoutine(PKAPC Apc, PKNORMAL_ROUTINE* NormalRoutine, PVOID* NormalContext, @@ -55,7 +55,7 @@ PiSuspendThreadKernelRoutine(PKAPC Apc, { } -VOID +VOID STDCALL PiSuspendThreadNormalRoutine(PVOID NormalContext, PVOID SystemArgument1, PVOID SystemArgument2) -- 2.17.1