From b1fac869dc8c2c93a8d138a239f789cca6ecdd40 Mon Sep 17 00:00:00 2001
From: LukeZGD <l32luke@gmail.com>
Date: Sun, 28 Nov 2021 14:04:07 +0800
Subject: [PATCH] Latest baseband will now always be flashed

removed latest baseband option
---
 resources/blobs.sh     |  7 ++-----
 resources/device.sh    | 24 ------------------------
 resources/downgrade.sh | 23 ++---------------------
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/resources/blobs.sh b/resources/blobs.sh
index 00f314a..1b28642 100755
--- a/resources/blobs.sh
+++ b/resources/blobs.sh
@@ -7,7 +7,7 @@ SaveOTABlobs() {
     local SHSHLatest
     local SHSHExisting
     
-    if [[ $DeviceProc != 7 && $Baseband != 0 && $Baseband8 != 1 ]]; then
+    if [[ $DeviceProc != 7 && $Baseband != 0 ]]; then
         Log "Checking signing status of iOS $LatestVer..."
         SHSHChk=*_${ProductType}_${HWModel}ap_${LatestVer}*.shsh*
         $tsschecker -d $ProductType -i $LatestVer -e $UniqueChipID -s -B ${HWModel}ap
@@ -21,11 +21,8 @@ SaveOTABlobs() {
 
     Log "Saving iOS $OSVer blobs with tsschecker..."
     BuildManifest="resources/manifests/BuildManifest_${ProductType}_${OSVer}.plist"
-    ExtraArgs="-d $ProductType -i $OSVer -e $UniqueChipID -m $BuildManifest -o -s -B ${HWModel}ap --generator 0x1111111111111111"
+    ExtraArgs="-d $ProductType -i $OSVer -e $UniqueChipID -m $BuildManifest -o -s -B ${HWModel}ap --generator 0x1111111111111111 --no-baseband"
     SHSHChk=${UniqueChipID}_${ProductType}_${HWModel}ap_${OSVer}-${BuildVer}_3a88b7c3802f2f0510abc432104a15ebd8bd7154.shsh*
-    if [[ $Baseband8 != 1 ]]; then
-        ExtraArgs+=" --no-baseband"
-    fi
     $tsschecker $ExtraArgs
     
     SHSH=$(ls $SHSHChk)
diff --git a/resources/device.sh b/resources/device.sh
index 5ec28ff..e1012b1 100755
--- a/resources/device.sh
+++ b/resources/device.sh
@@ -168,30 +168,6 @@ GetDeviceValues() {
     Log "ECID: $UniqueChipID"
 }
 
-Baseband841() {
-    Baseband8=1
-    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 ee599c9..d2313fc 100755
--- a/resources/downgrade.sh
+++ b/resources/downgrade.sh
@@ -3,7 +3,7 @@
 FRBaseband() {
     local BasebandSHA1L
     
-    if [[ $DeviceProc == 7 ]] || [[ $Baseband8 == 1 && $OSVer == "8.4.1" ]]; then
+    if [[ $DeviceProc == 7 ]]; then
         mkdir -p saved/baseband 2>/dev/null
         cp -f $IPSWRestore/Firmware/$Baseband saved/baseband
     fi
@@ -16,7 +16,7 @@ FRBaseband() {
         mv $Baseband saved/baseband
         mv BuildManifest.plist saved/$ProductType
         BuildManifest="saved/$ProductType/BuildManifest.plist"
-    elif [[ $DeviceProc != 7 && $Baseband8 != 1 ]]; then
+    elif [[ $DeviceProc != 7 ]]; then
         BuildManifest="saved/$ProductType/BuildManifest.plist"
     fi
 
@@ -80,25 +80,6 @@ Downgrade() {
         echo
     fi
     
-    if [[ $DeviceProc != 7 && $ProductType != "iPad2,2" ]]; 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."
-        if [[ $ProductType == "iPhone5,1" ]]; then
-            Echo "* Based on some reported issues, the iPhone5,1 in particular may experience issues with the latest baseband."
-            Echo "* I recommend to disable the option for these devices to flash the iOS 8.4.1 baseband."
-        fi
-        Echo "* This option is enabled by default (Y)."
-        read -p "$(Input 'Enable this option? (Y/n):')" Baseband8
-        if [[ $Baseband8 == 'N' || $Baseband8 == 'n' ]]; then
-            Baseband841
-            Log "Latest baseband disabled by user. Using iOS 8.4.1 baseband"
-        else
-            Log "Latest baseband enabled."
-        fi
-        echo
-    fi
-    
     if [[ $OSVer != "Other" ]]; then
         IPSW="${IPSWType}_${OSVer}_${BuildVer}_Restore"
         IPSWCustom="${IPSWType}_${OSVer}_${BuildVer}_Custom"