From 76e9cfe1a85110ea6116f4066a72842dee386bb6 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Tue, 22 Oct 2019 12:45:32 +0800
Subject: [PATCH] fdb: version 37 (SKHynix25 optimizations)

---
 FlashDetector/resources/fdb.json              | 37 +++++--------------
 .../iTXTech/FlashDetector/Decoder/SKHynix.php |  2 +-
 .../FlashDetector/Decoder/SKHynix25.php       |  1 -
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/FlashDetector/resources/fdb.json b/FlashDetector/resources/fdb.json
index 9f2a5ce..1a5d913 100644
--- a/FlashDetector/resources/fdb.json
+++ b/FlashDetector/resources/fdb.json
@@ -1,9 +1,9 @@
 {
     "info": {
         "name": "iTXTech FlashDetector Flash Database",
-        "version": "36",
+        "version": "37",
         "website": "https:\/\/github.com\/iTXTech\/FlashDetector",
-        "time": "Tue, 15 Oct 2019 05:28:54 +0000",
+        "time": "Tue, 22 Oct 2019 04:44:29 +0000",
         "controllers": [
             "SM321AC",
             "SM321BB",
@@ -14056,7 +14056,7 @@
                 "AU6989SN-GTE"
             ]
         },
-        "H25QFT8A1A8R": {
+        "H25QFT8A1A": {
             "id": [
                 "AD5E28221090",
                 "AD5E283300A0",
@@ -14066,9 +14066,11 @@
             "c": "TLC",
             "t": [
                 "SM3268AB",
+                "SM3271AB",
                 "SM3281AB",
                 "SM3281BB",
                 "SM2258XT",
+                "SM2258",
                 "AU6989SN-GTC",
                 "AU6989SN-GTD",
                 "AU6989SN-GTE",
@@ -14086,17 +14088,7 @@
                 "SM3281BB"
             ]
         },
-        "H25QFT8A1A": {
-            "id": [
-                "AD5E28221090"
-            ],
-            "l": "3DV4",
-            "t": [
-                "SM3271AB",
-                "CBM2199"
-            ]
-        },
-        "H25BFT8B3M8R": {
+        "H25BFT8B3M": {
             "id": [
                 "AD5E283300A0"
             ],
@@ -14105,7 +14097,7 @@
                 "SM3271AB"
             ]
         },
-        "H25BFT8A1M8R": {
+        "H25BFT8A1M": {
             "id": [
                 "AD5E283300A0"
             ],
@@ -14825,7 +14817,7 @@
                 "SM2258"
             ]
         },
-        "H25QFTMF4A9R": {
+        "H25QFTMF4A": {
             "id": [
                 "AD5E29221090"
             ],
@@ -14899,15 +14891,6 @@
                 "CBM2199"
             ]
         },
-        "H25QFT8A1ADA": {
-            "id": [
-                "AD5E28221090"
-            ],
-            "t": [
-                "SM2258",
-                "CBM2199"
-            ]
-        },
         "H27Q2T8QPM": {
             "id": [
                 "AD5C29BA0080"
@@ -15397,7 +15380,7 @@
                 "AU6989SN-GTE"
             ]
         },
-        "H25QFT8B3A8R": {
+        "H25QFT8B3A": {
             "l": "3D V4",
             "c": "TLC",
             "t": [
@@ -15406,7 +15389,7 @@
                 "AU6989SN-GTE"
             ]
         },
-        "H25QFT8D4A8R": {
+        "H25QFT8D4A": {
             "l": "3D V4",
             "c": "TLC",
             "t": [
diff --git a/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix.php b/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix.php
index 11a1e3f..1438f1a 100644
--- a/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix.php
+++ b/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix.php
@@ -222,7 +222,7 @@ public static function getFlashInfoFromFdb(FlashInfo $info) : ?PartNumber{
 	}
 
 	public static function removePackage(string $pn) : string{
-		if(StringUtil::startsWith($pn, "H27") and strlen($pn) == 12){
+		if(strlen($pn) == 12 and (StringUtil::startsWith($pn, "H27") or StringUtil::startsWith($pn, "H25"))){
 			$pn = substr($pn, 0, 10);
 		}
 		return $pn;
diff --git a/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix25.php b/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix25.php
index 1ca6191..06b2145 100644
--- a/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix25.php
+++ b/FlashDetector/src/iTXTech/FlashDetector/Decoder/SKHynix25.php
@@ -20,7 +20,6 @@
 
 namespace iTXTech\FlashDetector\Decoder;
 
-
 use iTXTech\FlashDetector\Constants;
 use iTXTech\FlashDetector\FlashInfo;
 use iTXTech\FlashDetector\Property\FlashInterface;