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)
return client->error;
}
-/** This is a higher-level USBMuxTCP-like function
+/** This function reads from the client's recv_buffer.
*
- * @param connection The connection to receive data on.
+ * @param client The client to receive data from.
* @param data Where to put the data we receive.
* @param datalen How much data to read.
+ * @param timeout How many milliseconds to wait for data
*
* @return IPHONE_E_SUCCESS or error code if failure.
*/
-iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes)
-{
- return iphone_mux_recv_timeout(client, data, datalen, recv_bytes, 0);
-}
-
-/**
- @param timeout
- */
iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout)
{
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 );
iphone_error_t iphone_mux_send(iphone_umux_client_t client, const char *data, uint32_t datalen, uint32_t * sent_bytes);
-iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes);
iphone_error_t iphone_mux_recv_timeout(iphone_umux_client_t client, char *data, uint32_t datalen, uint32_t * recv_bytes, int timeout);
int iphone_mux_pullbulk(iphone_device_t phone);