fix spl qxp\qm download failure

nxp-imx · Feb 17, 2020 · 0b47f4d · 0b47f4d
1 parent 8b2eccb
commit 0b47f4d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/libuuu/hidreport.h b/libuuu/hidreport.h
@@ -35,20 +35,6 @@
 #include "trans.h"
 #include <string.h>
 
-#define ROM_INFO_HID					   0x1
-#define ROM_INFO_HID_MX23				   0x2
-#define ROM_INFO_HID_MX50				   0x4
-#define ROM_INFO_HID_MX6				   0x8
-#define ROM_INFO_HID_SKIP_DCD			  0x10
-#define ROM_INFO_HID_MX8_MULTI_IMAGE	  0x20
-#define ROM_INFO_HID_MX8_STREAM			  0x40
-#define ROM_INFO_HID_UID_STRING			  0x80
-#define ROM_INFO_HID_NO_CMD				 0x400
-#define ROM_INFO_SPL_JUMP				 0x800
-#define ROM_INFO_HID_EP1				0x1000
-#define ROM_INFO_AUTO_SCAN_UBOOT_POS	0x2000
-#define ROM_INO_3CONTAINER				0x4000
-
 #pragma once
 
 using namespace std;

diff --git a/libuuu/rominfo.cpp b/libuuu/rominfo.cpp
@@ -51,7 +51,7 @@ ROM_INFO g_RomInfo[] =
 	{ "MX7ULP",	 0x2f018000, ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
 	{ "MXRT106X",	 0x1000,     ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_HID_SKIP_DCD },
 	{ "MX8QXP",      0x0,        ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING },
-	{ "MX8DXL",      0x0,        ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING | ROM_INO_3CONTAINER },
+	{ "MX8DXL",      0x0,        ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING | ROM_INFO_3CONTAINER },
 	{ "MX28",	 0x0,        ROM_INFO_HID},
 	{ "MX815",       0x0,        ROM_INFO_HID | ROM_INFO_HID_NO_CMD | ROM_INFO_HID_UID_STRING | ROM_INFO_HID_EP1 | ROM_INFO_HID_PACK_SIZE_1020 },
 	{ "SPL",	 0x0,	     ROM_INFO_HID | ROM_INFO_HID_MX6 | ROM_INFO_SPL_JUMP | ROM_INFO_HID_SDP_NO_MAX_PER_TRANS},

diff --git a/libuuu/rominfo.h b/libuuu/rominfo.h
@@ -45,6 +45,8 @@
 #define ROM_INFO_HID_EP1				0x1000
 #define ROM_INFO_HID_PACK_SIZE_1020		0x2000
 #define ROM_INFO_HID_SDP_NO_MAX_PER_TRANS	0x4000
+#define ROM_INFO_AUTO_SCAN_UBOOT_POS		0x8000
+#define ROM_INFO_3CONTAINER			0x10000
 
 #include <stdint.h>
 #include <stddef.h>

diff --git a/libuuu/sdp.cpp b/libuuu/sdp.cpp
@@ -235,7 +235,7 @@ int SDPWriteCmd::run(CmdCtx*ctx)
 			}
 			else
 			{
-				offset += GetContainerActualSize(fbuff, offset, rom->flags & ROM_INO_3CONTAINER? 3: 2);
+				offset += GetContainerActualSize(fbuff, offset, rom->flags & ROM_INFO_3CONTAINER? 3: 2);
 			}
 
 			if (offset >= fbuff->size())

diff --git a/libuuu/sdps.cpp b/libuuu/sdps.cpp
@@ -114,7 +114,7 @@ int SDPSCmd::run(CmdCtx *pro)
 		return -1;
 	}
 
-	size_t sz = GetContainerActualSize(p, offset, rom->flags & ROM_INO_3CONTAINER ? 3 : 2);
+	size_t sz = GetContainerActualSize(p, offset, rom->flags & ROM_INFO_3CONTAINER ? 3 : 2);
 
 	if (!(rom->flags & ROM_INFO_HID_NO_CMD))
 	{
-Original file line number
+Diff line change
@@ Expand Up / @@ -235,7 +235,7 @@ int SDPWriteCmd::run(CmdCtx*ctx) @@
     			}
     			else
     			{
-    				offset += GetContainerActualSize(fbuff, offset, rom->flags & ROM_INO_3CONTAINER? 3: 2);
+    				offset += GetContainerActualSize(fbuff, offset, rom->flags & ROM_INFO_3CONTAINER? 3: 2);
     			}
     			if (offset >= fbuff->size())
@@ Expand Down @@