[LINUX] Moving Linux specific functions to new c file

This patch moves Linux specific functions to
libdce_linux.c.
It also takes in the DRM Initialization cleanup
changes in dce_init from:
https://gerrit.ext.ti.com/gerrit/omap/#/c/12888

Change-Id: I570341c8dfbe1d120bc89071a86020b6ba5d4cac
Signed-off-by: Saurabh Bipin Chandra <a0131926@ti.com>

5 files changed, 138 insertions, 107 deletions

diff --git a/Makefile.am b/Makefile.am
index 5869713..0a0a6b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ CE_CFLAGS                    = \
                                -Wno-pointer-to-int-cast
 
 
-libdce_la_SOURCES            = libdce.c memplugin_linux.c
+libdce_la_SOURCES            = libdce.c memplugin_linux.c libdce_linux.c
 libdce_la_CFLAGS             = $(WARN_CFLAGS) $(CE_CFLAGS) $(DRM_CFLAGS) $(X11_CFLAGS) $(WAYLAND_CFLAGS)
 libdce_la_LDFLAGS            = -no-undefined -version-info 1:0:0
 libdce_la_LIBADD             = $(DRM_LIBS) $(X11_LIBS) $(WAYLAND_LIBS) $(MMRPC_LIBS)
diff --git a/libdce.c b/libdce.c
index 1c4ecb1..cd10b71 100644
--- a/libdce.c
+++ b/libdce.c
@@ -71,12 +71,6 @@
 
 #include <xdc/std.h>
 
-#if defined(BUILDOS_LINUX)
-#include <xf86drm.h>
-#include <omap_drm.h>
-#include <omap_drmif.h>
-#endif /* BUILDOS_LINUX */
-
 /* IPC Headers */
 #include <MmRpc.h>
 
@@ -87,11 +81,6 @@
 #include "memplugin.h"
 
 
-#if defined(BUILDOS_LINUX)
-int    fd  = -1;
-#endif /* BUILDOS_LINUX */
-
-
 /********************* GLOBALS ***********************/
 /* Hande used for Remote Communication                               */
 static MmRpc_Handle       MmRpcHandle = NULL;
@@ -156,98 +145,6 @@ void dce_free(void *ptr)
     memplugin_free(ptr, TILER_1D_BUFFER);
 }
 
-/***************** FUNCTIONS SPECIFIC TO LINUX *******************/
-#if defined(BUILDOS_LINUX)
-void *dce_init(void)
-{
-    struct omap_device   *OmapDev = NULL;
-    dce_error_status      eError = DCE_EOK;
-
-    printf(" >> dce_init\n");
-
-    /* Open omapdrm device */
-    if( fd == -1 ) {
-        printf("Open omapdrm device \n");
-        fd = drmOpen("omapdrm", "platform:omapdrm:00");
-    }
-    if( fd >= 0 ) {
-        OmapDev = omap_device_new(fd);
-    } else {
-        printf("Error opening omapdrm : drmOpen failed");
-        goto EXIT;
-    }
-
-EXIT:
-    return ((void *)OmapDev);
-}
-
-void dce_deinit(void *dev)
-{
-    omap_device_del(dev);
-    dev = NULL;
-    close(fd);
-    fd = -1;
-
-    return;
-}
-
-int dce_buf_lock(int num, size_t *handle)
-{
-    int                 i;
-    MmRpc_BufDesc      *desc = NULL;
-    dce_error_status    eError = DCE_EOK;
-
-    _ASSERT(num > 0, DCE_EINVALID_INPUT);
-
-    desc = memplugin_alloc(num * sizeof(MmRpc_BufDesc), 0, TILER_1D_BUFFER);
-    _ASSERT(desc != NULL, DCE_EOUT_OF_MEMORY);
-
-    for( i = 0; i < num; i++ ) {
-        desc[i].handle = handle[i];
-    }
-
-    eError = MmRpc_use(MmRpcHandle, MmRpc_BufType_Handle, num, desc);
-
-    _ASSERT(eError == DCE_EOK, DCE_EIPC_CALL_FAIL);
-EXIT:
-    return (eError);
-}
-
-int dce_buf_unlock(int num, size_t *handle)
-{
-    int                 i;
-    MmRpc_BufDesc      *desc = NULL;
-    dce_error_status    eError = DCE_EOK;
-
-    _ASSERT(num > 0, DCE_EINVALID_INPUT);
-
-    desc = memplugin_alloc(num * sizeof(MmRpc_BufDesc), 0, TILER_1D_BUFFER);
-    _ASSERT(desc != NULL, DCE_EOUT_OF_MEMORY);
-
-    for( i = 0; i < num; i++ ) {
-        desc[i].handle = handle[i];
-    }
-
-    eError = MmRpc_release(MmRpcHandle, MmRpc_BufType_Handle, num, desc);
-
-    _ASSERT(eError == DCE_EOK, DCE_EIPC_CALL_FAIL);
-EXIT:
-    return (eError);
-}
-
-/* Incase of X11 or Wayland the fd can be shared to libdce using this call */
-void dce_set_fd(int dce_fd)
-{
-    fd = dce_fd;
-}
-
-int dce_get_fd(void)
-{
-    return (fd);
-}
-
-#endif /* BUILDOS_LINUX */
-
 /*=====================================================================================*/
 /** dce_ipc_init            : Initialize MmRpc. This function is called within Engine_open().
  *
diff --git a/libdce.h b/libdce.h
index fdf2c7f..5d4ffa8 100644
--- a/libdce.h
+++ b/libdce.h
@@ -53,7 +53,8 @@ typedef enum dce_error_status {
     DCE_EXDM_UNSUPPORTED = -3,
     DCE_EIPC_CREATE_FAIL = -4,
     DCE_EIPC_CALL_FAIL = -5,
-    DCE_EINVALID_INPUT = -6
+    DCE_EINVALID_INPUT = -6,
+    DCE_EOMAPDRM_FAIL = -7
 } dce_error_status;
 
 
diff --git a/libdce_linux.c b/libdce_linux.c
new file mode 100644
index 0000000..99c8b8d
--- /dev/null
+++ b/libdce_linux.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2013, Texas Instruments Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * *  Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * *  Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * *  Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <xdc/std.h>
+
+#include <xf86drm.h>
+#include <omap_drm.h>
+#include <omap_drmif.h>
+
+#include <MmRpc.h>
+#include "dce_priv.h"
+
+#define INVALID_DRM_FD (-1)
+
+int    OmapDrm_FD = INVALID_DRM_FD;
+
+void *dce_init(void)
+{
+    struct omap_device   *OmapDev = NULL;
+    dce_error_status      eError = DCE_EOK;
+
+    printf(" >> dce_init\n");
+
+    /* Open omapdrm device */
+    if( !OmapDrm_FD && OmapDrm_FD == INVALID_DRM_FD ) {
+        printf("Open omapdrm device \n");
+        OmapDrm_FD = drmOpen("omapdrm", "platform:omapdrm:00");
+        _ASSERT(OmapDrm_FD > 0, DCE_EOMAPDRM_FAIL);
+    }
+    OmapDev = omap_device_new(OmapDrm_FD);
+    _ASSERT(OmapDev != NULL, DCE_EOMAPDRM_FAIL);
+
+EXIT:
+    return ((void *)OmapDev);
+}
+
+void dce_deinit(void *dev)
+{
+    omap_device_del(dev);
+    dev = NULL;
+    close(OmapDrm_FD);
+    OmapDrm_FD = INVALID_DRM_FD;
+
+    return;
+}
+
+int dce_buf_lock(int num, size_t *handle)
+{
+    int                 i;
+    MmRpc_BufDesc      *desc = NULL;
+    dce_error_status    eError = DCE_EOK;
+
+    _ASSERT(num > 0, DCE_EINVALID_INPUT);
+
+    desc = memplugin_alloc(num * sizeof(MmRpc_BufDesc), 0, TILER_1D_BUFFER);
+    _ASSERT(desc != NULL, DCE_EOUT_OF_MEMORY);
+
+    for( i = 0; i < num; i++ ) {
+        desc[i].handle = handle[i];
+    }
+
+    eError = MmRpc_use(MmRpcHandle, MmRpc_BufType_Handle, num, desc);
+
+    _ASSERT(eError == DCE_EOK, DCE_EIPC_CALL_FAIL);
+EXIT:
+    return (eError);
+}
+
+int dce_buf_unlock(int num, size_t *handle)
+{
+    int                 i;
+    MmRpc_BufDesc      *desc = NULL;
+    dce_error_status    eError = DCE_EOK;
+
+    _ASSERT(num > 0, DCE_EINVALID_INPUT);
+
+    desc = memplugin_alloc(num * sizeof(MmRpc_BufDesc), 0, TILER_1D_BUFFER);
+    _ASSERT(desc != NULL, DCE_EOUT_OF_MEMORY);
+
+    for( i = 0; i < num; i++ ) {
+        desc[i].handle = handle[i];
+    }
+
+    eError = MmRpc_release(MmRpcHandle, MmRpc_BufType_Handle, num, desc);
+
+    _ASSERT(eError == DCE_EOK, DCE_EIPC_CALL_FAIL);
+EXIT:
+    return (eError);
+}
+
+/* Incase of X11 or Wayland the fd can be shared to libdce using this call */
+void dce_set_fd(int dce_fd)
+{
+    OmapDrm_FD = dce_fd;
+}
+
+int dce_get_fd(void)
+{
+    return (OmapDrm_FD);
+}
+
diff --git a/memplugin_linux.c b/memplugin_linux.c
index 47f03fc..db04f4c 100644
--- a/memplugin_linux.c
+++ b/memplugin_linux.c
@@ -33,7 +33,7 @@
 #include "memplugin.h"
 #include "dce_priv.h"
 
-extern struct omap_device   *dev;
+extern struct omap_device   *OmapDev;
 
 
 /*  memplugin_alloc - allocates omap_bo buffer with a header above it.
@@ -45,7 +45,7 @@ extern struct omap_device   *dev;
 void *memplugin_alloc(int sz, int height, mem_type memory_type)
 {
     MemHeader        *h;
-    struct omap_bo   *bo = omap_bo_new(dev, sz + sizeof(MemHeader), OMAP_BO_CACHED);
+    struct omap_bo   *bo = omap_bo_new(OmapDev, sz + sizeof(MemHeader), OMAP_BO_CACHED);
 
     if( !bo ) {
         return (NULL);