summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--iphone.c13
-rw-r--r--iphone.h1
2 files changed, 3 insertions, 11 deletions
diff --git a/iphone.c b/iphone.c
index c759899..cd91b2e 100644
--- a/iphone.c
+++ b/iphone.c
@@ -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 */
1144iphone_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 */
1152iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout) 1145iphone_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
diff --git a/iphone.h b/iphone.h
index fcef32a..9900b99 100644
--- a/iphone.h
+++ b/iphone.h
@@ -70,7 +70,6 @@ iphone_error_t iphone_mux_free_client ( iphone_umux_client_t client );
70 70
71iphone_error_t iphone_mux_send(iphone_umux_client_t client, const char *data, uint32_t datalen, uint32_t * sent_bytes); 71iphone_error_t iphone_mux_send(iphone_umux_client_t client, const char *data, uint32_t datalen, uint32_t * sent_bytes);
72 72
73iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes);
74iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout); 73iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout);
75 74
76int iphone_mux_pullbulk(iphone_device_t phone); 75int iphone_mux_pullbulk(iphone_device_t phone);