From c46062aca98f2f077b3bab5c5f72ff2cb57b9dc2 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Thu, 20 Aug 2009 01:19:09 +0200 Subject: Updated usbmuxd protocol definition and public header. [Hector] Merged by putting utils.c into a common dir, avoiding log.c dependency for libusbmuxd, adding CMake magic to tie things up. --- usbmuxd/client.h | 50 ++------------------------------------------------ 1 file changed, 2 insertions(+), 48 deletions(-) (limited to 'usbmuxd/client.h') diff --git a/usbmuxd/client.h b/usbmuxd/client.h index 0cda676..4fc1ab4 100644 --- a/usbmuxd/client.h +++ b/usbmuxd/client.h @@ -22,62 +22,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define __CLIENT_H__ #include +#include "usbmuxd-proto.h" struct device_info; struct mux_client; -enum client_result { - RESULT_OK = 0, - RESULT_BADCOMMAND = 1, - RESULT_BADDEV = 2, - RESULT_CONNREFUSED = 3, - // ??? - // ??? - RESULT_BADVERSION = 6, -}; - -enum client_msgtype { - MESSAGE_RESULT = 1, - MESSAGE_CONNECT = 2, - MESSAGE_LISTEN = 3, - MESSAGE_DEVICE_ADD = 4, - MESSAGE_DEVICE_REMOVE = 5, - //??? - //??? - //MESSAGE_PLIST = 8, -}; - -#define CLIENT_PROTOCOL_VERSION 0 - -struct client_header { - uint32_t length; - uint32_t version; - uint32_t message; - uint32_t tag; -}; - -struct client_msg_result { - uint32_t result; -}; - -struct client_msg_connect { - uint32_t device_id; - uint16_t port; -}; - -struct client_msg_dev { - uint32_t device_id; - uint16_t device_pid; - char device_serial[256]; - uint16_t padding; - uint32_t location; -}; - int client_read(struct mux_client *client, void *buffer, int len); int client_write(struct mux_client *client, void *buffer, int len); int client_set_events(struct mux_client *client, short events); void client_close(struct mux_client *client); -int client_notify_connect(struct mux_client *client, enum client_result result); +int client_notify_connect(struct mux_client *client, enum usbmuxd_result result); void client_device_add(struct device_info *dev); void client_device_remove(int device_id); -- cgit v1.1-32-gdbae