From ba11d4e1afce58db688a076e5a4d82f8a64541f5 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Wed, 7 Nov 2012 21:54:09 +0100
Subject: Move flags into idevicerestore.h

---
 src/common.h         |  8 --------
 src/idevicerestore.h | 10 ++++++++++
 src/recovery.c       |  3 +--
 src/restore.c        |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/common.h b/src/common.h
index d6be6bb..1c3e2fa 100644
--- a/src/common.h
+++ b/src/common.h
@@ -41,14 +41,6 @@ extern "C" {
 #define MODE_NORMAL          4
 
 #define FLAG_QUIT            1
-#define FLAG_DEBUG           2
-#define FLAG_ERASE           4
-#define FLAG_CUSTOM          8
-#define FLAG_EXCLUDE        16
-#define FLAG_PWN            32
-#define FLAG_NOACTION       64
-#define FLAG_SHSHONLY      128
-#define FLAG_LATEST        256
 
 struct dfu_client_t;
 struct normal_client_t;
diff --git a/src/idevicerestore.h b/src/idevicerestore.h
index 446edf4..3201280 100644
--- a/src/idevicerestore.h
+++ b/src/idevicerestore.h
@@ -31,6 +31,16 @@ extern "C" {
 
 #include "common.h"
 
+// the flag with value 1 is reserved for internal use only. don't use it.
+#define FLAG_DEBUG           1 << 1
+#define FLAG_ERASE           1 << 2
+#define FLAG_CUSTOM          1 << 3
+#define FLAG_EXCLUDE         1 << 4
+#define FLAG_PWN             1 << 5
+#define FLAG_NOACTION        1 << 6
+#define FLAG_SHSHONLY        1 << 7
+#define FLAG_LATEST          1 << 8
+
 struct idevicerestore_client_t;
 
 struct idevicerestore_client_t* idevicerestore_client_new();
diff --git a/src/recovery.c b/src/recovery.c
index 2127398..4c48e0a 100644
--- a/src/recovery.c
+++ b/src/recovery.c
@@ -26,12 +26,11 @@
 #include <libimobiledevice/restore.h>
 #include <libimobiledevice/libimobiledevice.h>
 
+#include "idevicerestore.h"
 #include "tss.h"
 #include "img3.h"
-#include "common.h"
 #include "restore.h"
 #include "recovery.h"
-#include "idevicerestore.h"
 
 int recovery_progress_callback(irecv_client_t client, const irecv_event_t* event) {
 	if (event->type == IRECV_PROGRESS) {
diff --git a/src/restore.c b/src/restore.c
index bc9a7d3..0d8f266 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -25,11 +25,11 @@
 #include <libimobiledevice/restore.h>
 #include <zip.h>
 
+#include "idevicerestore.h"
 #include "asr.h"
 #include "fls.h"
 #include "mbn.h"
 #include "tss.h"
-#include "common.h"
 #include "restore.h"
 
 #define WAIT_FOR_STORAGE       11
-- 
cgit v1.1-32-gdbae