From bab56cf4083c2d0695215ba785019532ffae5749 Mon Sep 17 00:00:00 2001
From: Joshua Hill
Date: Wed, 2 Jun 2010 04:13:25 +0800
Subject: Began major refactoring, not quite finished yet, this branch is
 probably broke

---
 src/dfu.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/dfu.c')

diff --git a/src/dfu.c b/src/dfu.c
index 5e13f38..1da895d 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -20,9 +20,37 @@
  */
 
 #include <stdint.h>
+#include <libirecovery.h>
 
 #include "dfu.h"
 
+int dfu_check_mode() {
+	irecv_client_t dfu = NULL;
+	irecv_error_t dfu_error = IRECV_E_SUCCESS;
+
+	dfu_error = irecv_open(&dfu);
+	if (dfu_error != IRECV_E_SUCCESS) {
+		return -1;
+	}
+
+	if(dfu->mode != kDfuMode) {
+		irecv_close(dfu);
+		return -1;
+	}
+
+	irecv_close(dfu);
+	dfu = NULL;
+	return 0;
+}
+
+int dfu_get_cpid(uint32_t* cpid) {
+	return 0;
+}
+
+int dfu_get_bdid(uint32_t* bdid) {
+	return 0;
+}
+
 int dfu_get_ecid(uint64_t* ecid) {
 	return 0;
 }
-- 
cgit v1.1-32-gdbae


From 7f98089a5e6663be50521063cf7171ab1bbc9fa2 Mon Sep 17 00:00:00 2001
From: Joshua Hill
Date: Sat, 5 Jun 2010 11:17:05 +0800
Subject: Even more major cleanups and refactoring, this branch is still broken
 but starting to mature really well

---
 src/dfu.c | 49 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 9 deletions(-)

(limited to 'src/dfu.c')

diff --git a/src/dfu.c b/src/dfu.c
index 1da895d..1a5a037 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -19,10 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <libirecovery.h>
 
 #include "dfu.h"
+#include "recovery.h"
+#include "idevicerestore.h"
 
 int dfu_check_mode() {
 	irecv_client_t dfu = NULL;
@@ -33,7 +36,7 @@ int dfu_check_mode() {
 		return -1;
 	}
 
-	if(dfu->mode != kDfuMode) {
+	if (dfu->mode != kDfuMode) {
 		irecv_close(dfu);
 		return -1;
 	}
@@ -43,14 +46,42 @@ int dfu_check_mode() {
 	return 0;
 }
 
-int dfu_get_cpid(uint32_t* cpid) {
-	return 0;
-}
+int dfu_enter_recovery(const char* ipsw, plist_t tss) {
+	irecv_client_t dfu = NULL;
+	const char* component = "iBSS";
+	irecv_error_t dfu_error = IRECV_E_SUCCESS;
+	if (recovery_open_with_timeout(&dfu) < 0 || dfu->mode != kDfuMode) {
+		error("ERROR: Unable to connect to DFU device\n");
+		if (dfu)
+			irecv_close(dfu);
+		return -1;
+	}
 
-int dfu_get_bdid(uint32_t* bdid) {
-	return 0;
-}
+	if (recovery_send_signed_component(dfu, ipsw, tss, "iBSS") < 0) {
+		error("ERROR: Unable to send %s to device\n", component);
+		irecv_close(dfu);
+		return -1;
+	}
 
-int dfu_get_ecid(uint64_t* ecid) {
+	dfu_error = irecv_reset(dfu);
+	if (dfu_error != IRECV_E_SUCCESS) {
+		error("ERROR: Unable to reset device\n");
+		irecv_close(dfu);
+		return -1;
+	}
+	irecv_close(dfu);
+	dfu = NULL;
+
+	// Reconnect to device, but this time make sure we're not still in DFU mode
+	if (recovery_open_with_timeout(&dfu) < 0 || dfu->mode == kDfuMode) {
+		error("ERROR: Unable to connect to recovery device\n");
+		if (dfu)
+			irecv_close(dfu);
+		return -1;
+	}
+
+	idevicerestore_mode = RECOVERY_MODE;
+	irecv_close(dfu);
+	dfu = NULL;
 	return 0;
 }
-- 
cgit v1.1-32-gdbae


From 9279f889d7e296880fd7ea9d6c7cec499db62ea4 Mon Sep 17 00:00:00 2001
From: Joshua Hill
Date: Sun, 6 Jun 2010 06:09:06 +0800
Subject: Changed the device type to a structure array for cleaner code and
 cross state access

---
 src/dfu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dfu.c')

diff --git a/src/dfu.c b/src/dfu.c
index 1a5a037..1b0e8e7 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -80,7 +80,7 @@ int dfu_enter_recovery(const char* ipsw, plist_t tss) {
 		return -1;
 	}
 
-	idevicerestore_mode = RECOVERY_MODE;
+	idevicerestore_mode = MODE_RECOVERY;
 	irecv_close(dfu);
 	dfu = NULL;
 	return 0;
-- 
cgit v1.1-32-gdbae