fixed disabling fallback timer

fixed alpha build
enabled building inside w2k/nt4 subdirs instead of copying makefiles first

Author: techomancer

nt4/SOURCES

@@ -6,9 +6,9 @@ INCLUDES=$(BASEDIR)\src\storage\inc
 
 TARGETLIBS=$(BASEDIR)\lib\*\$(DDKBUILDENV)\scsiport.lib
 
-SOURCES=nvme2k.c        \
-	nvme2k_cpl.c    \
-	nvme2k_scsi.c   \
-	nvme2k_nvme.c   \
-	utils.c         \
-	nvme2k.rc
+SOURCES=..\nvme2k.c        \
+	..\nvme2k_cpl.c    \
+	..\nvme2k_scsi.c   \
+	..\nvme2k_nvme.c   \
+	..\utils.c         \
+	..\nvme2k.rc

nvme2k.c

@@ -202,7 +202,7 @@ ULONG HwFoundAdapter(
         }
     }
 
-#if (_WIN32_WINNT >= 0x500)
+#if (_WIN32_WINNT >= 0x500 && !defined(ALPHA))
     accessRange->RangeStart = ScsiPortConvertUlongToPhysicalAddress(ScsiPortConvertPhysicalAddressToULongPtr(bar0));
 #else
     accessRange->RangeStart = ScsiPortConvertUlongToPhysicalAddress(bar0.LowPart);
@@ -737,8 +737,8 @@ VOID FallbackTimer(IN PVOID DeviceExtension)
     PHW_DEVICE_EXTENSION DevExt = (PHW_DEVICE_EXTENSION)DeviceExtension;
 
     DevExt->FallbackTimerNeeded++;
-    if (!DevExt->FallbackTimerNeeded)
-        DevExt->FallbackTimerNeeded = 1;
+    if (!DevExt->FallbackTimerNeeded) // wraparound
+        DevExt->FallbackTimerNeeded = 2; // because 1 means fallbacktime didnt fire
 
     NvmeProcessAdminCompletion(DevExt);
     NvmeProcessIoCompletion(DevExt);
@@ -752,11 +752,12 @@ BOOLEAN HwInterrupt(IN PVOID DeviceExtension)
     PHW_DEVICE_EXTENSION DevExt = (PHW_DEVICE_EXTENSION)DeviceExtension;
     BOOLEAN interruptHandled = FALSE;
 
+    DevExt->InterruptCount++;
     if (DevExt->FallbackTimerNeeded) {
         // cancel the fallback timer
         ScsiPortNotification(RequestTimerCall, DeviceExtension, FallbackTimer, 0);
-        // interrupts worked a million times, we probably dont need a fallback
-        if (DevExt->FallbackTimerNeeded >= 1000000) {
+        // interrupts worked a million times, and callback didnt fire we probably dont need a fallback
+        if (DevExt->InterruptCount >= 1000000 && DevExt->FallbackTimerNeeded == 1) {
             DevExt->FallbackTimerNeeded = 0;
         }
     }   

nvme2k.h

@@ -172,7 +172,7 @@ typedef struct _HW_DEVICE_EXTENSION {
     BOOLEAN InitComplete;                           // Offset 0xB7 (183)
 
     ULONG Reserved4a;                               // Offset 0xB8 (184)
-    ULONG Reserved4b;                               // Offset 0xBC (188)
+    ULONG InterruptCount;                           // Offset 0xBC (188)
 
     // PRP list pages for scatter-gather (shared pool, allocated after init)
     // Note: During init, UtilityBuffer points to the same memory

nvme2k_nvme.c

@@ -1196,6 +1196,7 @@ BOOLEAN NvmeInitializeController(IN PHW_DEVICE_EXTENSION DevExt)
     // Start the initialization sequence
     DevExt->InitComplete = FALSE;
     DevExt->FallbackTimerNeeded = 1;
+    DevExt->InterruptCount = 0;
     NvmeCreateIoCQ(DevExt);
 
     // POLL for init completion (interrupts are masked during init)

w2k/sources

@@ -15,20 +15,20 @@ MSC_WARNING_LEVEL=/W3 /WX
 # Platform-specific source files
 !IF $(ALPHA)
 DRIVER_ALIGNMENT=0x2000
-SOURCES=nvme2k.c       \
-        nvme2k_cpl.c   \
-        nvme2k_nvme.c  \
-        nvme2k_scsi.c  \
-        utils.c        \
-        nvme2k.rc
+SOURCES=..\nvme2k.c       \
+        ..\nvme2k_cpl.c   \
+        ..\nvme2k_nvme.c  \
+        ..\nvme2k_scsi.c  \
+        ..\utils.c        \
+        ..\nvme2k.rc
 
 !ELSE
 DRIVER_ALIGNMENT=0x1000
-SOURCES=nvme2k.c       \
-        nvme2k_cpl.c   \
-        nvme2k_nvme.c  \
-        nvme2k_scsi.c  \
-        utils.c        \
-        nvme2k.rc
+SOURCES=..\nvme2k.c       \
+        ..\nvme2k_cpl.c   \
+        ..\nvme2k_nvme.c  \
+        ..\nvme2k_scsi.c  \
+        ..\utils.c        \
+        ..\nvme2k.rc
 !ENDIF