diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/devicedb.c | 2 | ||||
| -rw-r--r-- | src/libirecovery.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/devicedb.c b/src/devicedb.c index 9ca0cc8..36936c4 100644 --- a/src/devicedb.c +++ b/src/devicedb.c @@ -618,7 +618,7 @@ static irecv_error_t add_entry(const char* product_type, const char* hardware_mo return IRECV_E_SUCCESS; } -IRECV_API irecv_error_t irecv_devices_add(const char* product_type, const char* hardware_model, unsigned int board_id, unsigned int chip_id, const char* display_name) +irecv_error_t irecv_devices_add(const char* product_type, const char* hardware_model, unsigned int board_id, unsigned int chip_id, const char* display_name) { struct irecv_device* table; const struct irecv_device* existing = NULL; diff --git a/src/libirecovery.c b/src/libirecovery.c index 48d6b0b..b081f14 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c @@ -454,6 +454,7 @@ static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc } #endif +#if !defined(_WIN32) && !defined(HAVE_IOKIT) /* Fetch a string descriptor with libirecovery's own USB_TIMEOUT and a few * retries. libusb_get_string_descriptor_ascii() hardcodes a 1 s timeout, which * some parts miss: the Apple T1/iBridge in recovery answers this control @@ -490,6 +491,7 @@ static int irecv_get_string_descriptor_ascii_slow(irecv_client_t client, uint8_t } return ret; } +#endif static int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size) { @@ -1319,7 +1321,7 @@ static void async_cb(struct libusb_transfer* usb_transfer) { #endif #endif -IRECV_API int irecv_async_usb_control_transfer(irecv_client_t client, uint8_t bm_request_type, uint8_t b_request, uint16_t w_value, uint16_t w_index, unsigned char *data, uint16_t w_length) { +int irecv_async_usb_control_transfer(irecv_client_t client, uint8_t bm_request_type, uint8_t b_request, uint16_t w_value, uint16_t w_index, unsigned char *data, uint16_t w_length) { #ifdef USE_DUMMY return IRECV_E_UNSUPPORTED; #else @@ -1357,7 +1359,7 @@ IRECV_API int irecv_async_usb_control_transfer(irecv_client_t client, uint8_t bm } -IRECV_API int irecv_async_usb_control_transfer_with_cancel(irecv_client_t client, uint8_t bm_request_type, uint8_t b_request, uint16_t w_value, uint16_t w_index, unsigned char *data, uint16_t w_length, unsigned int u_time) { +int irecv_async_usb_control_transfer_with_cancel(irecv_client_t client, uint8_t bm_request_type, uint8_t b_request, uint16_t w_value, uint16_t w_index, unsigned char *data, uint16_t w_length, unsigned int u_time) { #ifdef USE_DUMMY return IRECV_E_UNSUPPORTED; #else @@ -1600,7 +1602,7 @@ int irecv_usb_bulk_transfer(irecv_client_t client, #endif } -IRECV_API int irecv_usb_interrupt_transfer(irecv_client_t client, +int irecv_usb_interrupt_transfer(irecv_client_t client, unsigned char endpoint, unsigned char *data, int length, |
