Fix some asserts and defines

Author: Cosmos-OpenSSD

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/low_level_scheduler.c

@@ -79,7 +79,7 @@
 #include "fmc_driver.h"
 #include "low_level_scheduler.h"
 #include "memory_map.h"
-#include "host_lld.h"
+#include "nvme/host_lld.h"
 #include <assert.h>
 
 struct reqArray* reqQueue;

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/lru_buffer.c

@@ -48,7 +48,7 @@
 #include	"page_map.h"
 #include	"lru_buffer.h"
 #include	"memory_map.h"
-#include	"host_lld.h"
+#include	"nvme/host_lld.h"
 #include	"low_level_scheduler.h"
 
 struct bufArray* bufMap;

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/main.c

@@ -58,11 +58,11 @@
 #include "xscugic_hw.h"
 #include "xscugic.h"
 #include "xil_printf.h"
-#include "debug.h"
+#include "nvme/debug.h"
 
-#include "nvme.h"
-#include "nvme_main.h"
-#include "host_lld.h"
+#include "nvme/nvme.h"
+#include "nvme/nvme_main.h"
+#include "nvme/host_lld.h"
 
 
 XScuGic GicInstance;

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/nvme/nvme_admin_cmd.c

@@ -314,7 +314,7 @@ void handle_identify(NVME_ADMIN_COMMAND *nvmeAdminCmd, NVME_COMPLETION *nvmeCPL)
 		if((nvmeAdminCmd->PRP1[0] & 0xF) != 0 || (nvmeAdminCmd->PRP2[0] & 0xF) != 0)
 			xil_printf("NI: %X, %X, %X, %X\r\n", nvmeAdminCmd->PRP1[1], nvmeAdminCmd->PRP1[0], nvmeAdminCmd->PRP2[1], nvmeAdminCmd->PRP2[0]);
 
-		ASSERT(nvmeAdminCmd->NSID == 1);
+		//ASSERT(nvmeAdminCmd->NSID == 1);
 		ASSERT((nvmeAdminCmd->PRP1[0] & 0xF) == 0 && (nvmeAdminCmd->PRP2[0] & 0xF) == 0);
 		identify_namespace(pIdentifyData);
 	}

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/nvme/nvme_identify.c

@@ -55,7 +55,7 @@
 
 #include "nvme.h"
 #include "nvme_identify.h"
-#include "init_ftl.h"
+#include "../init_ftl.h"
 
 void identify_controller(unsigned int pBuffer)
 {

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/nvme/nvme_io_cmd.c

@@ -58,7 +58,7 @@
 #include "host_lld.h"
 #include "nvme_io_cmd.h"
 
-#include "lru_buffer.h"
+#include "../lru_buffer.h"
 
 void handle_nvme_io_read(unsigned int cmdSlotTag, NVME_IO_COMMAND *nvmeIOCmd)
 {
@@ -78,7 +78,7 @@ void handle_nvme_io_read(unsigned int cmdSlotTag, NVME_IO_COMMAND *nvmeIOCmd)
 	nlb = readInfo12.NLB;
 
 	ASSERT(startLba[0] < storageCapacity_L && (startLba[1] < STORAGE_CAPACITY_H || startLba[1] == 0));
-	ASSERT(nlb < MAX_NUM_OF_NLB);
+	//ASSERT(nlb < MAX_NUM_OF_NLB);
 	ASSERT((nvmeIOCmd->PRP1[0] & 0xF) == 0 && (nvmeIOCmd->PRP2[0] & 0xF) == 0); //error
 	ASSERT(nvmeIOCmd->PRP1[1] < 0x10 && nvmeIOCmd->PRP2[1] < 0x10);
 
@@ -111,7 +111,7 @@ void handle_nvme_io_write(unsigned int cmdSlotTag, NVME_IO_COMMAND *nvmeIOCmd)
 	nlb = writeInfo12.NLB;
 
 	ASSERT(startLba[0] < storageCapacity_L && (startLba[1] < STORAGE_CAPACITY_H || startLba[1] == 0));
-	ASSERT(nlb < MAX_NUM_OF_NLB);
+	//ASSERT(nlb < MAX_NUM_OF_NLB);
 	ASSERT((nvmeIOCmd->PRP1[0] & 0xF) == 0 && (nvmeIOCmd->PRP2[0] & 0xF) == 0);
 	ASSERT(nvmeIOCmd->PRP1[1] < 0x10 && nvmeIOCmd->PRP2[1] < 0x10);
 

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/nvme/nvme_main.c

@@ -67,8 +67,8 @@
 #include "nvme_admin_cmd.h"
 #include "nvme_io_cmd.h"
 
-#include "lru_buffer.h"
-#include "low_level_scheduler.h"
+#include "../lru_buffer.h"
+#include "../low_level_scheduler.h"
 
 volatile NVME_CONTEXT g_nvmeTask;
 

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/page_map.c

@@ -74,7 +74,7 @@
 #include "page_map.h"
 #include "low_level_scheduler.h"
 #include "memory_map.h"
-#include "host_lld.h"
+#include "nvme/host_lld.h"
 #include <assert.h>
 
 struct pmArray* pageMap;

Prebuild/Prebuild-3.0.0/GreedyFTL-2.7.0/page_map.h

@@ -56,7 +56,7 @@
 #define PAGE_MAP_H_
 
 #include "init_ftl.h"
-#include "nvme.h"
+#include "nvme/nvme.h"
 #include "xil_printf.h"
 #include "internal_req.h"