- There is no reason to use the Kf* routines for IRQL and Spinlocks directly in HAL...

[reactos.git] / reactos / hal / halx86 / generic / dma.c

diff --git a/reactos/hal/halx86/generic/dma.c b/reactos/hal/halx86/generic/dma.c
index 6bda263..498fa34 100644 (file)
--- a/reactos/hal/halx86/generic/dma.c
+++ b/reactos/hal/halx86/generic/dma.c
@@ -251,7 +251,7 @@ HalpGrowMapBuffers(
     * to prevent corruption.
     */
 
-   OldIrql = KfAcquireSpinLock(&AdapterObject->SpinLock);
+   KeAcquireSpinLock(&AdapterObject->SpinLock, &OldIrql);
 
    /*
     * Setup map register entries for the buffer allocated. Each entry has
@@ -315,7 +315,7 @@ HalpGrowMapBuffers(
       while (MapRegisterCount != 0);
    }
 
-   KfReleaseSpinLock(&AdapterObject->SpinLock, OldIrql);
+   KeReleaseSpinLock(&AdapterObject->SpinLock, OldIrql);
 
    return TRUE;
 }
@@ -1125,7 +1125,7 @@ HalAllocateAdapterChannel(
        *   PASSIVE_LEVEL and calling the ExecutionRoutine.
        */
 
-      OldIrql = KfAcquireSpinLock(&MasterAdapter->SpinLock);
+      KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql);
 
       if (IsListEmpty(&MasterAdapter->AdapterQueue))
       {
@@ -1151,7 +1151,7 @@ HalAllocateAdapterChannel(
             NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA);
          if (WorkItem == NULL)
          {
-            KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+            KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
             AdapterObject->NumberOfMapRegisters = 0;
             IoFreeAdapterChannel(AdapterObject);
             return STATUS_INSUFFICIENT_RESOURCES;
@@ -1166,12 +1166,12 @@ HalAllocateAdapterChannel(
 
          ExQueueWorkItem(&WorkItem->WorkQueueItem, DelayedWorkQueue);
 
-         KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+         KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
 
          return STATUS_SUCCESS;
       }
 
-      KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+      KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
    }
    else
    {
@@ -1282,7 +1282,7 @@ IoFreeAdapterChannel(
       if (WaitContextBlock->NumberOfMapRegisters &&
           AdapterObject->MasterAdapter)
       {
-         OldIrql = KfAcquireSpinLock(&MasterAdapter->SpinLock);
+          KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql);
 
          if (IsListEmpty(&MasterAdapter->AdapterQueue))
          {
@@ -1306,11 +1306,11 @@ IoFreeAdapterChannel(
          if (Index == MAXULONG)
          {
             InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue);
-            KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+            KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
             break;
          }
 
-         KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+         KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
       }
       else
       {
@@ -1378,7 +1378,7 @@ IoFreeMapRegisters(
    if (MasterAdapter == NULL || MapRegisterBase == NULL)
       return;
 
-   OldIrql = KfAcquireSpinLock(&MasterAdapter->SpinLock);
+   KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql);
 
    if (NumberOfMapRegisters != 0)
    {
@@ -1412,7 +1412,7 @@ IoFreeMapRegisters(
          break;
       }
 
-      KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+      KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
 
       AdapterObject->MapRegisterBase =
          MasterAdapter->MapRegisterBase + Index;
@@ -1439,12 +1439,12 @@ IoFreeMapRegisters(
          case DeallocateObject:
             if (AdapterObject->NumberOfMapRegisters)
             {
-               OldIrql = KfAcquireSpinLock(&MasterAdapter->SpinLock);
+               KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql);
                RtlClearBits(MasterAdapter->MapRegisters,
                             AdapterObject->MapRegisterBase -
                             MasterAdapter->MapRegisterBase,
                             AdapterObject->NumberOfMapRegisters);
-               KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+               KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
             }
             IoFreeAdapterChannel(AdapterObject);
             break;
@@ -1453,10 +1453,10 @@ IoFreeMapRegisters(
             break;
       }
 
-      OldIrql = KfAcquireSpinLock(&MasterAdapter->SpinLock);
+      KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql);
    }
 
-   KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
+   KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql);
 }
 
 /**
@@ -1865,7 +1865,7 @@ IoMapTransfer(
          TransferOffset >>= 1;
       }
 
-      OldIrql = KfAcquireSpinLock(&AdapterObject->MasterAdapter->SpinLock);
+      KeAcquireSpinLock(&AdapterObject->MasterAdapter->SpinLock, &OldIrql);
 
       if (AdapterObject->AdapterNumber == 1)
       {
@@ -1932,7 +1932,7 @@ IoMapTransfer(
                           AdapterObject->ChannelNumber | DMA_CLEARMASK);
       }
 
-      KfReleaseSpinLock(&AdapterObject->MasterAdapter->SpinLock, OldIrql);
+      KeReleaseSpinLock(&AdapterObject->MasterAdapter->SpinLock, OldIrql);
    }
 
    /*