Merge pull request #90 from neutrinolabs/master

xorg driver, smart card, etc

1 files changed, 35 insertions, 4 deletions

diff --git a/xorg/server/module/rdpMain.c b/xorg/server/module/rdpMain.c
index 9930764c..f19b06cd 100644
--- a/xorg/server/module/rdpMain.c
+++ b/xorg/server/module/rdpMain.c
@@ -38,6 +38,9 @@ rdp module main
 #include <mi.h>
 
 #include "rdp.h"
+#include "rdpInput.h"
+#include "rdpDraw.h"
+#include "rdpClientCon.h"
 
 /******************************************************************************/
 #define LOG_LEVEL 1
@@ -52,20 +55,43 @@ rdp module main
 #define PACKAGE_VERSION_MINOR 0
 #define PACKAGE_VERSION_PATCHLEVEL 0
 
-static int g_initialised = 0;
+static Bool g_initialised = FALSE;
 
 /*****************************************************************************/
 static pointer
-xorgxrdpSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
+xorgxrdpSetup(pointer Module, pointer Options,
+              int *ErrorMajor, int *ErrorMinor)
 {
     LLOGLN(0, ("xorgxrdpSetup:"));
     if (!g_initialised)
     {
-        g_initialised = 1;
+        g_initialised = TRUE;
     }
+    rdpInputInit();
+    rdpPrivateInit();
     return (pointer) 1;
 }
 
+/*****************************************************************************/
+static void
+xorgxrdpTearDown(pointer Module)
+{
+    LLOGLN(0, ("xorgxrdpTearDown:"));
+}
+
+/*****************************************************************************/
+void
+xorgxrdpDownDown(ScreenPtr pScreen)
+{
+    LLOGLN(0, ("xorgxrdpDownDown:"));
+    if (g_initialised)
+    {
+        g_initialised = FALSE;
+        LLOGLN(0, ("xorgxrdpDownDown: 1"));
+        rdpClientConDeinit(rdpGetDevFromScreen(pScreen));
+    }
+}
+
 static MODULESETUPPROTO(xorgxrdpSetup);
 static XF86ModuleVersionInfo RDPVersRec =
 {
@@ -83,4 +109,9 @@ static XF86ModuleVersionInfo RDPVersRec =
     { 0, 0, 0, 0 }
 };
 
-XF86ModuleData xorgxrdpModuleData = { &RDPVersRec, xorgxrdpSetup, NULL };
+_X_EXPORT XF86ModuleData xorgxrdpModuleData =
+{
+    &RDPVersRec,
+    xorgxrdpSetup,
+    xorgxrdpTearDown
+};