From 3050e61588bfc79b3b360fa25db32c81e3264efb Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Wed, 25 Sep 2019 19:23:20 +0200 Subject: Use global event handlers for normale/restore and recovery/dfu mode devices --- src/common.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/common.h') diff --git a/src/common.h b/src/common.h index 2c8d07f..41a7bc6 100644 --- a/src/common.h +++ b/src/common.h @@ -32,6 +32,8 @@ extern "C" { #include #endif +#include + #include #include @@ -90,7 +92,6 @@ struct idevicerestore_client_t { char* ipsw; const char* filesystem; struct dfu_client_t* dfu; - struct normal_client_t* normal; struct restore_client_t* restore; struct recovery_client_t* recovery; irecv_device_t device; @@ -103,6 +104,8 @@ struct idevicerestore_client_t { char* cache_dir; idevicerestore_progress_cb_t progress_cb; void* progress_cb_data; + irecv_device_event_context_t irecv_e_ctx; + void* idevice_e_ctx; }; extern struct idevicerestore_mode_t idevicerestore_modes[]; @@ -128,10 +131,12 @@ char *generate_guid(void); #ifndef sleep #define sleep(x) Sleep(x*1000) #endif +#define __usleep(x) Sleep(x/1000) #else #include #define __mkdir(path, mode) mkdir(path, mode) #define FMT_qu "%qu" +#define __usleep(x) usleep(x) #endif int mkdir_with_parents(const char *dir, int mode); @@ -150,6 +155,10 @@ char* realpath(const char *filename, char *resolved_name); void get_user_input(char *buf, int maxlen, int secure); +#define WAIT_INTERVAL 200000 +#define WAIT_MAX(x) (x * (1000000 / WAIT_INTERVAL)) +#define WAIT_FOR(cond, timeout) { int __repeat = WAIT_MAX(timeout); while (!(cond) && __repeat-- > 0) { __usleep(WAIT_INTERVAL); } } + uint8_t _plist_dict_get_bool(plist_t dict, const char *key); uint64_t _plist_dict_get_uint(plist_t dict, const char *key); -- cgit v1.1-32-gdbae