From d82a73f1180a5f201397b92e6f6db33411cbe686 Mon Sep 17 00:00:00 2001
From: Joshua Hill
Date: Sat, 6 Nov 2010 18:09:53 -0400
Subject: updated libirecovery to the latest version from greenpois0n. it at
least compiles on osx now, I need to test on other systems
---
include/libirecovery.h | 150 +++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 128 insertions(+), 22 deletions(-)
(limited to 'include/libirecovery.h')
diff --git a/include/libirecovery.h b/include/libirecovery.h
index 2ef1ae3..3220669 100644
--- a/include/libirecovery.h
+++ b/include/libirecovery.h
@@ -1,19 +1,20 @@
/**
- * iRecovery - Utility for DFU 2.0, WTF and Recovery Mode
- * Copyright (C) 2008 - 2009 westbaer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * GreenPois0n iRecovery - libirecovery.h
+ * Copyright (C) 2010 Chronic-Dev Team
+ * Copyright (C) 2010 Joshua Hill
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
**/
#ifndef LIBIRECOVERY_H
@@ -23,10 +24,52 @@
extern "C" {
#endif
+#ifndef WIN32
#include
+#else
+#define WIN32_LEAN_AND_MEAN
+#include
+#define sleep(n) Sleep(1000 * n)
+#endif
#define APPLE_VENDOR_ID 0x05AC
+#define CPID_UNKNOWN -1
+#define CPID_IPHONE2G 8900
+#define CPID_IPOD1G 8900
+#define CPID_IPHONE3G 8900
+#define CPID_IPOD2G 8720
+#define CPID_IPHONE3GS 8920
+#define CPID_IPOD3G 8922
+#define CPID_IPAD1G 8930
+#define CPID_IPHONE4 8930
+#define CPID_IPOD4G 8930
+#define CPID_APPLETV2 8930
+
+#define BDID_UNKNOWN -1
+#define BDID_IPHONE2G 0
+#define BDID_IPOD1G 2
+#define BDID_IPHONE3G 4
+#define BDID_IPOD2G 0
+#define BDID_IPHONE3GS 0
+#define BDID_IPOD3G 2
+#define BDID_IPAD1G 2
+#define BDID_IPHONE4 0
+#define BDID_IPOD4G 8
+#define BDID_APPLETV2 10
+
+#define DEVICE_UNKNOWN -1
+#define DEVICE_IPHONE2G 0
+#define DEVICE_IPOD1G 1
+#define DEVICE_IPHONE3G 2
+#define DEVICE_IPOD2G 3
+#define DEVICE_IPHONE3GS 4
+#define DEVICE_IPOD3G 5
+#define DEVICE_IPAD1G 6
+#define DEVICE_IPHONE4 7
+#define DEVICE_IPOD4G 8
+#define DEVICE_APPLETV2 9
+
enum {
kRecoveryMode1 = 0x1280,
kRecoveryMode2 = 0x1281,
@@ -46,6 +89,8 @@ typedef enum {
IRECV_E_USB_STATUS = -7,
IRECV_E_USB_INTERFACE = -8,
IRECV_E_USB_CONFIGURATION = -9,
+ IRECV_E_PIPE = -10,
+ IRECV_E_TIMEOUT = -11,
IRECV_E_UNKNOWN_ERROR = -255
} irecv_error_t;
@@ -67,6 +112,7 @@ typedef struct {
struct irecv_client;
typedef struct irecv_client* irecv_client_t;
+typedef struct irecv_device* irecv_device_t;
typedef int(*irecv_event_cb_t)(irecv_client_t client, const irecv_event_t* event);
struct irecv_client {
@@ -75,7 +121,18 @@ struct irecv_client {
int interface;
int alt_interface;
unsigned short mode;
+ char serial[256];
+
+#ifndef WIN32
libusb_device_handle* handle;
+#else
+ HANDLE handle;
+ HANDLE hDFU;
+ HANDLE hIB;
+ LPSTR iBootPath;
+ LPSTR DfuPath;
+#endif
+
irecv_event_cb_t progress_callback;
irecv_event_cb_t received_callback;
irecv_event_cb_t connected_callback;
@@ -84,26 +141,75 @@ struct irecv_client {
irecv_event_cb_t disconnected_callback;
};
+struct irecv_device {
+ int index;
+ const char* product;
+ const char* model;
+ unsigned int board_id;
+ unsigned int chip_id;
+ const char* url;
+};
+
+static struct irecv_device irecv_devices[] = {
+ { 0, "iPhone1,1", "m68ap", 0, 8900,
+ "http://appldnld.apple.com.edgesuite.net/content.info.apple.com/iPhone/061-7481.20100202.4orot/iPhone1,1_3.1.3_7E18_Restore.ipsw" },
+ { 1, "iPod1,1", "n45ap", 2, 8900,
+ NULL },
+ { 2, "iPhone1,2", "n82ap", 4, 8900,
+ "http://appldnld.apple.com/iPhone4/061-7932.20100908.3fgt5/iPhone1,2_4.1_8B117_Restore.ipsw" },
+ { 3, "iPod2,1", "n72ap", 0, 8720,
+ "http://appldnld.apple.com/iPhone4/061-7937.20100908.ghj4f/iPod2,1_4.1_8B117_Restore.ipsw" },
+ { 4, "iPhone2,1", "n88ap", 0, 8920,
+ "http://appldnld.apple.com/iPhone4/061-7938.20100908.F3rCk/iPhone2,1_4.1_8B117_Restore.ipsw" },
+ { 5, "iPod3,1", "n18ap", 2, 8922,
+ "http://appldnld.apple.com/iPhone4/061-7941.20100908.sV9KE/iPod3,1_4.1_8B117_Restore.ipsw" },
+ { 6, "iPad1,1", "k48ap", 2, 8930,
+ "http://appldnld.apple.com/iPad/061-8801.20100811.CvfR5/iPad1,1_3.2.2_7B500_Restore.ipsw" },
+ { 7, "iPhone3,1", "n90ap", 0, 8930,
+ "http://appldnld.apple.com/iPhone4/061-7939.20100908.Lcyg3/iPhone3,1_4.1_8B117_Restore.ipsw" },
+ { 8, "iPod4,1", "n81ap", 8, 8930,
+ "http://appldnld.apple.com/iPhone4/061-8490.20100901.hyjtR/iPod4,1_4.1_8B117_Restore.ipsw" },
+ { 9, "AppleTV2,1", "k66ap", 10, 8930,
+ "http://appldnld.apple.com/AppleTV/061-8940.20100926.Tvtnz/AppleTV2,1_4.1_8M89_Restore.ipsw" },
+ { -1, NULL, NULL, -1, -1,
+ NULL }
+};
+
void irecv_set_debug_level(int level);
const char* irecv_strerror(irecv_error_t error);
+irecv_error_t irecv_open_attempts(irecv_client_t* pclient, int attempts);
irecv_error_t irecv_open(irecv_client_t* client);
irecv_error_t irecv_reset(irecv_client_t client);
irecv_error_t irecv_close(irecv_client_t client);
irecv_error_t irecv_receive(irecv_client_t client);
irecv_error_t irecv_send_exploit(irecv_client_t client);
-irecv_error_t irecv_get_cpid(irecv_client_t client, unsigned int* cpid);
-irecv_error_t irecv_get_bdid(irecv_client_t client, unsigned int* bdid);
-irecv_error_t irecv_send_file(irecv_client_t client, const char* filename);
-irecv_error_t irecv_get_ecid(irecv_client_t client, unsigned long long* ecid);
irecv_error_t irecv_execute_script(irecv_client_t client, const char* filename);
-irecv_error_t irecv_send_command(irecv_client_t client, unsigned char* command);
irecv_error_t irecv_set_configuration(irecv_client_t client, int configuration);
+
+irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void *user_data);
irecv_error_t irecv_event_unsubscribe(irecv_client_t client, irecv_event_type type);
+
+irecv_error_t irecv_send_file(irecv_client_t client, const char* filename, int dfuNotifyFinished);
+irecv_error_t irecv_send_command(irecv_client_t client, char* command);
+irecv_error_t irecv_send_buffer(irecv_client_t client, unsigned char* buffer, unsigned long length, int dfuNotifyFinished);
+
+irecv_error_t irecv_saveenv(irecv_client_t client);
+irecv_error_t irecv_getret(irecv_client_t client, unsigned int* value);
irecv_error_t irecv_getenv(irecv_client_t client, const char* variable, char** value);
irecv_error_t irecv_setenv(irecv_client_t client, const char* variable, const char* value);
irecv_error_t irecv_set_interface(irecv_client_t client, int interface, int alt_interface);
-irecv_error_t irecv_send_buffer(irecv_client_t client, unsigned char* buffer, unsigned int length);
-irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void *user_data);
+irecv_error_t irecv_get_cpid(irecv_client_t client, unsigned int* cpid);
+irecv_error_t irecv_get_bdid(irecv_client_t client, unsigned int* bdid);
+irecv_error_t irecv_get_ecid(irecv_client_t client, unsigned long long* ecid);
+void irecv_hexdump(unsigned char* buf, unsigned int len, unsigned int addr);
+
+void irecv_init();
+void irecv_exit();
+irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause);
+irecv_error_t irecv_reset_counters(irecv_client_t client);
+irecv_error_t irecv_finish_transfer(irecv_client_t client);
+irecv_error_t irecv_recv_buffer(irecv_client_t client, char* buffer, unsigned long length);
+irecv_error_t irecv_get_device(irecv_client_t client, irecv_device_t* device);
#ifdef __cplusplus
}
--
cgit v1.1-32-gdbae