summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/libirecovery.h6
-rw-r--r--src/libirecovery.c12
-rw-r--r--tools/irecovery.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/include/libirecovery.h b/include/libirecovery.h
index 9874e03..224a6a7 100644
--- a/include/libirecovery.h
+++ b/include/libirecovery.h
@@ -84,7 +84,7 @@ struct irecv_device_info {
84 unsigned int cpfm; 84 unsigned int cpfm;
85 unsigned int scep; 85 unsigned int scep;
86 unsigned int bdid; 86 unsigned int bdid;
87 unsigned long long ecid; 87 uint64_t ecid;
88 unsigned int ibfl; 88 unsigned int ibfl;
89 char* srnm; 89 char* srnm;
90 char* imei; 90 char* imei;
@@ -117,8 +117,8 @@ void irecv_init(void); /* deprecated: libirecovery has constructor now */
117void irecv_exit(void); /* deprecated: libirecovery has destructor now */ 117void irecv_exit(void); /* deprecated: libirecovery has destructor now */
118 118
119/* device connectivity */ 119/* device connectivity */
120irecv_error_t irecv_open_with_ecid(irecv_client_t* client, unsigned long long ecid); 120irecv_error_t irecv_open_with_ecid(irecv_client_t* client, uint64_t ecid);
121irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts); 121irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, uint64_t ecid, int attempts);
122irecv_error_t irecv_reset(irecv_client_t client); 122irecv_error_t irecv_reset(irecv_client_t client);
123irecv_error_t irecv_close(irecv_client_t client); 123irecv_error_t irecv_close(irecv_client_t client);
124irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause); 124irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause);
diff --git a/src/libirecovery.c b/src/libirecovery.c
index d36234f..cf73465 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -662,9 +662,9 @@ typedef struct usb_control_request {
662 662
663irecv_error_t mobiledevice_openpipes(irecv_client_t client); 663irecv_error_t mobiledevice_openpipes(irecv_client_t client);
664void mobiledevice_closepipes(irecv_client_t client); 664void mobiledevice_closepipes(irecv_client_t client);
665irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid); 665irecv_error_t mobiledevice_connect(irecv_client_t* client, uint64_t ecid);
666 666
667irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid) { 667irecv_error_t mobiledevice_connect(irecv_client_t* client, uint64_t ecid) {
668 int found = 0; 668 int found = 0;
669 SP_DEVICE_INTERFACE_DATA currentInterface; 669 SP_DEVICE_INTERFACE_DATA currentInterface;
670 HDEVINFO usbDevices; 670 HDEVINFO usbDevices;
@@ -1214,7 +1214,7 @@ static io_iterator_t iokit_usb_get_iterator_for_pid(UInt16 pid) {
1214 return iterator; 1214 return iterator;
1215} 1215}
1216 1216
1217static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, unsigned long long ecid) { 1217static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, uint64_t ecid) {
1218 1218
1219 io_service_t service, ret_service; 1219 io_service_t service, ret_service;
1220 io_iterator_t iterator; 1220 io_iterator_t iterator;
@@ -1292,7 +1292,7 @@ static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, unsigned long
1292#endif 1292#endif
1293#endif 1293#endif
1294 1294
1295IRECV_API irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned long long ecid) { 1295IRECV_API irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, uint64_t ecid) {
1296#ifdef USE_DUMMY 1296#ifdef USE_DUMMY
1297 return IRECV_E_UNSUPPORTED; 1297 return IRECV_E_UNSUPPORTED;
1298#else 1298#else
@@ -1629,7 +1629,7 @@ IRECV_API irecv_error_t irecv_reset(irecv_client_t client) {
1629#endif 1629#endif
1630} 1630}
1631 1631
1632IRECV_API irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) { 1632IRECV_API irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, uint64_t ecid, int attempts) {
1633#ifdef USE_DUMMY 1633#ifdef USE_DUMMY
1634 return IRECV_E_UNSUPPORTED; 1634 return IRECV_E_UNSUPPORTED;
1635#else 1635#else
@@ -3185,7 +3185,7 @@ IRECV_API irecv_client_t irecv_reconnect(irecv_client_t client, int initial_paus
3185 irecv_event_cb_t postcommand_callback = client->postcommand_callback; 3185 irecv_event_cb_t postcommand_callback = client->postcommand_callback;
3186 irecv_event_cb_t disconnected_callback = client->disconnected_callback; 3186 irecv_event_cb_t disconnected_callback = client->disconnected_callback;
3187 3187
3188 unsigned long long ecid = client->device_info.ecid; 3188 uint64_t ecid = client->device_info.ecid;
3189 3189
3190 if (check_context(client) == IRECV_E_SUCCESS) { 3190 if (check_context(client) == IRECV_E_SUCCESS) {
3191 irecv_close(client); 3191 irecv_close(client);
diff --git a/tools/irecovery.c b/tools/irecovery.c
index 6df328a..5cc454a 100644
--- a/tools/irecovery.c
+++ b/tools/irecovery.c
@@ -399,7 +399,7 @@ int main(int argc, char* argv[]) {
399 int i = 0; 399 int i = 0;
400 int opt = 0; 400 int opt = 0;
401 int action = kNoAction; 401 int action = kNoAction;
402 unsigned long long ecid = 0; 402 uint64_t ecid = 0;
403 int mode = -1; 403 int mode = -1;
404 char* argument = NULL; 404 char* argument = NULL;
405 irecv_error_t error = 0; 405 irecv_error_t error = 0;