From 4dc4dad0b3f521607679cfa74e159170bca2f7f4 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 7 Sep 2012 12:01:14 +0000 Subject: [PATCH] [NDIS] Remove spurious form feeds from NDIS code. Patch by Lee Schroeder. See issue #7310 for more details. svn path=/trunk/; revision=57250 --- reactos/drivers/network/ndis/ndis/40stubs.c | 2 -- reactos/drivers/network/ndis/ndis/control.c | 8 ----- reactos/drivers/network/ndis/ndis/hardware.c | 7 ++--- reactos/drivers/network/ndis/ndis/io.c | 26 ++++----------- reactos/drivers/network/ndis/ndis/main.c | 8 ++--- reactos/drivers/network/ndis/ndis/memory.c | 6 ---- reactos/drivers/network/ndis/ndis/miniport.c | 33 ++------------------ reactos/drivers/network/ndis/ndis/protocol.c | 11 ------- reactos/drivers/network/ndis/ndis/string.c | 7 ----- reactos/drivers/network/ndis/ndis/time.c | 8 ----- 10 files changed, 14 insertions(+), 102 deletions(-) diff --git a/reactos/drivers/network/ndis/ndis/40stubs.c b/reactos/drivers/network/ndis/ndis/40stubs.c index 97376a8a700..37fe121c22e 100644 --- a/reactos/drivers/network/ndis/ndis/40stubs.c +++ b/reactos/drivers/network/ndis/ndis/40stubs.c @@ -262,7 +262,6 @@ NdisUpdateSharedMemory( /* No-op. */ } - /* * @unimplemented */ @@ -277,7 +276,6 @@ NdisImmediateReadSharedMemory( UNIMPLEMENTED } - /* * @unimplemented */ diff --git a/reactos/drivers/network/ndis/ndis/control.c b/reactos/drivers/network/ndis/ndis/control.c index 2a5bbc56431..912edb45cdc 100644 --- a/reactos/drivers/network/ndis/ndis/control.c +++ b/reactos/drivers/network/ndis/ndis/control.c @@ -12,7 +12,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -33,7 +32,6 @@ NdisInitializeReadWriteLock( KeInitializeSpinLock(&Lock->SpinLock); } - /* * @implemented */ @@ -94,7 +92,6 @@ NdisAcquireReadWriteLock( } } - /* * @implemented */ @@ -129,7 +126,6 @@ NdisReleaseReadWriteLock( } } - /* * @implemented */ @@ -147,7 +143,6 @@ NdisAcquireSpinLock( KeAcquireSpinLock(&SpinLock->SpinLock, &SpinLock->OldIrql); } - /* * @implemented */ @@ -165,7 +160,6 @@ NdisAllocateSpinLock( KeInitializeSpinLock(&SpinLock->SpinLock); } - /* * @implemented */ @@ -184,7 +178,6 @@ NdisDprAcquireSpinLock( SpinLock->OldIrql = DISPATCH_LEVEL; } - /* * @implemented */ @@ -202,7 +195,6 @@ NdisDprReleaseSpinLock( KeReleaseSpinLockFromDpcLevel(&SpinLock->SpinLock); } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/hardware.c b/reactos/drivers/network/ndis/ndis/hardware.c index fce8d0599dd..359ddb3b681 100644 --- a/reactos/drivers/network/ndis/ndis/hardware.c +++ b/reactos/drivers/network/ndis/ndis/hardware.c @@ -14,7 +14,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -33,7 +32,6 @@ NdisImmediateReadPciSlotInformation( WrapperContext->SlotNumber, Buffer, Offset, Length); } - /* * @implemented */ @@ -52,7 +50,6 @@ NdisImmediateWritePciSlotInformation( WrapperContext->SlotNumber, Buffer, Offset, Length); } - /* * @implemented */ @@ -96,7 +93,8 @@ NdisPciAssignResources( return NdisMPciAssignResources(Adapter, SlotNumber, AssignedResources); -} +} + /* * @implemented */ @@ -193,7 +191,6 @@ NdisReadPciSlotInformation( Buffer, Offset, Length); } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/io.c b/reactos/drivers/network/ndis/ndis/io.c index 33e84dfd41c..1c7ad7b373d 100644 --- a/reactos/drivers/network/ndis/ndis/io.c +++ b/reactos/drivers/network/ndis/ndis/io.c @@ -13,7 +13,6 @@ #include "ndissys.h" - VOID NTAPI HandleDeferredProcessing( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -47,7 +46,6 @@ VOID NTAPI HandleDeferredProcessing( NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } - BOOLEAN NTAPI ServiceRoutine( IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) @@ -94,7 +92,6 @@ BOOLEAN NTAPI ServiceRoutine( return InterruptRecognized; } - /* * @implemented */ @@ -109,7 +106,6 @@ NdisImmediateReadPortUchar( *Data = READ_PORT_UCHAR(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -124,7 +120,6 @@ NdisImmediateReadPortUlong( *Data = READ_PORT_ULONG(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -139,7 +134,6 @@ NdisImmediateReadPortUshort( *Data = READ_PORT_USHORT(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -154,7 +148,6 @@ NdisImmediateWritePortUchar( WRITE_PORT_UCHAR(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -169,7 +162,6 @@ NdisImmediateWritePortUlong( WRITE_PORT_ULONG(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -212,7 +204,8 @@ IO_ALLOCATION_ACTION NTAPI NdisSubordinateMapRegisterCallback ( /* We have to hold the object open to keep our lock on the system DMA controller */ return KeepObject; -} +} + IO_ALLOCATION_ACTION NTAPI NdisBusMasterMapRegisterCallback ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -242,7 +235,8 @@ IO_ALLOCATION_ACTION NTAPI NdisBusMasterMapRegisterCallback ( /* We're a bus master so we can go ahead and deallocate the object now */ return DeallocateObjectKeepRegisters; -} +} + /* * @implemented */ @@ -635,7 +629,6 @@ NdisMStartBufferPhysicalMapping( *ArraySize = LoopCount; } - /* * @implemented */ @@ -673,7 +666,6 @@ NdisMCompleteBufferPhysicalMapping( Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice); } - /* * @implemented */ @@ -693,7 +685,6 @@ NdisMDeregisterDmaChannel( ExFreePool(DmaBlock); } - /* * @implemented */ @@ -715,7 +706,6 @@ NdisMDeregisterInterrupt( Interrupt->Miniport->Interrupt = NULL; } - /* * @implemented */ @@ -769,7 +759,6 @@ NdisMFreeMapRegisters( ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); } - /* * @implemented */ @@ -822,7 +811,6 @@ NdisMMapIoSpace( return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -840,7 +828,6 @@ NdisMReadDmaCounter( return AdapterObject->DmaOperations->ReadDmaCounter(AdapterObject); } - /* * @implemented */ @@ -858,7 +845,6 @@ NdisMGetDmaAlignment( return AdapterObject->DmaOperations->GetDmaAlignment(AdapterObject); } - /* * @implemented */ @@ -938,7 +924,8 @@ NdisAllocateDmaChannel(OUT PNDIS_STATUS Status, FALSE, DmaDescription, MaximumLength); -} +} + /* * @implemented */ @@ -1016,7 +1003,6 @@ NdisMRegisterInterrupt( return NDIS_STATUS_FAILURE; } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/main.c b/reactos/drivers/network/ndis/ndis/main.c index 155e07522df..75ce902102a 100644 --- a/reactos/drivers/network/ndis/ndis/main.c +++ b/reactos/drivers/network/ndis/ndis/main.c @@ -23,7 +23,7 @@ ULONG DebugTraceLevel = MIN_TRACE; LONG CancelId; - + VOID NTAPI MainUnload( PDRIVER_OBJECT DriverObject) /* @@ -35,7 +35,7 @@ VOID NTAPI MainUnload( NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } - + NTSTATUS NTAPI DriverEntry( @@ -68,7 +68,7 @@ DriverEntry( return STATUS_SUCCESS; } - + /* * @implemented */ @@ -96,7 +96,7 @@ NdisWriteErrorLogEntry( /* ASSERT(0); */ } - + /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/memory.c b/reactos/drivers/network/ndis/ndis/memory.c index 740857ffd3d..4f98142c4ab 100644 --- a/reactos/drivers/network/ndis/ndis/memory.c +++ b/reactos/drivers/network/ndis/ndis/memory.c @@ -13,7 +13,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -50,7 +49,6 @@ NdisAllocateMemoryWithTag( } - /* * @implemented */ @@ -104,7 +102,6 @@ NdisAllocateMemory( return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -143,7 +140,6 @@ NdisFreeMemory( } } - /* * @implemented */ @@ -184,7 +180,6 @@ NdisMAllocateSharedMemory( Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } - VOID NTAPI NdisMFreeSharedMemoryPassive( @@ -212,7 +207,6 @@ NdisMFreeSharedMemoryPassive( ExFreePool(Memory); } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/miniport.c b/reactos/drivers/network/ndis/ndis/miniport.c index 4a995c158ff..42ff9315cb2 100644 --- a/reactos/drivers/network/ndis/ndis/miniport.c +++ b/reactos/drivers/network/ndis/ndis/miniport.c @@ -167,7 +167,6 @@ MiniIsBusy( return Busy; } - VOID MiniIndicateData( PLOGICAL_ADAPTER Adapter, @@ -282,7 +281,8 @@ NdisReturnPackets( KeLowerIrql(OldIrql); } } -} +} + VOID NTAPI MiniIndicateReceivePacket( IN NDIS_HANDLE MiniportAdapterHandle, @@ -425,7 +425,6 @@ MiniIndicateReceivePacket( KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - VOID NTAPI MiniResetComplete( IN NDIS_HANDLE MiniportAdapterHandle, @@ -917,7 +916,6 @@ MiniportHangDpc( } } - VOID FASTCALL MiniQueueWorkItem( @@ -991,7 +989,6 @@ MiniQueueWorkItem( KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - NDIS_STATUS FASTCALL MiniDequeueWorkItem( @@ -1050,7 +1047,6 @@ MiniDequeueWorkItem( } } - NDIS_STATUS MiniDoRequest( PLOGICAL_ADAPTER Adapter, @@ -1121,7 +1117,6 @@ MiniDoRequest( return Status; } - /* * @implemented */ @@ -1142,7 +1137,6 @@ NdisMSetInformationComplete( KeLowerIrql(OldIrql); } - /* * @implemented */ @@ -1322,7 +1316,6 @@ MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) } - VOID NTAPI MiniStatus( @@ -1356,7 +1349,6 @@ MiniStatus( KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - VOID NTAPI MiniStatusComplete( @@ -1384,7 +1376,6 @@ MiniStatusComplete( KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - /* * @implemented */ @@ -1529,7 +1520,6 @@ NdisMIndicateStatusComplete( MiniStatusComplete(MiniportAdapterHandle); } - /* * @implemented */ @@ -1614,7 +1604,6 @@ NdisInitializeWrapper( *NdisWrapperHandle = Miniport; } - VOID NTAPI NdisIBugcheckCallback( IN PVOID Buffer, IN ULONG Length) @@ -1634,7 +1623,6 @@ VOID NTAPI NdisIBugcheckCallback( sh(Context->DriverContext); } - /* * @implemented */ @@ -1685,7 +1673,6 @@ NdisMRegisterAdapterShutdownHandler( IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); } - NDIS_STATUS DoQueries( PLOGICAL_ADAPTER Adapter, @@ -1775,7 +1762,6 @@ DoQueries( return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIForwardIrpAndWaitCompletionRoutine( @@ -1791,7 +1777,6 @@ NdisIForwardIrpAndWaitCompletionRoutine( return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS NTAPI NdisIForwardIrpAndWait(PLOGICAL_ADAPTER Adapter, PIRP Irp) @@ -1826,7 +1811,6 @@ NdisICreateClose( return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIPnPStartDevice( @@ -2153,7 +2137,6 @@ NdisIPnPStartDevice( return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIPnPStopDevice( @@ -2275,7 +2258,6 @@ NdisIDeviceIoControl( return Status; } - NTSTATUS NTAPI NdisIDispatchPnp( @@ -2348,7 +2330,6 @@ NdisIDispatchPnp( return IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); } - NTSTATUS NTAPI NdisIAddDevice( @@ -2713,7 +2694,6 @@ NdisMRegisterMiniport( return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -2728,7 +2708,6 @@ NdisMResetComplete( MiniResetComplete(MiniportAdapterHandle, Status, AddressingReset); } - /* * @implemented */ @@ -2751,7 +2730,6 @@ NdisMSendComplete( MiniSendComplete(MiniportAdapterHandle, Packet, Status); } - /* * @implemented */ @@ -2764,7 +2742,6 @@ NdisMSendResourcesAvailable( MiniSendResourcesAvailable(MiniportAdapterHandle); } - /* * @implemented */ @@ -2780,7 +2757,6 @@ NdisMTransferDataComplete( MiniTransferDataComplete(MiniportAdapterHandle, Packet, Status, BytesTransferred); } - /* * @implemented */ @@ -2807,7 +2783,6 @@ NdisMSetAttributes( AdapterType); } - /* * @implemented */ @@ -2853,7 +2828,6 @@ NdisMSetAttributesEx( } } - /* * @implemented */ @@ -2881,7 +2855,6 @@ NdisMSleep( KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, 0); } - /* * @implemented */ @@ -2897,7 +2870,6 @@ NdisMSynchronizeWithInterrupt( SynchronizeContext)); } - /* * @unimplemented */ @@ -2940,7 +2912,6 @@ NdisMWriteLogData( return NDIS_STATUS_FAILURE; } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/protocol.c b/reactos/drivers/network/ndis/ndis/protocol.c index e6c74820c3e..15a5a0fef87 100644 --- a/reactos/drivers/network/ndis/ndis/protocol.c +++ b/reactos/drivers/network/ndis/ndis/protocol.c @@ -185,7 +185,6 @@ NdisIPnPCancelStopDevice( return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } - /* * @implemented */ @@ -240,7 +239,6 @@ NdisCompleteUnbindAdapter( ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); } - NDIS_STATUS ProIndicatePacket( PLOGICAL_ADAPTER Adapter, @@ -306,7 +304,6 @@ ProIndicatePacket( return NDIS_STATUS_SUCCESS; } - NDIS_STATUS NTAPI ProRequest( IN NDIS_HANDLE MacBindingHandle, @@ -456,7 +453,6 @@ proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) #endif } - NDIS_STATUS NTAPI ProSend( IN NDIS_HANDLE MacBindingHandle, @@ -561,7 +557,6 @@ ProSend( } } - VOID NTAPI ProSendPackets( IN NDIS_HANDLE NdisBindingHandle, @@ -624,7 +619,6 @@ ProSendPackets( } } - NDIS_STATUS NTAPI ProTransferData( IN NDIS_HANDLE MacBindingHandle, @@ -1221,7 +1215,6 @@ NdisRegisterProtocol( } } - /* * @implemented */ @@ -1242,7 +1235,6 @@ NdisRequest( *Status = ProRequest(NdisBindingHandle, NdisRequest); } - /* * @implemented */ @@ -1255,7 +1247,6 @@ NdisReset( *Status = ProReset(NdisBindingHandle); } - /* * @implemented */ @@ -1277,7 +1268,6 @@ NdisSend( *Status = ProSend(NdisBindingHandle, Packet); } - /* * @implemented */ @@ -1292,7 +1282,6 @@ NdisSendPackets( ProSendPackets(NdisBindingHandle, PacketArray, NumberOfPackets); } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/string.c b/reactos/drivers/network/ndis/ndis/string.c index c8032e06ae2..cd5c02b9350 100644 --- a/reactos/drivers/network/ndis/ndis/string.c +++ b/reactos/drivers/network/ndis/ndis/string.c @@ -12,7 +12,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -41,7 +40,6 @@ NdisAnsiStringToUnicodeString( } - /* * @implemented */ @@ -71,7 +69,6 @@ NdisEqualString( CaseInsensitive); } - /* * @implemented */ @@ -96,7 +93,6 @@ NdisInitAnsiString( RtlInitString((PANSI_STRING)DestinationString, (PCSZ)SourceString); } - /* * @implemented */ @@ -125,7 +121,6 @@ NdisInitializeString( RtlAnsiStringToUnicodeString((PUNICODE_STRING)DestinationString, &AnsiString, TRUE); } - /* * @implemented */ @@ -150,7 +145,6 @@ NdisInitUnicodeString( RtlInitUnicodeString((PUNICODE_STRING)DestinationString, SourceString); } - /* * @implemented */ @@ -179,7 +173,6 @@ NdisUnicodeStringToAnsiString( FALSE); } - /* * @implemented */ diff --git a/reactos/drivers/network/ndis/ndis/time.c b/reactos/drivers/network/ndis/ndis/time.c index 28b66f443d3..0e26b6264fe 100644 --- a/reactos/drivers/network/ndis/ndis/time.c +++ b/reactos/drivers/network/ndis/ndis/time.c @@ -19,7 +19,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -43,7 +42,6 @@ NdisCancelTimer( *TimerCancelled = KeCancelTimer (&Timer->Timer); } - /* * @implemented */ @@ -65,7 +63,6 @@ NdisGetCurrentSystemTime ( KeQuerySystemTime (pSystemTime); } - /* * @implemented */ @@ -126,7 +123,6 @@ BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) } } - /* * @implemented */ @@ -188,7 +184,6 @@ MiniTimerDpcFunction(PKDPC Dpc, SystemArgument2); } - /* * @implemented */ @@ -223,7 +218,6 @@ NdisMInitializeTimer( Timer->NextDeferredTimer = NULL; } - /* * @implemented */ @@ -269,7 +263,6 @@ NdisMSetPeriodicTimer( KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } - /* * @implemented */ @@ -316,7 +309,6 @@ NdisMSetTimer( KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); } - /* * @implemented */