[ros-diffs] [spetreolle] 57250: [NDIS] Remove spurious form feeds from NDIS code. Patch by Lee Schroeder. See issue #7310 for more details.

Author: spetreolle
Date: Fri Sep  7 12:01:14 2012
New Revision: 57250

URL: http://svn.reactos.org/svn/reactos?rev=57250&view=rev
Log:
[NDIS]
Remove spurious form feeds from NDIS code.
Patch by Lee Schroeder.
See issue #7310 for more details.

Modified:
    trunk/reactos/drivers/network/ndis/ndis/40stubs.c
    trunk/reactos/drivers/network/ndis/ndis/control.c
    trunk/reactos/drivers/network/ndis/ndis/hardware.c
    trunk/reactos/drivers/network/ndis/ndis/io.c
    trunk/reactos/drivers/network/ndis/ndis/main.c
    trunk/reactos/drivers/network/ndis/ndis/memory.c
    trunk/reactos/drivers/network/ndis/ndis/miniport.c
    trunk/reactos/drivers/network/ndis/ndis/protocol.c
    trunk/reactos/drivers/network/ndis/ndis/string.c
    trunk/reactos/drivers/network/ndis/ndis/time.c

Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -262,7 +262,6 @@
     /* No-op. */
 }
 
-
 /*
  * @unimplemented
  */
@@ -277,7 +276,6 @@
     UNIMPLEMENTED
 }
 
-
 /*
  * @unimplemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -12,7 +12,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @implemented
  */
@@ -33,7 +32,6 @@
   KeInitializeSpinLock(&Lock->SpinLock);
 }
 
-
 /*
  * @implemented
  */
@@ -94,7 +92,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -129,7 +126,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -147,7 +143,6 @@
   KeAcquireSpinLock(&SpinLock->SpinLock, &SpinLock->OldIrql);
 }
 
-
 /*
  * @implemented
  */
@@ -165,7 +160,6 @@
   KeInitializeSpinLock(&SpinLock->SpinLock);
 }
 
-
 /*
  * @implemented
  */
@@ -184,7 +178,6 @@
   SpinLock->OldIrql = DISPATCH_LEVEL;
 }
 
-
 /*
  * @implemented
  */
@@ -202,7 +195,6 @@
   KeReleaseSpinLockFromDpcLevel(&SpinLock->SpinLock);
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -14,7 +14,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @implemented
  */
@@ -33,7 +32,6 @@
                                WrapperContext->SlotNumber, Buffer, Offset, Length);
 }
 
-
 /*
  * @implemented
  */
@@ -52,7 +50,6 @@
                                WrapperContext->SlotNumber, Buffer, Offset, Length);
 }
 
-
 /*
  * @implemented
  */
@@ -96,7 +93,8 @@
 	return NdisMPciAssignResources(Adapter,
                                    SlotNumber,
                                    AssignedResources);
-}
+}
+
 /*
  * @implemented
  */
@@ -193,7 +191,6 @@
                                Buffer, Offset, Length);
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/io.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Sep  7 12:01:14 2012
@@ -13,7 +13,6 @@
 
 #include "ndissys.h"
 
-
 VOID NTAPI HandleDeferredProcessing(
     IN  PKDPC   Dpc,
     IN  PVOID   DeferredContext,
@@ -47,7 +46,6 @@
   NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n"));
 }
 
-
 BOOLEAN NTAPI ServiceRoutine(
     IN  PKINTERRUPT Interrupt,
     IN  PVOID       ServiceContext)
@@ -94,7 +92,6 @@
   return InterruptRecognized;
 }
 
-
 /*
  * @implemented
  */
@@ -109,7 +106,6 @@
   *Data = READ_PORT_UCHAR(UlongToPtr(Port)); // FIXME: What to do with
WrapperConfigurationContext?
 }
 
-
 /*
  * @implemented
  */
@@ -124,7 +120,6 @@
   *Data = READ_PORT_ULONG(UlongToPtr(Port)); // FIXME: What to do with
WrapperConfigurationContext?
 }
 
-
 /*
  * @implemented
  */
@@ -139,7 +134,6 @@
   *Data = READ_PORT_USHORT(UlongToPtr(Port)); // FIXME: What to do with
WrapperConfigurationContext?
 }
 
-
 /*
  * @implemented
  */
@@ -154,7 +148,6 @@
   WRITE_PORT_UCHAR(UlongToPtr(Port), Data); // FIXME: What to do with
WrapperConfigurationContext?
 }
 
-
 /*
  * @implemented
  */
@@ -169,7 +162,6 @@
   WRITE_PORT_ULONG(UlongToPtr(Port), Data); // FIXME: What to do with
WrapperConfigurationContext?
 }
 
-
 /*
  * @implemented
  */
@@ -212,7 +204,8 @@
     
     /* 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 @@
 
   /* We're a bus master so we can go ahead and deallocate the object now */
   return DeallocateObjectKeepRegisters;
-}
+}
+
 /*
  * @implemented
  */
@@ -635,7 +629,6 @@
   *ArraySize = LoopCount;
 }
 
-
 /*
  * @implemented
  */
@@ -673,7 +666,6 @@
       Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice);
 }
 
-
 /*
  * @implemented
  */
@@ -693,7 +685,6 @@
     ExFreePool(DmaBlock);
 }
 
-
 /*
  * @implemented
  */
@@ -715,7 +706,6 @@
         Interrupt->Miniport->Interrupt = NULL;
 }
 
-
 /*
  * @implemented
  */
@@ -769,7 +759,6 @@
  ExFreePool(Adapter->NdisMiniportBlock.MapRegisters);
 }
 
-
 /*
  * @implemented
  */
@@ -822,7 +811,6 @@
   return NDIS_STATUS_SUCCESS;
 }
 
-
 /*
  * @implemented
  */
@@ -840,7 +828,6 @@
   return AdapterObject->DmaOperations->ReadDmaCounter(AdapterObject);
 }
 
-
 /*
  * @implemented
  */
@@ -858,7 +845,6 @@
   return AdapterObject->DmaOperations->GetDmaAlignment(AdapterObject);
 }
 
-
 /*
  * @implemented
  */
@@ -938,7 +924,8 @@
                                       FALSE,
                                       DmaDescription,
                                       MaximumLength);
-}
+}
+
 /*
  * @implemented
  */
@@ -1016,7 +1003,6 @@
   return NDIS_STATUS_FAILURE;
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Fri Sep  7 12:01:14 2012
@@ -23,7 +23,7 @@
 
 LONG CancelId;
 
-
+
 VOID NTAPI MainUnload(
     PDRIVER_OBJECT DriverObject)
 /*
@@ -35,7 +35,7 @@
   NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n"));
 }
 
-
+
 NTSTATUS
 NTAPI
 DriverEntry(
@@ -68,7 +68,7 @@
   return STATUS_SUCCESS;
 }
 
-
+
 /*
  * @implemented
  */
@@ -96,7 +96,7 @@
   /* ASSERT(0); */
 }
 
-
+
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -13,7 +13,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @implemented
  */
@@ -50,7 +49,6 @@
 }
 
 
-
 /*
  * @implemented
  */
@@ -104,7 +102,6 @@
   return NDIS_STATUS_SUCCESS;
 }
 
-
 /*
  * @implemented
  */
@@ -143,7 +140,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -184,7 +180,6 @@
       Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress,
Cached);
 }
 
-
 VOID
 NTAPI
 NdisMFreeSharedMemoryPassive(
@@ -212,7 +207,6 @@
   ExFreePool(Memory);
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -167,7 +167,6 @@
     return Busy;
 }
 
-
 VOID
 MiniIndicateData(
     PLOGICAL_ADAPTER    Adapter,
@@ -282,7 +281,8 @@
             KeLowerIrql(OldIrql);
         }
     }
-}
+}
+
 VOID NTAPI
 MiniIndicateReceivePacket(
     IN  NDIS_HANDLE    MiniportAdapterHandle,
@@ -425,7 +425,6 @@
     KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 }
 
-
 VOID NTAPI
 MiniResetComplete(
     IN  NDIS_HANDLE MiniportAdapterHandle,
@@ -917,7 +916,6 @@
   }
 }
 
-
 VOID
 FASTCALL
 MiniQueueWorkItem(
@@ -991,7 +989,6 @@
     KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 }
 
-
 NDIS_STATUS
 FASTCALL
 MiniDequeueWorkItem(
@@ -1050,7 +1047,6 @@
     }
 }
 
-
 NDIS_STATUS
 MiniDoRequest(
     PLOGICAL_ADAPTER Adapter,
@@ -1121,7 +1117,6 @@
     return Status;
 }
 
-
 /*
  * @implemented
  */
@@ -1142,7 +1137,6 @@
   KeLowerIrql(OldIrql);
 }
 
-
 /*
  * @implemented
  */
@@ -1322,7 +1316,6 @@
 }
 
 
-
 VOID
 NTAPI
 MiniStatus(
@@ -1356,7 +1349,6 @@
     KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 }
 
-
 VOID
 NTAPI
 MiniStatusComplete(
@@ -1384,7 +1376,6 @@
     KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 }
 
-
 /*
  * @implemented
  */
@@ -1529,7 +1520,6 @@
     MiniStatusComplete(MiniportAdapterHandle);
 }
 
-
 /*
  * @implemented
  */
@@ -1614,7 +1604,6 @@
   *NdisWrapperHandle = Miniport;
 }
 
-
 VOID NTAPI NdisIBugcheckCallback(
     IN PVOID   Buffer,
     IN ULONG   Length)
@@ -1634,7 +1623,6 @@
     sh(Context->DriverContext);
 }
 
-
 /*
  * @implemented
  */
@@ -1685,7 +1673,6 @@
   IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject);
 }
 
-
 NDIS_STATUS
 DoQueries(
     PLOGICAL_ADAPTER Adapter,
@@ -1775,7 +1762,6 @@
   return STATUS_SUCCESS;
 }
 
-
 NTSTATUS
 NTAPI
 NdisIForwardIrpAndWaitCompletionRoutine(
@@ -1791,7 +1777,6 @@
   return STATUS_MORE_PROCESSING_REQUIRED;
 }
 
-
 NTSTATUS
 NTAPI
 NdisIForwardIrpAndWait(PLOGICAL_ADAPTER Adapter, PIRP Irp)
@@ -1826,7 +1811,6 @@
   return STATUS_SUCCESS;
 }
 
-
 NTSTATUS
 NTAPI
 NdisIPnPStartDevice(
@@ -2153,7 +2137,6 @@
   return STATUS_SUCCESS;
 }
 
-
 NTSTATUS
 NTAPI
 NdisIPnPStopDevice(
@@ -2275,7 +2258,6 @@
   return Status;
 }
 
-
 NTSTATUS
 NTAPI
 NdisIDispatchPnp(
@@ -2348,7 +2330,6 @@
   return IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp);
 }
 
-
 NTSTATUS
 NTAPI
 NdisIAddDevice(
@@ -2713,7 +2694,6 @@
   return NDIS_STATUS_SUCCESS;
 }
 
-
 /*
  * @implemented
  */
@@ -2728,7 +2708,6 @@
   MiniResetComplete(MiniportAdapterHandle, Status, AddressingReset);
 }
 
-
 /*
  * @implemented
  */
@@ -2751,7 +2730,6 @@
   MiniSendComplete(MiniportAdapterHandle, Packet, Status);
 }
 
-
 /*
  * @implemented
  */
@@ -2764,7 +2742,6 @@
   MiniSendResourcesAvailable(MiniportAdapterHandle);
 }
 
-
 /*
  * @implemented
  */
@@ -2780,7 +2757,6 @@
   MiniTransferDataComplete(MiniportAdapterHandle, Packet, Status, BytesTransferred);
 }
 
-
 /*
  * @implemented
  */
@@ -2807,7 +2783,6 @@
                        AdapterType);
 }
 
-
 /*
  * @implemented
  */
@@ -2853,7 +2828,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -2881,7 +2855,6 @@
   KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, 0);
 }
 
-
 /*
  * @implemented
  */
@@ -2897,7 +2870,6 @@
 				SynchronizeContext));
 }
 
-
 /*
  * @unimplemented
  */
@@ -2940,7 +2912,6 @@
     return NDIS_STATUS_FAILURE;
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -185,7 +185,6 @@
   return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp);
 }
 
-
 /*
  * @implemented
  */
@@ -240,7 +239,6 @@
   ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock);
 }
 
-
 NDIS_STATUS
 ProIndicatePacket(
     PLOGICAL_ADAPTER Adapter,
@@ -306,7 +304,6 @@
   return NDIS_STATUS_SUCCESS;
 }
 
-
 NDIS_STATUS NTAPI
 ProRequest(
     IN  NDIS_HANDLE     MacBindingHandle,
@@ -456,7 +453,6 @@
 #endif
 }
 
-
 NDIS_STATUS NTAPI
 ProSend(
     IN  NDIS_HANDLE     MacBindingHandle,
@@ -561,7 +557,6 @@
     }
 }
 
-
 VOID NTAPI
 ProSendPackets(
     IN  NDIS_HANDLE     NdisBindingHandle,
@@ -624,7 +619,6 @@
      }
 }
 
-
 NDIS_STATUS NTAPI
 ProTransferData(
     IN  NDIS_HANDLE         MacBindingHandle,
@@ -1221,7 +1215,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -1242,7 +1235,6 @@
     *Status = ProRequest(NdisBindingHandle, NdisRequest);
 }
 
-
 /*
  * @implemented
  */
@@ -1255,7 +1247,6 @@
     *Status = ProReset(NdisBindingHandle);
 }
 
-
 /*
  * @implemented
  */
@@ -1277,7 +1268,6 @@
     *Status = ProSend(NdisBindingHandle, Packet);
 }
 
-
 /*
  * @implemented
  */
@@ -1292,7 +1282,6 @@
     ProSendPackets(NdisBindingHandle, PacketArray, NumberOfPackets);
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/string.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/string.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/string.c [iso-8859-1] Fri Sep  7 12:01:14
2012
@@ -12,7 +12,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @implemented
  */
@@ -41,7 +40,6 @@
 }
 
 
-
 /*
  * @implemented
  */
@@ -71,7 +69,6 @@
       CaseInsensitive);
 }
 
-
 /*
  * @implemented
  */
@@ -96,7 +93,6 @@
   RtlInitString((PANSI_STRING)DestinationString, (PCSZ)SourceString);
 }
 
-
 /*
  * @implemented
  */
@@ -125,7 +121,6 @@
   RtlAnsiStringToUnicodeString((PUNICODE_STRING)DestinationString, &AnsiString,
TRUE);
 }
 
-
 /*
  * @implemented
  */
@@ -150,7 +145,6 @@
   RtlInitUnicodeString((PUNICODE_STRING)DestinationString, SourceString);
 }
 
-
 /*
  * @implemented
  */
@@ -179,7 +173,6 @@
       FALSE);
 }
 
-
 /*
  * @implemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/time.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Fri Sep  7 12:01:14 2012
@@ -19,7 +19,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @implemented
  */
@@ -43,7 +42,6 @@
   *TimerCancelled = KeCancelTimer (&Timer->Timer);
 }
 
-
 /*
  * @implemented
  */
@@ -65,7 +63,6 @@
   KeQuerySystemTime (pSystemTime);
 }
 
-
 /*
  * @implemented
  */
@@ -126,7 +123,6 @@
   }
 }
 
-
 /*
  * @implemented
  */
@@ -188,7 +184,6 @@
                                SystemArgument2);
 }
 
-
 /*
  * @implemented
  */
@@ -223,7 +218,6 @@
   Timer->NextDeferredTimer = NULL;
 }
 
-
 /*
  * @implemented
  */
@@ -269,7 +263,6 @@
   KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc);
 }
 
-
 /*
  * @implemented
  */
@@ -316,7 +309,6 @@
   KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc);
 }
 
-
 /*
  * @implemented
  */