[ros-diffs] [dgorbachev] 37827: Silence compiler warnings (5/11).

dgorbachev at svn.reactos.org dgorbachev at svn.reactos.org
Wed Dec 3 18:31:38 CET 2008


Author: dgorbachev
Date: Wed Dec  3 11:31:38 2008
New Revision: 37827

URL: http://svn.reactos.org/svn/reactos?rev=37827&view=rev
Log:
Silence compiler warnings (5/11).

Modified:
    trunk/reactos/hal/halx86/generic/cmos.c
    trunk/reactos/hal/halx86/generic/dma.c
    trunk/reactos/hal/halx86/generic/pci.c
    trunk/reactos/hal/halx86/generic/reboot.c

Modified: trunk/reactos/hal/halx86/generic/cmos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?rev=37827&r1=37826&r2=37827&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Wed Dec  3 11:31:38 2008
@@ -19,8 +19,8 @@
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
+FORCEINLINE
 UCHAR
-FORCEINLINE
 HalpReadCmos(IN UCHAR Reg)
 {
     /* Select the register */
@@ -30,8 +30,8 @@
     return READ_PORT_UCHAR(CMOS_DATA_PORT);
 }
 
+FORCEINLINE
 VOID
-FORCEINLINE
 HalpWriteCmos(IN UCHAR Reg,
               IN UCHAR Value)
 {

Modified: trunk/reactos/hal/halx86/generic/dma.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?rev=37827&r1=37826&r2=37827&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Dec  3 11:31:38 2008
@@ -1073,7 +1073,7 @@
 {
    PADAPTER_OBJECT MasterAdapter;
    PGROW_WORK_ITEM WorkItem;
-   ULONG Index = ~0;
+   ULONG Index = ~0U;
    ULONG Result;
    KIRQL OldIrql;
 
@@ -1129,7 +1129,7 @@
       {
          Index = RtlFindClearBitsAndSet(
             MasterAdapter->MapRegisters, NumberOfMapRegisters, 0);
-         if (Index != ~0)
+         if (Index != ~0U)
          {
             AdapterObject->MapRegisterBase =
                MasterAdapter->MapRegisterBase + Index;
@@ -1143,7 +1143,7 @@
          }
       }
 
-      if (Index == ~0)
+      if (Index == ~0U)
       {
          WorkItem = ExAllocatePoolWithTag(
             NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA);
@@ -1287,7 +1287,7 @@
             Index = RtlFindClearBitsAndSet(
                MasterAdapter->MapRegisters,
                WaitContextBlock->NumberOfMapRegisters, 0);
-            if (Index != ~0)
+            if (Index != ~0U)
             {
                AdapterObject->MapRegisterBase =
                   MasterAdapter->MapRegisterBase + Index;
@@ -1301,7 +1301,7 @@
             }
          }
 
-         if (Index == ~0)
+         if (Index == ~0U)
          {
             InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue);
             KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
@@ -1404,7 +1404,7 @@
          MasterAdapter->MapRegisters,
          AdapterObject->NumberOfMapRegisters,
          MasterAdapter->NumberOfMapRegisters);
-      if (Index == ~0)
+      if (Index == ~0U)
       {
          InsertHeadList(&MasterAdapter->AdapterQueue, ListEntry);
          break;
@@ -1602,7 +1602,7 @@
    {
       if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG)
       {
-         if (RealMapRegisterBase->Counter != ~0)
+         if (RealMapRegisterBase->Counter != ~0U)
          {
             if (SlaveDma && !AdapterObject->IgnoreCount)
                Length -= HalReadDmaCounter(AdapterObject);
@@ -1984,13 +1984,12 @@
         }
 
         /* Try to find free map registers */
-        MapRegisterNumber = -1;
         MapRegisterNumber = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters,
                                                    *NumberOfMapRegisters,
                                                    0);
 
         /* Check if nothing was found */
-        if (MapRegisterNumber == -1)
+        if (MapRegisterNumber == -1U)
         {
             /* No free registers found, so use the base registers */
             RtlSetBits(MasterAdapter->MapRegisters,

Modified: trunk/reactos/hal/halx86/generic/pci.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?rev=37827&r1=37826&r2=37827&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Wed Dec  3 11:31:38 2008
@@ -81,10 +81,10 @@
         HalpWritePCIConfig,
         NULL,
         NULL,
-        {{{0}}},
+        {{{0, 0, 0}}},
         {0, 0, 0, 0}
     },
-    {{0}},
+    {{0, 0}},
     32,
 };
 

Modified: trunk/reactos/hal/halx86/generic/reboot.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.c?rev=37827&r1=37826&r2=37827&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Wed Dec  3 11:31:38 2008
@@ -29,7 +29,7 @@
 {
     UCHAR Data;
     PVOID HalpZeroPageMapping;
-    PHYSICAL_ADDRESS Null = {{0}};
+    PHYSICAL_ADDRESS Null = {{0, 0}};
 
     /* Enable warm reboot */
     HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached);



More information about the Ros-diffs mailing list