X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Ffreerdp%2Ffreerdp.h;h=c002cf52a07d983e6da31c715890997d97cf53f8;hb=5d9e8b2e28c8841f3327526ab2f74aa55ddc1b2f;hp=5fd28824ab21f058020da810df4f1e48807e56fc;hpb=8df77dba7165e5c4a15af9c1a14026649d4aefec;p=platform%2Fupstream%2Ffreerdp.git

diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
index 5fd2882..c002cf5 100644
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -41,22 +41,16 @@ typedef struct rdp_context rdpContext;
 extern "C" {
 #endif
 
-FREERDP_API boolean freerdp_global_init();
-FREERDP_API void freerdp_global_finish();
+typedef void (*pcContextSize)(freerdp* instance, uint32* size);
+typedef void (*pcContextNew)(freerdp* instance, rdpContext* context);
+typedef void (*pcContextFree)(freerdp* instance, rdpContext* context);
 
-typedef boolean (*pcConnect)(freerdp* instance);
 typedef boolean (*pcPreConnect)(freerdp* instance);
 typedef boolean (*pcPostConnect)(freerdp* instance);
 typedef boolean (*pcAuthenticate)(freerdp* instance, char** username, char** password, char** domain);
-typedef boolean (*pcGetFileDescriptor)(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount);
-typedef boolean (*pcCheckFileDescriptor)(freerdp* instance);
+
 typedef int (*pcSendChannelData)(freerdp* instance, int channelId, uint8* data, int size);
 typedef int (*pcReceiveChannelData)(freerdp* instance, int channelId, uint8* data, int size, int flags, int total_size);
-typedef void (*pcDisconnect)(freerdp* instance);
-
-typedef void (*pcContextSize)(freerdp* instance, uint32* size);
-typedef void (*pcContextNew)(freerdp* instance, rdpContext* context);
-typedef void (*pcContextFree)(freerdp* instance, rdpContext* context);
 
 struct rdp_context
 {
@@ -83,20 +77,23 @@ struct rdp_freerdp
 	pcContextNew ContextNew;
 	pcContextFree ContextFree;
 
-	pcConnect Connect;
 	pcPreConnect PreConnect;
 	pcPostConnect PostConnect;
 	pcAuthenticate Authenticate;
-	pcGetFileDescriptor GetFileDescriptor;
-	pcCheckFileDescriptor CheckFileDescriptor;
+
 	pcSendChannelData SendChannelData;
 	pcReceiveChannelData ReceiveChannelData;
-	pcDisconnect Disconnect;
 };
 
 FREERDP_API void freerdp_context_new(freerdp* instance);
 FREERDP_API void freerdp_context_free(freerdp* instance);
 
+FREERDP_API boolean freerdp_connect(freerdp* instance);
+FREERDP_API boolean freerdp_disconnect(freerdp* instance);
+
+FREERDP_API boolean freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount);
+FREERDP_API boolean freerdp_check_fds(freerdp* instance);
+
 FREERDP_API freerdp* freerdp_new();
 FREERDP_API void freerdp_free(freerdp* instance);