- Fix some broken indentation (and GCC6 -Wmisleading-indentation warnings with it)

svn path=/trunk/; revision=73637
This commit is contained in:
Thomas Faber 2017-01-30 19:20:54 +00:00
parent ceeeea30e1
commit 5eebde25c0
2 changed files with 73 additions and 73 deletions

View file

@ -1470,8 +1470,8 @@ acpi_bus_remove (
if (device->pnp.cid_list) if (device->pnp.cid_list)
ExFreePoolWithTag(device->pnp.cid_list, 'DpcA'); ExFreePoolWithTag(device->pnp.cid_list, 'DpcA');
if (device->pnp.hardware_id) if (device->pnp.hardware_id)
ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA'); ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA');
if (device) if (device)
ExFreePoolWithTag(device, 'DpcA'); ExFreePoolWithTag(device, 'DpcA');

View file

@ -685,77 +685,77 @@ Bus_PDO_QueryDeviceText(
case DeviceTextDescription: case DeviceTextDescription:
if (!Irp->IoStatus.Information) { if (!Irp->IoStatus.Information) {
if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0)
Temp = L"Programmable interrupt controller"; Temp = L"Programmable interrupt controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0)
Temp = L"System timer"; Temp = L"System timer";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0)
Temp = L"DMA controller"; Temp = L"DMA controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0)
Temp = L"Keyboard"; Temp = L"Keyboard";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0)
Temp = L"Parallel port"; Temp = L"Parallel port";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0)
Temp = L"Serial port"; Temp = L"Serial port";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0)
Temp = L"Disk controller"; Temp = L"Disk controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0)
Temp = L"Disk controller"; Temp = L"Disk controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0)
Temp = L"Display adapter"; Temp = L"Display adapter";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0)
Temp = L"Bus controller"; Temp = L"Bus controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0)
Temp = L"PCMCIA controller"; Temp = L"PCMCIA controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0)
Temp = L"Mouse device"; Temp = L"Mouse device";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0)
Temp = L"Network adapter"; Temp = L"Network adapter";
else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0)
Temp = L"SCSI controller"; Temp = L"SCSI controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0)
Temp = L"Multimedia device"; Temp = L"Multimedia device";
else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0)
Temp = L"Modem"; Temp = L"Modem";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0)
Temp = L"Power Button"; Temp = L"Power Button";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0)
Temp = L"Sleep Button"; Temp = L"Sleep Button";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0)
Temp = L"Lid Switch"; Temp = L"Lid Switch";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0)
Temp = L"ACPI Embedded Controller"; Temp = L"ACPI Embedded Controller";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0)
Temp = L"ACPI Fan"; Temp = L"ACPI Fan";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 || else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 ||
wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0 ) wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0)
Temp = L"PCI Root Bridge"; Temp = L"PCI Root Bridge";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0)
Temp = L"ACPI Battery"; Temp = L"ACPI Battery";
else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0)
Temp = L"PCI Interrupt Link"; Temp = L"PCI Interrupt Link";
else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0)
Temp = L"ACPI Power Resource"; Temp = L"ACPI Power Resource";
else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0)
{ {
if (ProcessorNameString != NULL) if (ProcessorNameString != NULL)
Temp = ProcessorNameString; Temp = ProcessorNameString;
else else
Temp = L"Processor"; Temp = L"Processor";
} }
else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0)
Temp = L"ACPI Thermal Zone"; Temp = L"ACPI Thermal Zone";
else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0)
Temp = L"Smart Battery"; Temp = L"Smart Battery";
else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0)
Temp = L"AC Adapter"; Temp = L"AC Adapter";
/* Simply checking if AcpiHandle is NULL eliminates the need to check /* Simply checking if AcpiHandle is NULL eliminates the need to check
* for the 4 different names that ACPI knows the fixed feature button as internally * for the 4 different names that ACPI knows the fixed feature button as internally
*/ */
else if (!DeviceData->AcpiHandle) else if (!DeviceData->AcpiHandle)
Temp = L"ACPI Fixed Feature Button"; Temp = L"ACPI Fixed Feature Button";
else else
Temp = L"Other ACPI device"; Temp = L"Other ACPI device";
Buffer = ExAllocatePoolWithTag(PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IpcA'); Buffer = ExAllocatePoolWithTag(PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IpcA');