summaryrefslogtreecommitdiffstats
path: root/src/usbmux.h
diff options
context:
space:
mode:
authorGravatar Matt Colyer2009-04-13 08:48:00 -0700
committerGravatar Matt Colyer2009-04-13 08:48:00 -0700
commit6671ca3d6de6a1fd27853e3b1ce7a81d568703f0 (patch)
tree735c5ace7ed57cd4e19f2fde423b22e6104eaa98 /src/usbmux.h
parentbd31783d7fde0b5bd101f4a3f97ca1aca2aa6fab (diff)
parent288929f45cb2641690879b52ec514097995cd41a (diff)
downloadlibimobiledevice-6671ca3d6de6a1fd27853e3b1ce7a81d568703f0.tar.gz
libimobiledevice-6671ca3d6de6a1fd27853e3b1ce7a81d568703f0.tar.bz2
Merged in Jonathan's libplist libiphone. [#2 state:resolved]
Diffstat (limited to 'src/usbmux.h')
-rw-r--r--src/usbmux.h20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/usbmux.h b/src/usbmux.h
index fd5fc78..bea83f7 100644
--- a/src/usbmux.h
+++ b/src/usbmux.h
@@ -22,6 +22,7 @@
#include <sys/types.h>
#include <stdlib.h>
#include <stdint.h>
+#include "libiphone/libiphone.h"
#ifndef USBMUX_H
#define USBMUX_H
@@ -30,17 +31,12 @@
#include "iphone.h"
#endif
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint8_t uint8;
-
-
typedef struct {
- uint32 type, length;
- uint16 sport, dport;
- uint32 scnt, ocnt;
- uint8 offset, tcp_flags;
- uint16 window, nullnull, length16;
+ 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 {
@@ -50,10 +46,10 @@ struct iphone_umux_client_int {
int r_len;
};
-usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port);
+usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port);
typedef struct {
- uint32 type, length, major, minor, allnull;
+ uint32_t type, length, major, minor, allnull;
} usbmux_version_header;
usbmux_version_header *version_header(void);