From e9481a266250ae6f93c0ccb75b0f6dcb7161bc27 Mon Sep 17 00:00:00 2001
From: LukeZGD <l32luke@gmail.com>
Date: Tue, 26 Oct 2021 11:41:09 +0800
Subject: [PATCH] Latest baseband option

---
 resources/device.sh    | 22 ++++++++++++++++++++++
 resources/downgrade.sh | 26 +++++++++++++++++++-------
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/resources/device.sh b/resources/device.sh
index 53f2f96..51fb987 100755
--- a/resources/device.sh
+++ b/resources/device.sh
@@ -160,6 +160,28 @@ GetDeviceValues() {
     Log "Device ECID: $UniqueChipID"
 }
 
+Baseband841() {
+    BasebandURL=$(cat $Firmware/12H321/url)
+    if [[ $ProductType == "iPad2,3" ]]; then
+        Baseband="Phoenix-3.0.04.Release.bbfw"
+        BasebandSHA1="a507ee2fe061dfbf8bee7e512df52ade8777e113"
+
+    elif [[ $ProductType == "iPad3,2" || $ProductType == "iPad3,3" ]]; then
+        Baseband="Mav4-5.4.00.Release.bbfw"
+        BasebandSHA1="b51f10bda04cd51f673a75d064c18af1ccb661fe"
+
+    elif [[ $ProductType == "iPhone4,1" ]]; then
+        Baseband="Trek-5.5.00.Release.bbfw"
+        BasebandSHA1="24849fa866a855e7e640c72c1cb2af6a0e30c742"
+
+    elif [[ $ProductType == "iPad2,6" || $ProductType == "iPad2,7" ||
+            $ProductType == "iPad3,5" || $ProductType == "iPad3,6" ||
+            $ProductType == "iPhone5,1" || $ProductType == "iPhone5,2" ]]; then
+        Baseband="Mav5-8.02.00.Release.bbfw"
+        BasebandSHA1="db71823841ffab5bb41341576e7adaaeceddef1c"
+    fi
+}
+
 CheckM8() {
     local pwnDFUTool
     local pwnDFUDevice
diff --git a/resources/downgrade.sh b/resources/downgrade.sh
index 90fd92c..52accb6 100755
--- a/resources/downgrade.sh
+++ b/resources/downgrade.sh
@@ -22,10 +22,12 @@ iDeviceRestore() {
 FRBaseband() {
     local BasebandSHA1L
     
-    if [[ $DeviceProc == 7 ]] || [[ $ProductType == "iPhone5,1" && $Baseband5 != 0 ]]; then
+    if [[ $DeviceProc == 7 ]] || [[ $Baseband5 != 0 && $OSVer == "8.4.1" ]]; then
         mkdir -p saved/baseband 2>/dev/null
         cp -f $IPSWRestore/Firmware/$Baseband saved/baseband
-    elif [[ ! -e saved/baseband/$Baseband ]]; then
+    fi
+
+    if [[ ! -e saved/baseband/$Baseband ]]; then
         Log "Downloading baseband..."
         $partialzip $BasebandURL Firmware/$Baseband $Baseband
         $partialzip $BasebandURL BuildManifest.plist BuildManifest.plist
@@ -33,7 +35,7 @@ FRBaseband() {
         mv $Baseband saved/baseband
         mv BuildManifest.plist saved/$ProductType
         BuildManifest="saved/$ProductType/BuildManifest.plist"
-    else
+    elif [[ $DeviceProc != 7 ]]; then
         BuildManifest="saved/$ProductType/BuildManifest.plist"
     fi
     
@@ -136,7 +138,7 @@ Downgrade() {
         echo
     fi
     
-    if [[ $Mode == "Downgrade" && $ProductType == "iPhone5,1" && $Jailbreak != 1 ]]; then
+    if [[ $ProductType == "iPhone5,1" && $Jailbreak != 1 ]]; then
         Input "Latest Baseband Option"
         Echo "* iOS-OTA-Downgrader flashes the iOS 8.4.1 baseband to iPhone5,1."
         Echo "* When this option is enabled, the latest baseband will be flashed instead, but beware of problems it may cause."
@@ -145,9 +147,19 @@ Downgrade() {
         if [[ $Baseband5 == 'Y' || $Baseband5 == 'y' ]]; then
             Baseband5=0
         else
-            BasebandURL=$(cat $Firmware/12H321/url)
-            Baseband="Mav5-8.02.00.Release.bbfw"
-            BasebandSHA1="db71823841ffab5bb41341576e7adaaeceddef1c"
+            Baseband841
+        fi
+        echo
+    elif [[ $DeviceProc != 7 && $ProductType != "iPad2,2" && $Jailbreak != 1 ]]; then
+        Input "Latest Baseband Option"
+        Echo "* iOS-OTA-Downgrader flashes the latest baseband to 32-bit devices."
+        Echo "* When this option is disabled, iOS 8.4.1 baseband will be flashed instead, but beware of problems it may cause."
+        Echo "* This option is enabled by default (Y)."
+        read -p "$(Input 'Enable this option? (Y/n):')" Baseband5
+        if [[ $Baseband5 == 'Y' || $Baseband5 == 'y' ]]; then
+            Baseband841
+        else
+            Baseband5=0
         fi
         echo
     fi