From 39649f0dd6348db5e8e791083dd51da795980fc5 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 9 May 2013 21:24:16 +0000 Subject: [PATCH] [PCI] * Add some function annotations. * Fix several debug print specifiers. * Properly mark some unreferenced parameters as such. svn path=/trunk/; revision=58981 --- reactos/drivers/bus/pci/fdo.c | 1 + reactos/drivers/bus/pci/pci.c | 8 +++++--- reactos/drivers/bus/pci/pdo.c | 29 ++++++++++++++++++++++------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/reactos/drivers/bus/pci/fdo.c b/reactos/drivers/bus/pci/fdo.c index 28153ec88e0..a1582152f14 100644 --- a/reactos/drivers/bus/pci/fdo.c +++ b/reactos/drivers/bus/pci/fdo.c @@ -456,6 +456,7 @@ FdoSetPower( { NTSTATUS Status; + UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(Irp); DPRINT("Called\n"); diff --git a/reactos/drivers/bus/pci/pci.c b/reactos/drivers/bus/pci/pci.c index 386680a79fa..f953a9d9387 100644 --- a/reactos/drivers/bus/pci/pci.c +++ b/reactos/drivers/bus/pci/pci.c @@ -53,7 +53,7 @@ PciDispatchDeviceControl( NTSTATUS Status; UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("Called. IRP is at (0x%X)\n", Irp); + DPRINT("Called. IRP is at (0x%p)\n", Irp); Irp->IoStatus.Information = 0; @@ -68,7 +68,7 @@ PciDispatchDeviceControl( if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - DPRINT("Completing IRP at 0x%X\n", Irp); + DPRINT("Completing IRP at 0x%p\n", Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); } @@ -98,7 +98,7 @@ PciPnpControl( DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DPRINT("IsFDO %d\n", DeviceExtension->IsFDO); + DPRINT("IsFDO %u\n", DeviceExtension->IsFDO); if (DeviceExtension->IsFDO) { Status = FdoPnpControl(DeviceObject, Irp); @@ -180,6 +180,7 @@ PciAddDevice( return STATUS_SUCCESS; } +DRIVER_UNLOAD PciUnload; VOID NTAPI @@ -187,6 +188,7 @@ PciUnload( IN PDRIVER_OBJECT DriverObject) { /* The driver object extension is destroyed by the I/O manager */ + UNREFERENCED_PARAMETER(DriverObject); } NTSTATUS diff --git a/reactos/drivers/bus/pci/pdo.c b/reactos/drivers/bus/pci/pdo.c index 644bffe349f..150493ab19b 100644 --- a/reactos/drivers/bus/pci/pdo.c +++ b/reactos/drivers/bus/pci/pdo.c @@ -398,7 +398,7 @@ PdoQueryResourceRequirements( } else { - DPRINT1("Unsupported header type %u\n", PCI_CONFIGURATION_TYPE(&PciConfig)); + DPRINT1("Unsupported header type %d\n", PCI_CONFIGURATION_TYPE(&PciConfig)); } if (ResCount == 0) @@ -708,7 +708,7 @@ PdoQueryResources( } else { - DPRINT1("Unsupported header type %u\n", PCI_CONFIGURATION_TYPE(&PciConfig)); + DPRINT1("Unsupported header type %d\n", PCI_CONFIGURATION_TYPE(&PciConfig)); } if (ResCount == 0) @@ -896,8 +896,11 @@ InterfaceDereference( InterlockedDecrement(&DeviceExtension->References); } +static TRANSLATE_BUS_ADDRESS InterfaceBusTranslateBusAddress; -static BOOLEAN NTAPI +static +BOOLEAN +NTAPI InterfaceBusTranslateBusAddress( IN PVOID Context, IN PHYSICAL_ADDRESS BusAddress, @@ -917,8 +920,11 @@ InterfaceBusTranslateBusAddress( BusAddress, AddressSpace, TranslatedAddress); } +static GET_DMA_ADAPTER InterfaceBusGetDmaAdapter; -static PDMA_ADAPTER NTAPI +static +PDMA_ADAPTER +NTAPI InterfaceBusGetDmaAdapter( IN PVOID Context, IN PDEVICE_DESCRIPTION DeviceDescription, @@ -929,8 +935,11 @@ InterfaceBusGetDmaAdapter( return (PDMA_ADAPTER)HalGetAdapter(DeviceDescription, NumberOfMapRegisters); } +static GET_SET_DEVICE_DATA InterfaceBusSetBusData; -static ULONG NTAPI +static +ULONG +NTAPI InterfaceBusSetBusData( IN PVOID Context, IN ULONG DataType, @@ -962,8 +971,11 @@ InterfaceBusSetBusData( return Size; } +static GET_SET_DEVICE_DATA InterfaceBusGetBusData; -static ULONG NTAPI +static +ULONG +NTAPI InterfaceBusGetBusData( IN PVOID Context, IN ULONG DataType, @@ -1229,6 +1241,8 @@ PdoStartDevice( UCHAR Irq; USHORT Command; + UNREFERENCED_PARAMETER(Irp); + if (!RawResList) return STATUS_SUCCESS; @@ -1244,7 +1258,7 @@ PdoStartDevice( if (RawPartialDesc->Type == CmResourceTypeInterrupt) { - DPRINT1("Assigning IRQ %d to PCI device 0x%x on bus 0x%x\n", + DPRINT1("Assigning IRQ %u to PCI device 0x%x on bus 0x%x\n", RawPartialDesc->u.Interrupt.Vector, DeviceExtension->PciDevice->SlotNumber.u.AsULONG, DeviceExtension->PciDevice->BusNumber); @@ -1401,6 +1415,7 @@ PdoSetPower( { NTSTATUS Status; + UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(Irp); DPRINT("Called\n");