Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 18:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BATTC] Some tiny fixes

Browse source 
- Add missing parameter to a DPRINT.
- Print pointers using %p instead of %x.
- Move all executable code behind a functions initial DPRINT.
- Do not use non-trivial initializers.
- Check for NULL instead of using !.
- Add missing parentheses.
This commit is contained in:
Eric Kohl 2019-01-01 13:13:20 +01:00
parent 04524fef3b
commit 397fa2844e
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/battery/battc/battc.c
View file

@ -26,10 +26,11 @@ NTSTATUS
NTAPI NTAPI
BatteryClassUnload(PVOID ClassData) BatteryClassUnload(PVOID ClassData)
{ {
PBATTERY_CLASS_DATA BattClass = ClassData; PBATTERY_CLASS_DATA BattClass;
DPRINT("Battery 0x%x is being unloaded\n"); DPRINT("Battery %p is being unloaded\n", ClassData);
BattClass = ClassData;
if (BattClass->InterfaceName.Length != 0) if (BattClass->InterfaceName.Length != 0)
{ {
IoSetDeviceInterfaceState(&BattClass->InterfaceName, FALSE); IoSetDeviceInterfaceState(&BattClass->InterfaceName, FALSE);
@ -77,12 +78,15 @@ NTSTATUS
NTAPI NTAPI
BatteryClassStatusNotify(PVOID ClassData) BatteryClassStatusNotify(PVOID ClassData)
{ {
PBATTERY_CLASS_DATA BattClass = ClassData; PBATTERY_CLASS_DATA BattClass;
PBATTERY_WAIT_STATUS BattWait = BattClass->EventTriggerContext; PBATTERY_WAIT_STATUS BattWait;
BATTERY_STATUS BattStatus; BATTERY_STATUS BattStatus;
NTSTATUS Status; NTSTATUS Status;
DPRINT("Received battery status notification from 0x%x\n", ClassData); DPRINT("Received battery status notification from %p\n", ClassData);
BattClass = ClassData;
BattWait = BattClass->EventTriggerContext;
ExAcquireFastMutex(&BattClass->Mutex); ExAcquireFastMutex(&BattClass->Mutex);
if (!BattClass->Waiting) if (!BattClass->Waiting)
@ -134,11 +138,12 @@ BatteryClassInitializeDevice(PBATTERY_MINIPORT_INFO MiniportInfo,
PVOID *ClassData) PVOID *ClassData)
{ {
NTSTATUS Status; NTSTATUS Status;
PBATTERY_CLASS_DATA BattClass = ExAllocatePoolWithTag(NonPagedPool, PBATTERY_CLASS_DATA BattClass;
BattClass = ExAllocatePoolWithTag(NonPagedPool,
sizeof(BATTERY_CLASS_DATA), sizeof(BATTERY_CLASS_DATA),
BATTERY_CLASS_DATA_TAG); BATTERY_CLASS_DATA_TAG);
if (BattClass == NULL)
if (!BattClass)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
RtlZeroMemory(BattClass, sizeof(BATTERY_CLASS_DATA)); RtlZeroMemory(BattClass, sizeof(BATTERY_CLASS_DATA));
@ -184,8 +189,8 @@ NTAPI
BatteryClassIoctl(PVOID ClassData, BatteryClassIoctl(PVOID ClassData,
PIRP Irp) PIRP Irp)
{ {
PBATTERY_CLASS_DATA BattClass = ClassData; PBATTERY_CLASS_DATA BattClass;
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION IrpSp;
NTSTATUS Status; NTSTATUS Status;
ULONG WaitTime; ULONG WaitTime;
PBATTERY_WAIT_STATUS BattWait; PBATTERY_WAIT_STATUS BattWait;
@ -196,11 +201,13 @@ BatteryClassIoctl(PVOID ClassData,
BATTERY_NOTIFY BattNotify; BATTERY_NOTIFY BattNotify;
ULONG ReturnedLength; ULONG ReturnedLength;
Irp->IoStatus.Information = 0; DPRINT("Received IOCTL %x for %p\n", IrpSp->Parameters.DeviceIoControl.IoControlCode,
DPRINT("Received IOCTL %x for 0x%x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode,
ClassData); ClassData);
BattClass = ClassData;
IrpSp = IoGetCurrentIrpStackLocation(Irp);
Irp->IoStatus.Information = 0;
switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) switch (IrpSp->Parameters.DeviceIoControl.IoControlCode)
{ {
case IOCTL_BATTERY_QUERY_TAG: case IOCTL_BATTERY_QUERY_TAG:
@ -247,7 +254,9 @@ BatteryClassIoctl(PVOID ClassData,
} }
} }
else else
{
Irp->IoStatus.Information = sizeof(ULONG); Irp->IoStatus.Information = sizeof(ULONG);
}
break; break;
case IOCTL_BATTERY_QUERY_STATUS: case IOCTL_BATTERY_QUERY_STATUS:
@ -313,7 +322,9 @@ BatteryClassIoctl(PVOID ClassData,
} }
} }
else else
{
Irp->IoStatus.Information = sizeof(BATTERY_STATUS); Irp->IoStatus.Information = sizeof(BATTERY_STATUS);
}
break; break;
case IOCTL_BATTERY_QUERY_INFORMATION: case IOCTL_BATTERY_QUERY_INFORMATION:
@ -334,7 +345,9 @@ BatteryClassIoctl(PVOID ClassData,
&ReturnedLength); &ReturnedLength);
Irp->IoStatus.Information = ReturnedLength; Irp->IoStatus.Information = ReturnedLength;
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{
DPRINT1("QueryInformation failed (0x%x)\n", Status); DPRINT1("QueryInformation failed (0x%x)\n", Status);
}
break; break;
case IOCTL_BATTERY_SET_INFORMATION: case IOCTL_BATTERY_SET_INFORMATION:
@ -351,7 +364,9 @@ BatteryClassIoctl(PVOID ClassData,
BattSetInfo->InformationLevel, BattSetInfo->InformationLevel,
BattSetInfo->Buffer); BattSetInfo->Buffer);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{
DPRINT1("SetInformation failed (0x%x)\n", Status); DPRINT1("SetInformation failed (0x%x)\n", Status);
}
break; break;
default: default: