FDB: version 48 (fdfdb updates)

FDBGen: remove package for SpecTek FDBGen: fix SKhynix in SMI ForceFlash
iTXTech · Dec 30, 2019 · 19092e0 · 19092e0
1 parent 47c7c53
commit 19092e0
Show file tree

Hide file tree

Showing 8 changed files with 50,481 additions and 6,417 deletions.
diff --git a/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/AlcorMicro.php b/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/AlcorMicro.php
@@ -22,6 +22,7 @@
 
 use iTXTech\FlashDetector\Decoder\Micron;
 use iTXTech\FlashDetector\Decoder\SKHynix;
+use iTXTech\FlashDetector\Decoder\SpecTek;
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
@@ -55,6 +56,9 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 				}
 			}
 			switch($vendor){
+				case "spectek":
+					$pn = SpecTek::removePackage($pn);
+					break;
 				case "micron":
 					$pn = Micron::removePackage($pn);
 					break;

diff --git a/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/ChipsBank.php b/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/ChipsBank.php
@@ -22,6 +22,7 @@
 
 use iTXTech\FlashDetector\Decoder\Micron;
 use iTXTech\FlashDetector\Decoder\SKHynix;
+use iTXTech\FlashDetector\Decoder\SpecTek;
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
@@ -62,8 +63,9 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 				}
 			}
 			foreach($fdb->getVendor($vendor)->getPartNumbers() as $pn => $flash){
-				foreach($flash->getFlashIds() as $ids){
-					if(StringUtil::startsWith($ids, $flashId)){
+				foreach($flash->getFlashIds() as $id){
+					if(StringUtil::startsWith($id, $flashId)){
+						$fdb->getIddb()->getFlashId($id)->addController($sup);
 						$flash->addController($sup);
 						$found = true;
 						break;
@@ -73,6 +75,9 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 			if(!$found){
 				$pn = str_replace(["(T)", "(TOG)", "(TOG"], "", $rec[3]);
 				switch($vendor){
+					case "spectek":
+						$pn = SpecTek::removePackage($pn);
+						break;
 					case "micron":
 						$pn = Micron::removePackage($pn);
 					case "toshiba":

diff --git a/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionForceFlash.php b/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionForceFlash.php
@@ -20,6 +20,9 @@
 
 namespace iTXTech\FlashDetector\FDBGen\Generator;
 
+use iTXTech\FlashDetector\Decoder\Micron;
+use iTXTech\FlashDetector\Decoder\SKHynix;
+use iTXTech\FlashDetector\Decoder\SpecTek;
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
@@ -31,7 +34,7 @@ public static function getDirName() : string{
 	public static function merge(Fdb $fdb, string $data, string $filename) : void{
 		$data = explode("\r\n", mb_convert_encoding($data, "UTF-8", "UTF-8"));
 		foreach($data as $line => $d){
-			if(!StringUtil::startsWith($d, "A")){
+			if(count($parts = explode("=", $d)) > 1 and !StringUtil::contains($parts[1], ",")){
 				$d = explode(",", explode("_", $d)[0]);
 				if(count($d) == 6){
 					for($i = 0; $i < 6; $i++){
@@ -56,12 +59,25 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 					}
 					$info = explode(",", $index);
 					$pn = explode("_", str_replace(" ", "", explode("(", @end($info))[0]))[0];
-					$vendor = str_replace([" ", "tsb", "ss", "hy", "hynix"], ["", "toshiba", "samsung", "hynix", "skhynix"],
-						strtolower(explode("_", $info[0])[0]));
+					$vendor = str_replace("skhynixnix", "skhynix",
+						str_replace([" ", "tsb", "ss", "hy", "hynix"], ["", "toshiba", "samsung", "hynix", "skhynix"],
+							strtolower(explode("_", $info[0])[0])));
 					if(is_numeric($vendor{strlen($vendor) - 1})){
 						$vendor = substr($vendor, 0, strlen($vendor) - 1);
 					}
 
+					switch($vendor){
+						case "spectek":
+							$pn = SpecTek::removePackage($pn);
+							break;
+						case "micron":
+							$pn = Micron::removePackage($pn);
+							break;
+						case "skhynix":
+							$pn = SKHynix::removePackage($pn);
+							break;
+					}
+
 					$fdb->getPartNumber($vendor, $pn, true)
 						->addFlashId($d);
 

diff --git a/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionSSD.php b/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionSSD.php
@@ -22,6 +22,7 @@
 
 use iTXTech\FlashDetector\Decoder\Micron;
 use iTXTech\FlashDetector\Decoder\SKHynix;
+use iTXTech\FlashDetector\Decoder\SpecTek;
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
@@ -67,6 +68,9 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 					}
 				}
 				switch($vendor){
+					case "spectek":
+						$pn = SpecTek::removePackage($pn);
+						break;
 					case "micron":
 						$pn = Micron::removePackage($pn);
 						break;

diff --git a/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionUFD.php b/FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/SiliconMotionUFD.php
@@ -22,6 +22,7 @@
 
 use iTXTech\FlashDetector\Decoder\Micron;
 use iTXTech\FlashDetector\Decoder\SKHynix;
+use iTXTech\FlashDetector\Decoder\SpecTek;
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
@@ -84,6 +85,9 @@ public static function merge(Fdb $fdb, string $data, string $filename) : void{
 					case "micron":
 						$info[1] = Micron::removePackage($info[1]);
 						break;
+					case "spectek":
+						$info[1] = SpecTek::removePackage($info[1]);
+						break;
 				}
 
 				$pn = $fdb->getPartNumber($vendor, $info[1], true)