summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Benjamin BOURGEAIS2021-05-06 17:35:56 +0200
committerGravatar Benjamin BOURGEAIS2021-05-08 14:16:50 +0200
commitcf05ffdbf6129b7bd223c102cfb2a0888ad2dcb2 (patch)
treea1fc6dd77c9cc3e300cf20b884cb82dfde2f79e0
parent7d24f8eb9e5fd32cee92746652a995ccd83e8401 (diff)
downloadidevicerestore-cf05ffdbf6129b7bd223c102cfb2a0888ad2dcb2.tar.gz
idevicerestore-cf05ffdbf6129b7bd223c102cfb2a0888ad2dcb2.tar.bz2
dfu: Send now-required stage 1 components
-rw-r--r--src/dfu.c76
1 files changed, 74 insertions, 2 deletions
diff --git a/src/dfu.c b/src/dfu.c
index 0c068d1..4277def 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -503,6 +503,74 @@ int dfu_enter_recovery(struct idevicerestore_client_t* client, plist_t build_ide
mutex_lock(&client->device_event_mutex);
+ // Now, before sending iBEC, we must send necessary firmwares on new versions.
+ if (client->build_major >= 20) {
+ // Without this empty policy file & its special signature, iBEC won't start.
+ if (dfu_send_component_and_command(client, build_identity, "Ap,LocalPolicy", "lpolrestore") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send Ap,LocalPolicy to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_iboot_stage1_components(client, build_identity) < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send iBoot stage 1 components to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_command(client, "setenv auto-boot false") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send command to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_command(client, "saveenv") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send command to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_command(client, "setenvnp boot-args rd=md0 nand-enable-reformat=1 -progress -restore") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send command to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_component(client, build_identity, "RestoreLogo") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send RestoreDCP to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_command(client, "setpicture 4") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send command to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+
+ if (dfu_send_command(client, "bgcolor 0 0 0") < 0) {
+ mutex_unlock(&client->device_event_mutex);
+ error("ERROR: Unable to send command to device\n");
+ irecv_close(client->dfu->client);
+ client->dfu->client = NULL;
+ return -1;
+ }
+ }
+
/* send iBEC */
if (dfu_send_component(client, build_identity, "iBEC") < 0) {
mutex_unlock(&client->device_event_mutex);
@@ -513,12 +581,16 @@ int dfu_enter_recovery(struct idevicerestore_client_t* client, plist_t build_ide
}
if (client->mode == &idevicerestore_modes[MODE_RECOVERY]) {
- if (irecv_send_command(client->dfu->client, "go") != IRECV_E_SUCCESS) {
+ sleep(1);
+ if (irecv_send_command_breq(client->dfu->client, "go", 1) != IRECV_E_SUCCESS) {
mutex_unlock(&client->device_event_mutex);
error("ERROR: Unable to execute iBEC\n");
return -1;
}
- irecv_usb_control_transfer(client->dfu->client, 0x21, 1, 0, 0, 0, 0, 5000);
+
+ if (client->build_major < 20) {
+ irecv_usb_control_transfer(client->dfu->client, 0x21, 1, 0, 0, 0, 0, 5000);
+ }
}
dfu_client_free(client);
}