From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 22 Oct 2004 20:08:22 +0000 (+0000)
Subject: Use ASSERT macro instead of assert macro.
X-Git-Tag: backups/new_headers@15094~37^2~31
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8c62a8159a6a2c61c8e681b8787b28d4a6344a49

Use ASSERT macro instead of assert macro.

svn path=/trunk/; revision=11388
---

diff --git a/reactos/hal/halx86/adapter.c b/reactos/hal/halx86/adapter.c
index 9bd90e48e4f..8c58a99f06e 100644
--- a/reactos/hal/halx86/adapter.c
+++ b/reactos/hal/halx86/adapter.c
@@ -1,4 +1,4 @@
-/* $Id: adapter.c,v 1.11 2004/07/22 18:49:18 navaraf Exp $
+/* $Id: adapter.c,v 1.12 2004/10/22 20:08:21 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -54,7 +54,7 @@ HalAllocateAdapterChannel(
   LARGE_INTEGER BoundryAddressMultiple;
   IO_ALLOCATION_ACTION Retval;
   
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
   
   /*
   FIXME: return STATUS_INSUFFICIENT_RESOURCES if the NumberOfMapRegisters 
@@ -157,7 +157,7 @@ IoFlushAdapterBuffers (
  *     - This is only meaningful on a read operation.  Return immediately for a write.
  */
 {
-  assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
   
   /* this can happen if the card supports scatter/gather */
   if(!MapRegisterBase)
@@ -317,9 +317,9 @@ IoMapTransfer (
   {
 #if 0
     /* channel 0 is reserved for DRAM refresh */
-    assert(AdapterObject->Channel != 0);
+    ASSERT(AdapterObject->Channel != 0);
     /* channel 4 is reserved for cascade */
-    assert(AdapterObject->Channel != 4);
+    ASSERT(AdapterObject->Channel != 4);
 #endif
 
     KeAcquireSpinLock(&AdapterObject->SpinLock, &OldIrql);
diff --git a/reactos/hal/halx86/pci.c b/reactos/hal/halx86/pci.c
index 21e2b521228..a30425540c4 100644
--- a/reactos/hal/halx86/pci.c
+++ b/reactos/hal/halx86/pci.c
@@ -1,4 +1,4 @@
-/* $Id: pci.c,v 1.11 2003/12/28 22:38:09 fireball Exp $
+/* $Id: pci.c,v 1.12 2004/10/22 20:08:22 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -717,7 +717,7 @@ HalpAssignPciSlotResources(IN PBUS_HANDLER BusHandler,
 	    }
 	  else
 	    {
-	      assert(FALSE);
+	      ASSERT(FALSE);
 	      return STATUS_UNSUCCESSFUL;
 	    }
 	  Descriptor++;
@@ -736,7 +736,7 @@ HalpAssignPciSlotResources(IN PBUS_HANDLER BusHandler,
       Descriptor++;
     }
 
-  assert(Descriptor == (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors + ResourceCount);
+  ASSERT(Descriptor == (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors + ResourceCount);
 
   /* FIXME: Should store the resources in the registry resource map */
 
diff --git a/reactos/hal/halx86/spinlock.c b/reactos/hal/halx86/spinlock.c
index 65d88c50df9..d4f4cbf37d8 100644
--- a/reactos/hal/halx86/spinlock.c
+++ b/reactos/hal/halx86/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.8 2004/02/10 15:16:12 gvg Exp $
+/* $Id: spinlock.c,v 1.9 2004/10/22 20:08:22 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -73,7 +73,7 @@ KfAcquireSpinLock (
 {
    KIRQL OldIrql;
 
-   assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
    
    OldIrql = KfRaiseIrql(DISPATCH_LEVEL);
    KiAcquireSpinLock(SpinLock);
@@ -93,7 +93,7 @@ KfReleaseSpinLock (
  *        NewIrql = Irql level before acquiring the spinlock
  */
 {
-   assert(KeGetCurrentIrql() == DISPATCH_LEVEL || KeGetCurrentIrql() == SYNCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL || KeGetCurrentIrql() == SYNCH_LEVEL);
    KiReleaseSpinLock(SpinLock);
    KfLowerIrql(NewIrql);
 }