diff options
| -rw-r--r-- | include/libirecovery.h | 4 | ||||
| -rw-r--r-- | src/libirecovery.c | 8 | ||||
| -rw-r--r-- | tools/irecovery.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/libirecovery.h b/include/libirecovery.h index 091c29b..6a8b50b 100644 --- a/include/libirecovery.h +++ b/include/libirecovery.h | |||
| @@ -199,8 +199,8 @@ static struct irecv_device irecv_devices[] = { | |||
| 199 | 199 | ||
| 200 | void irecv_set_debug_level(int level); | 200 | void irecv_set_debug_level(int level); |
| 201 | const char* irecv_strerror(irecv_error_t error); | 201 | const char* irecv_strerror(irecv_error_t error); |
| 202 | irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts); | 202 | irecv_error_t irecv_open_with_ecid(irecv_client_t* client, unsigned long long ecid); |
| 203 | irecv_error_t irecv_open(irecv_client_t* client, unsigned long long ecid); | 203 | irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts); |
| 204 | irecv_error_t irecv_reset(irecv_client_t client); | 204 | irecv_error_t irecv_reset(irecv_client_t client); |
| 205 | irecv_error_t irecv_close(irecv_client_t client); | 205 | irecv_error_t irecv_close(irecv_client_t client); |
| 206 | irecv_error_t irecv_receive(irecv_client_t client); | 206 | irecv_error_t irecv_receive(irecv_client_t client); |
diff --git a/src/libirecovery.c b/src/libirecovery.c index 63bfecf..dd973f5 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c | |||
| @@ -503,7 +503,7 @@ static int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc | |||
| 503 | #endif | 503 | #endif |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | irecv_error_t irecv_open(irecv_client_t* pclient, unsigned long long ecid) { | 506 | irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned long long ecid) { |
| 507 | if(libirecovery_debug) { | 507 | if(libirecovery_debug) { |
| 508 | irecv_set_debug_level(libirecovery_debug); | 508 | irecv_set_debug_level(libirecovery_debug); |
| 509 | } | 509 | } |
| @@ -696,7 +696,7 @@ irecv_error_t irecv_reset(irecv_client_t client) { | |||
| 696 | return IRECV_E_SUCCESS; | 696 | return IRECV_E_SUCCESS; |
| 697 | } | 697 | } |
| 698 | 698 | ||
| 699 | irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) { | 699 | irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) { |
| 700 | int i; | 700 | int i; |
| 701 | 701 | ||
| 702 | for (i = 0; i < attempts; i++) { | 702 | for (i = 0; i < attempts; i++) { |
| @@ -704,7 +704,7 @@ irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ec | |||
| 704 | irecv_close(*pclient); | 704 | irecv_close(*pclient); |
| 705 | *pclient = NULL; | 705 | *pclient = NULL; |
| 706 | } | 706 | } |
| 707 | if (irecv_open(pclient, ecid) != IRECV_E_SUCCESS) { | 707 | if (irecv_open_with_ecid(pclient, ecid) != IRECV_E_SUCCESS) { |
| 708 | debug("Connection failed. Waiting 1 sec before retry.\n"); | 708 | debug("Connection failed. Waiting 1 sec before retry.\n"); |
| 709 | sleep(1); | 709 | sleep(1); |
| 710 | } else { | 710 | } else { |
| @@ -1480,7 +1480,7 @@ irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause) { | |||
| 1480 | sleep(initial_pause); | 1480 | sleep(initial_pause); |
| 1481 | } | 1481 | } |
| 1482 | 1482 | ||
| 1483 | error = irecv_open_attempts(&new_client, ecid, 10); | 1483 | error = irecv_open_with_ecid_and_attempts(&new_client, ecid, 10); |
| 1484 | if(error != IRECV_E_SUCCESS) { | 1484 | if(error != IRECV_E_SUCCESS) { |
| 1485 | return NULL; | 1485 | return NULL; |
| 1486 | } | 1486 | } |
diff --git a/tools/irecovery.c b/tools/irecovery.c index f398ec1..8e2138c 100644 --- a/tools/irecovery.c +++ b/tools/irecovery.c | |||
| @@ -334,7 +334,7 @@ int main(int argc, char* argv[]) { | |||
| 334 | for (i = 0; i <= 5; i++) { | 334 | for (i = 0; i <= 5; i++) { |
| 335 | debug("Attempting to connect... \n"); | 335 | debug("Attempting to connect... \n"); |
| 336 | 336 | ||
| 337 | if (irecv_open(&client, ecid) != IRECV_E_SUCCESS) | 337 | if (irecv_open_with_ecid(&client, ecid) != IRECV_E_SUCCESS) |
| 338 | sleep(1); | 338 | sleep(1); |
| 339 | else | 339 | else |
| 340 | break; | 340 | break; |
