diff options
| -rw-r--r-- | iphone.c | 13 | ||||
| -rw-r--r-- | iphone.h | 1 |
2 files changed, 3 insertions, 11 deletions
| @@ -1133,22 +1133,15 @@ iphone_error_t iphone_mux_get_error(iphone_umux_client_t client) | |||
| 1133 | return client->error; | 1133 | return client->error; |
| 1134 | } | 1134 | } |
| 1135 | 1135 | ||
| 1136 | /** This is a higher-level USBMuxTCP-like function | 1136 | /** This function reads from the client's recv_buffer. |
| 1137 | * | 1137 | * |
| 1138 | * @param connection The connection to receive data on. | 1138 | * @param client The client to receive data from. |
| 1139 | * @param data Where to put the data we receive. | 1139 | * @param data Where to put the data we receive. |
| 1140 | * @param datalen How much data to read. | 1140 | * @param datalen How much data to read. |
| 1141 | * @param timeout How many milliseconds to wait for data | ||
| 1141 | * | 1142 | * |
| 1142 | * @return IPHONE_E_SUCCESS or error code if failure. | 1143 | * @return IPHONE_E_SUCCESS or error code if failure. |
| 1143 | */ | 1144 | */ |
| 1144 | iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes) | ||
| 1145 | { | ||
| 1146 | return iphone_mux_recv_timeout(client, data, datalen, recv_bytes, 0); | ||
| 1147 | } | ||
| 1148 | |||
| 1149 | /** | ||
| 1150 | @param timeout | ||
| 1151 | */ | ||
| 1152 | iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout) | 1145 | iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout) |
| 1153 | { | 1146 | { |
| 1154 | 1147 | ||
| @@ -70,7 +70,6 @@ iphone_error_t iphone_mux_free_client ( iphone_umux_client_t client ); | |||
| 70 | 70 | ||
| 71 | iphone_error_t iphone_mux_send(iphone_umux_client_t client, const char *data, uint32_t datalen, uint32_t * sent_bytes); | 71 | iphone_error_t iphone_mux_send(iphone_umux_client_t client, const char *data, uint32_t datalen, uint32_t * sent_bytes); |
| 72 | 72 | ||
| 73 | iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes); | ||
| 74 | iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout); | 73 | iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout); |
| 75 | 74 | ||
| 76 | int iphone_mux_pullbulk(iphone_device_t phone); | 75 | int iphone_mux_pullbulk(iphone_device_t phone); |
