Merge "Tidy up unused/badly named headers"

6 files changed, 9 insertions, 86 deletions

diff --git a/README b/README
index 8d05217..0677022 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ HW Cursor plane configuration
 ------------------------------
 
 The cursor plane format needs to be modified to select the format that the platform expects. This can
-be done by setting DRM_CURSOR_PLANE_FORMAT define to the desired format in omap_drmif_fb.h.
+be done by setting DRM_CURSOR_PLANE_FORMAT define to the desired format in omap_dumb.h.
 
 Currently available options are:
 
diff --git a/src/omap_driver.h b/src/omap_driver.h
index 825f898..27e5d1b 100644
--- a/src/omap_driver.h
+++ b/src/omap_driver.h
@@ -56,7 +56,7 @@
 #include "xf86drm.h"
 #include "dri2.h"
 
-#include "omap_drmif_fb.h"
+#include "omap_dumb.h"
 
 #include <errno.h>
 
diff --git a/src/omap_dumb.c b/src/omap_dumb.c
index 51373d9..06e8368 100644
--- a/src/omap_dumb.c
+++ b/src/omap_dumb.c
@@ -31,7 +31,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "omap_drmif_fb.h"
+#include "omap_dumb.h"
 #include "drmmode_driver.h"
 
 struct armsoc_device {
diff --git a/src/omap_drmif_fb.h b/src/omap_dumb.h
index 31dbb6a..513c5ce 100644
--- a/src/omap_drmif_fb.h
+++ b/src/omap_dumb.h
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#ifndef OMAP_DRMIF_FB_H_
-#define OMAP_DRMIF_FB_H_
+#ifndef OMAP_DUMB_H_
+#define OMAP_DUMB_H_
 
 #include <stdint.h>
 
@@ -82,5 +82,5 @@ void armsoc_bo_clear_dmabuf(struct armsoc_bo *bo);
 int armsoc_bo_has_dmabuf(struct armsoc_bo *bo);
 int armsoc_bo_clear(struct armsoc_bo *bo);
 
-#endif /* OMAP_DRMIF_FB_H_ */
+#endif /* OMAP_DUMB_H_ */
 
diff --git a/src/omap_exa.h b/src/omap_exa.h
index 16dbcd8..3c5d66e 100644
--- a/src/omap_exa.h
+++ b/src/omap_exa.h
@@ -33,8 +33,9 @@
  * isolation between structs shared with submodules and stuff internal
  * to core driver..
  */
-#include "omap_drmif_fb.h"
-#include "omap_util.h"
+#include "omap_dumb.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
 #include "exa.h"
 #include "compat-api.h"
 
diff --git a/src/omap_util.h b/src/omap_util.h
deleted file mode 100644
index 2654a71..0000000
--- a/src/omap_util.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
-/*
- * Copyright © 2011 Texas Instruments, Inc
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- *    Ian Elliott <ianelliottus@yahoo.com>
- *    Rob Clark <rob@ti.com>
- */
-
-#ifndef __OMAP_UTIL_H__
-#define __OMAP_UTIL_H__
-
-/* All drivers need the following headers: */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-
-/**
- * This controls whether debug statements (and function "trace" enter/exit)
- * messages are sent to the log file (TRUE) or are ignored (FALSE).
- */
-extern _X_EXPORT Bool armsocDebug;
-
-
-/* Various logging/debug macros for use in the X driver and the external
- * sub-modules:
- */
-#define TRACE_ENTER() \
-		do { if (armsocDebug) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s:%d: Entering\n",\
-				__FUNCTION__, __LINE__); } while (0)
-#define TRACE_EXIT() \
-		do { if (armsocDebug) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s:%d: Exiting\n",\
-				__FUNCTION__, __LINE__); } while (0)
-#define DEBUG_MSG(fmt, ...) \
-		do { if (armsocDebug) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s:%d " fmt "\n",\
-				__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
-#define INFO_MSG(fmt, ...) \
-		do { xf86DrvMsg(pScrn->scrnIndex, X_INFO, fmt "\n",\
-				##__VA_ARGS__); } while (0)
-#define CONFIG_MSG(fmt, ...) \
-		do { xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, fmt "\n",\
-				##__VA_ARGS__); } while (0)
-#define WARNING_MSG(fmt, ...) \
-		do { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "WARNING: " fmt "\n",\
-				##__VA_ARGS__); } while (0)
-#define ERROR_MSG(fmt, ...) \
-		do { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ERROR: " fmt "\n",\
-				##__VA_ARGS__); } while (0)
-#define EARLY_ERROR_MSG(fmt, ...) \
-		do { xf86Msg(X_ERROR, "ERROR: " fmt "\n",\
-				##__VA_ARGS__); } while (0)
-
-
-extern unsigned int
-ARMSOCCalculateStride(unsigned int fbWidth, unsigned int bitsPerPixel);
-extern unsigned int
-ARMSOCCalculateTiledStride(unsigned int width, unsigned int bitsPerPixel);
-
-#endif /* __OMAP_UTIL_H__ */