From 9c9a2ac5889f9ea273a612c2c216b40de399407f Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 21 Jun 2011 15:33:59 +0300 Subject: [PATCH] gobex: Move definitions from obex.h to gobex.h --- gobex/gobex.h | 37 ++++++++++++++++++++++++++++++++++++- gobex/obex.h | 36 ------------------------------------ 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/gobex/gobex.h b/gobex/gobex.h index e189616ae..ce2b6af12 100644 --- a/gobex/gobex.h +++ b/gobex/gobex.h @@ -25,7 +25,42 @@ #include #include -#include +/* Opcodes */ +#define G_OBEX_OP_CONNECT 0x00 +#define G_OBEX_OP_DISCONNECT 0x01 +#define G_OBEX_OP_PUT 0x02 +#define G_OBEX_OP_GET 0x03 +#define G_OBEX_OP_SETPATH 0x05 +#define G_OBEX_OP_SESSION 0x07 +#define G_OBEX_OP_ABORT 0x7f +#define G_OBEX_FINAL 0x80 + +/* Header ID's */ +#define G_OBEX_HDR_ID_COUNT 0xc0 +#define G_OBEX_HDR_ID_NAME 0x01 +#define G_OBEX_HDR_ID_TYPE 0x42 +#define G_OBEX_HDR_ID_LENGTH 0xc3 +#define G_OBEX_HDR_ID_TIME 0x44 +#define G_OBEX_HDR_ID_DESCRIPTION 0x05 +#define G_OBEX_HDR_ID_TARGET 0x46 +#define G_OBEX_HDR_ID_HTTP 0x47 +#define G_OBEX_HDR_ID_BODY 0x48 +#define G_OBEX_HDR_ID_BODY_END 0x49 +#define G_OBEX_HDR_ID_WHO 0x4a +#define G_OBEX_HDR_ID_CONNECTION 0xcb +#define G_OBEX_HDR_ID_APPARAM 0x4c +#define G_OBEX_HDR_ID_AUTHCHAL 0x4d +#define G_OBEX_HDR_ID_AUTHRESP 0x4e +#define G_OBEX_HDR_ID_CREATOR 0xcf +#define G_OBEX_HDR_ID_WANUUID 0x50 +#define G_OBEX_HDR_ID_OBJECTCLASS 0x51 +#define G_OBEX_HDR_ID_SESSIONPARAM 0x52 +#define G_OBEX_HDR_ID_SESSIONSEQ 0x93 +#define G_OBEX_HDR_ID_ACTION 0x94 +#define G_OBEX_HDR_ID_DESTNAME 0x15 +#define G_OBEX_HDR_ID_PERMISSIONS 0xd6 +#define G_OBEX_HDR_ID_SRM 0x97 +#define G_OBEX_HDR_ID_SRM_FLAGS 0x98 typedef struct _GObex GObex; typedef struct _GObexRequest GObexRequest; diff --git a/gobex/obex.h b/gobex/obex.h index f5afe6ae9..70e5070be 100644 --- a/gobex/obex.h +++ b/gobex/obex.h @@ -22,40 +22,4 @@ #ifndef __OBEX_H #define __OBEX_H -/* Opcodes */ -#define G_OBEX_OP_CONNECT 0x00 -#define G_OBEX_OP_DISCONNECT 0x01 -#define G_OBEX_OP_PUT 0x02 -#define G_OBEX_OP_GET 0x03 -#define G_OBEX_OP_SETPATH 0x05 -#define G_OBEX_OP_SESSION 0x07 -#define G_OBEX_OP_ABORT 0x7f -#define G_OBEX_FINAL 0x80 - -#define G_OBEX_HDR_ID_COUNT 0xc0 -#define G_OBEX_HDR_ID_NAME 0x01 -#define G_OBEX_HDR_ID_TYPE 0x42 -#define G_OBEX_HDR_ID_LENGTH 0xc3 -#define G_OBEX_HDR_ID_TIME 0x44 -#define G_OBEX_HDR_ID_DESCRIPTION 0x05 -#define G_OBEX_HDR_ID_TARGET 0x46 -#define G_OBEX_HDR_ID_HTTP 0x47 -#define G_OBEX_HDR_ID_BODY 0x48 -#define G_OBEX_HDR_ID_BODY_END 0x49 -#define G_OBEX_HDR_ID_WHO 0x4a -#define G_OBEX_HDR_ID_CONNECTION 0xcb -#define G_OBEX_HDR_ID_APPARAM 0x4c -#define G_OBEX_HDR_ID_AUTHCHAL 0x4d -#define G_OBEX_HDR_ID_AUTHRESP 0x4e -#define G_OBEX_HDR_ID_CREATOR 0xcf -#define G_OBEX_HDR_ID_WANUUID 0x50 -#define G_OBEX_HDR_ID_OBJECTCLASS 0x51 -#define G_OBEX_HDR_ID_SESSIONPARAM 0x52 -#define G_OBEX_HDR_ID_SESSIONSEQ 0x93 -#define G_OBEX_HDR_ID_ACTION 0x94 -#define G_OBEX_HDR_ID_DESTNAME 0x15 -#define G_OBEX_HDR_ID_PERMISSIONS 0xd6 -#define G_OBEX_HDR_ID_SRM 0x97 -#define G_OBEX_HDR_ID_SRM_FLAGS 0x98 - #endif /* __GOBEX_H */ -- 2.47.3