From e5769b0d386dd27fbbc6be43316184d222c2f189 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 23 Nov 2013 18:36:05 +0000 Subject: [PATCH] [FORMATTING] Fix indentation. No code changes! svn path=/trunk/; revision=61084 --- reactos/drivers/bus/pcmcia/fdo.c | 8 +- reactos/drivers/bus/pcmcia/pcmcia.c | 319 ++++++++++++++-------------- reactos/drivers/bus/pcmcia/pcmcia.h | 44 ++-- reactos/drivers/bus/pcmcia/pdo.c | 14 +- 4 files changed, 196 insertions(+), 189 deletions(-) diff --git a/reactos/drivers/bus/pcmcia/fdo.c b/reactos/drivers/bus/pcmcia/fdo.c index 21510b82d02..30c4cdff2ff 100644 --- a/reactos/drivers/bus/pcmcia/fdo.c +++ b/reactos/drivers/bus/pcmcia/fdo.c @@ -16,12 +16,12 @@ NTAPI PcmciaFdoPlugPlay(PPCMCIA_FDO_EXTENSION FdoExt, PIRP Irp) { - UNREFERENCED_PARAMETER(FdoExt); + UNREFERENCED_PARAMETER(FdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } diff --git a/reactos/drivers/bus/pcmcia/pcmcia.c b/reactos/drivers/bus/pcmcia/pcmcia.c index 7c95904e798..2e890c132d1 100644 --- a/reactos/drivers/bus/pcmcia/pcmcia.c +++ b/reactos/drivers/bus/pcmcia/pcmcia.c @@ -20,16 +20,16 @@ NTAPI PcmciaCreateClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(DeviceObject); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; - DPRINT("PCMCIA: Create/Close\n"); + DPRINT("PCMCIA: Create/Close\n"); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } DRIVER_DISPATCH PcmciaDeviceControl; @@ -39,27 +39,27 @@ NTAPI PcmciaDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; - UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("PCMCIA: DeviceIoControl\n"); + DPRINT("PCMCIA: DeviceIoControl\n"); - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = 0; - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) - { - default: - DPRINT1("PCMCIA: Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); - Status = STATUS_NOT_SUPPORTED; - } + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + default: + DPRINT1("PCMCIA: Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + } - Irp->IoStatus.Status = Status; + Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } DRIVER_UNLOAD PcmciaUnload; @@ -68,8 +68,8 @@ VOID NTAPI PcmciaUnload(PDRIVER_OBJECT DriverObject) { - UNREFERENCED_PARAMETER(DriverObject); - DPRINT("PCMCIA: Unload\n"); + UNREFERENCED_PARAMETER(DriverObject); + DPRINT("PCMCIA: Unload\n"); } DRIVER_DISPATCH PcmciaPlugPlay; @@ -79,19 +79,19 @@ NTAPI PcmciaPlugPlay(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; - - DPRINT("PCMCIA: PnP\n"); - if (Common->IsFDO) - { - return PcmciaFdoPlugPlay((PPCMCIA_FDO_EXTENSION)Common, - Irp); - } - else - { - return PcmciaPdoPlugPlay((PPCMCIA_PDO_EXTENSION)Common, - Irp); - } + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + + DPRINT("PCMCIA: PnP\n"); + if (Common->IsFDO) + { + return PcmciaFdoPlugPlay((PPCMCIA_FDO_EXTENSION)Common, + Irp); + } + else + { + return PcmciaPdoPlugPlay((PPCMCIA_PDO_EXTENSION)Common, + Irp); + } } DRIVER_DISPATCH PcmciaPower; @@ -101,78 +101,80 @@ NTAPI PcmciaPower(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; - - switch (IrpSp->MinorFunction) - { - case IRP_MN_QUERY_POWER: - /* I don't see any reason that we should care */ - DPRINT("PCMCIA: IRP_MN_QUERY_POWER\n"); - Status = STATUS_SUCCESS; - break; - - case IRP_MN_POWER_SEQUENCE: - DPRINT("PCMCIA: IRP_MN_POWER_SEQUENCE\n"); - RtlCopyMemory(IrpSp->Parameters.PowerSequence.PowerSequence, - &Common->PowerSequence, - sizeof(POWER_SEQUENCE)); - Status = STATUS_SUCCESS; - break; - - case IRP_MN_WAIT_WAKE: - /* Not really sure about this */ - DPRINT("PCMCIA: IRP_MN_WAIT_WAKE\n"); - Status = STATUS_NOT_SUPPORTED; - break; - - case IRP_MN_SET_POWER: - DPRINT("PCMCIA: IRP_MN_SET_POWER\n"); - if (IrpSp->Parameters.Power.Type == SystemPowerState) - { - Common->SystemPowerState = IrpSp->Parameters.Power.State.SystemState; - - Status = STATUS_SUCCESS; - } - else - { - Common->DevicePowerState = IrpSp->Parameters.Power.State.DeviceState; - - /* Update the POWER_SEQUENCE struct */ - if (Common->DevicePowerState <= PowerDeviceD1) - Common->PowerSequence.SequenceD1++; - - if (Common->DevicePowerState <= PowerDeviceD2) - Common->PowerSequence.SequenceD2++; - - if (Common->DevicePowerState <= PowerDeviceD3) - Common->PowerSequence.SequenceD3++; - - /* Start the underlying device if we are handling this for a PDO */ - if (!Common->IsFDO) - Status = PcmciaPdoSetPowerState((PPCMCIA_PDO_EXTENSION)Common); - else - Status = STATUS_SUCCESS; - } - - /* Report that we changed state to the Power Manager */ - PoSetPowerState(DeviceObject, IrpSp->Parameters.Power.Type, IrpSp->Parameters.Power.State); - break; - - default: - DPRINT1("PCMCIA: Invalid MN code in MJ_POWER handler %x\n", IrpSp->MinorFunction); - ASSERT(FALSE); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_QUERY_POWER: + /* I don't see any reason that we should care */ + DPRINT("PCMCIA: IRP_MN_QUERY_POWER\n"); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_POWER_SEQUENCE: + DPRINT("PCMCIA: IRP_MN_POWER_SEQUENCE\n"); + RtlCopyMemory(IrpSp->Parameters.PowerSequence.PowerSequence, + &Common->PowerSequence, + sizeof(POWER_SEQUENCE)); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_WAIT_WAKE: + /* Not really sure about this */ + DPRINT("PCMCIA: IRP_MN_WAIT_WAKE\n"); + Status = STATUS_NOT_SUPPORTED; + break; + + case IRP_MN_SET_POWER: + DPRINT("PCMCIA: IRP_MN_SET_POWER\n"); + if (IrpSp->Parameters.Power.Type == SystemPowerState) + { + Common->SystemPowerState = IrpSp->Parameters.Power.State.SystemState; + + Status = STATUS_SUCCESS; + } + else + { + Common->DevicePowerState = IrpSp->Parameters.Power.State.DeviceState; + + /* Update the POWER_SEQUENCE struct */ + if (Common->DevicePowerState <= PowerDeviceD1) + Common->PowerSequence.SequenceD1++; + + if (Common->DevicePowerState <= PowerDeviceD2) + Common->PowerSequence.SequenceD2++; + + if (Common->DevicePowerState <= PowerDeviceD3) + Common->PowerSequence.SequenceD3++; + + /* Start the underlying device if we are handling this for a PDO */ + if (!Common->IsFDO) + Status = PcmciaPdoSetPowerState((PPCMCIA_PDO_EXTENSION)Common); + else + Status = STATUS_SUCCESS; + } + + /* Report that we changed state to the Power Manager */ + PoSetPowerState(DeviceObject, + IrpSp->Parameters.Power.Type, + IrpSp->Parameters.Power.State); + break; + + default: + DPRINT1("PCMCIA: Invalid MN code in MJ_POWER handler %x\n", IrpSp->MinorFunction); + ASSERT(FALSE); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } DRIVER_ADD_DEVICE PcmciaAddDevice; @@ -182,38 +184,39 @@ NTAPI PcmciaAddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject) { - PPCMCIA_FDO_EXTENSION FdoExt; - PDEVICE_OBJECT Fdo; - NTSTATUS Status; + PPCMCIA_FDO_EXTENSION FdoExt; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; - DPRINT("PCMCIA: AddDevice\n"); + DPRINT("PCMCIA: AddDevice\n"); - Status = IoCreateDevice(DriverObject, - sizeof(*FdoExt), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_DEVICE_SECURE_OPEN, - FALSE, - &Fdo); - if (!NT_SUCCESS(Status)) return Status; + Status = IoCreateDevice(DriverObject, + sizeof(*FdoExt), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + return Status; - FdoExt = Fdo->DeviceExtension; + FdoExt = Fdo->DeviceExtension; - RtlZeroMemory(FdoExt, sizeof(*FdoExt)); + RtlZeroMemory(FdoExt, sizeof(*FdoExt)); - InitializeListHead(&FdoExt->ChildDeviceList); - KeInitializeSpinLock(&FdoExt->Lock); + InitializeListHead(&FdoExt->ChildDeviceList); + KeInitializeSpinLock(&FdoExt->Lock); - FdoExt->Common.Self = Fdo; - FdoExt->Common.IsFDO = TRUE; - FdoExt->Common.State = dsStopped; + FdoExt->Common.Self = Fdo; + FdoExt->Common.IsFDO = TRUE; + FdoExt->Common.State = dsStopped; - FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, - PhysicalDeviceObject); + FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, + PhysicalDeviceObject); - Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - return STATUS_SUCCESS; + return STATUS_SUCCESS; } NTSTATUS @@ -221,41 +224,41 @@ NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; - UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(RegistryPath); - DPRINT1("PCMCIA: DriverEntry\n"); + DPRINT1("PCMCIA: DriverEntry\n"); - DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; - DriverObject->MajorFunction[IRP_MJ_PNP] = PcmciaPlugPlay; - DriverObject->MajorFunction[IRP_MJ_POWER] = PcmciaPower; + DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = PcmciaPlugPlay; + DriverObject->MajorFunction[IRP_MJ_POWER] = PcmciaPower; - DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; - DriverObject->DriverUnload = PcmciaUnload; + DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; + DriverObject->DriverUnload = PcmciaUnload; - RtlZeroMemory(QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 2); + RtlZeroMemory(QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 2); - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].Name = L"IoctlInterface"; - QueryTable[0].EntryContext = &IoctlEnabled; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].Name = L"IoctlInterface"; + QueryTable[0].EntryContext = &IoctlEnabled; - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - L"Pcmcia\\Parameters", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - /* Key not present so assume disabled */ - IoctlEnabled = FALSE; - } + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + L"Pcmcia\\Parameters", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Key not present so assume disabled */ + IoctlEnabled = FALSE; + } - DPRINT("PCMCIA: Ioctl interface %s\n", - (IoctlEnabled ? "enabled" : "disabled")); + DPRINT("PCMCIA: Ioctl interface %s\n", + (IoctlEnabled ? "enabled" : "disabled")); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } diff --git a/reactos/drivers/bus/pcmcia/pcmcia.h b/reactos/drivers/bus/pcmcia/pcmcia.h index b6536835da8..3fe4a609318 100644 --- a/reactos/drivers/bus/pcmcia/pcmcia.h +++ b/reactos/drivers/bus/pcmcia/pcmcia.h @@ -4,32 +4,36 @@ #include #include -typedef enum { - dsStopped, - dsStarted, - dsPaused, - dsRemoved, - dsSurpriseRemoved +typedef enum +{ + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved } PCMCIA_DEVICE_STATE; -typedef struct _PCMCIA_COMMON_EXTENSION { - PDEVICE_OBJECT Self; - BOOLEAN IsFDO; - POWER_SEQUENCE PowerSequence; - PCMCIA_DEVICE_STATE State; - DEVICE_POWER_STATE DevicePowerState; - SYSTEM_POWER_STATE SystemPowerState; +typedef struct _PCMCIA_COMMON_EXTENSION +{ + PDEVICE_OBJECT Self; + BOOLEAN IsFDO; + POWER_SEQUENCE PowerSequence; + PCMCIA_DEVICE_STATE State; + DEVICE_POWER_STATE DevicePowerState; + SYSTEM_POWER_STATE SystemPowerState; } PCMCIA_COMMON_EXTENSION, *PPCMCIA_COMMON_EXTENSION; -typedef struct _PCMCIA_PDO_EXTENSION { - PCMCIA_COMMON_EXTENSION Common; +typedef struct _PCMCIA_PDO_EXTENSION +{ + PCMCIA_COMMON_EXTENSION Common; } PCMCIA_PDO_EXTENSION, *PPCMCIA_PDO_EXTENSION; -typedef struct _PCMCIA_FDO_EXTENSION { - PCMCIA_COMMON_EXTENSION Common; - PDEVICE_OBJECT Ldo; - LIST_ENTRY ChildDeviceList; - KSPIN_LOCK Lock; +typedef struct _PCMCIA_FDO_EXTENSION +{ + PCMCIA_COMMON_EXTENSION Common; + PDEVICE_OBJECT Ldo; + LIST_ENTRY ChildDeviceList; + KSPIN_LOCK Lock; } PCMCIA_FDO_EXTENSION, *PPCMCIA_FDO_EXTENSION; /* pdo.c */ diff --git a/reactos/drivers/bus/pcmcia/pdo.c b/reactos/drivers/bus/pcmcia/pdo.c index c78b49e58d9..bb2af299941 100644 --- a/reactos/drivers/bus/pcmcia/pdo.c +++ b/reactos/drivers/bus/pcmcia/pdo.c @@ -16,23 +16,23 @@ NTAPI PcmciaPdoPlugPlay(PPCMCIA_PDO_EXTENSION PdoExt, PIRP Irp) { - UNREFERENCED_PARAMETER(PdoExt); + UNREFERENCED_PARAMETER(PdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } NTSTATUS NTAPI PcmciaPdoSetPowerState(PPCMCIA_PDO_EXTENSION PdoExt) { - UNREFERENCED_PARAMETER(PdoExt); + UNREFERENCED_PARAMETER(PdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - return STATUS_SUCCESS; + return STATUS_SUCCESS; } -- 2.17.1