Merge branch 'master' of git://github.com/MattColyer/libiphone into martin

Conflicts:
	src/Makefile.am

1 files changed, 0 insertions, 58 deletions

diff --git a/src/usbmux.h b/src/usbmux.h
deleted file mode 100644
index bea83f7..0000000
--- a/src/usbmux.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * usbmux.h
- * Defines structures and variables pertaining to the usb multiplexing.
- *
- * Copyright (c) 2008 Zach C. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "libiphone/libiphone.h"
-
-#ifndef USBMUX_H
-#define USBMUX_H
-
-#ifndef IPHONE_H
-#include "iphone.h"
-#endif
-
-typedef struct {
-	uint32_t type, length;
-	uint16_t sport, dport;
-	uint32_t scnt, ocnt;
-	uint8_t offset, tcp_flags;
-	uint16_t window, nullnull, length16;
-} usbmux_tcp_header;
-
-struct iphone_umux_client_int {
-	usbmux_tcp_header *header;
-	iphone_device_t phone;
-	char *recv_buffer;
-	int r_len;
-};
-
-usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port);
-
-typedef struct {
-	uint32_t type, length, major, minor, allnull;
-} usbmux_version_header;
-
-usbmux_version_header *version_header(void);
-
-
-#endif