fix out-of-tree build and new kernel support

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..92787d4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+ifeq ($(MAKECMDGOALS),)
+MAKECMDGOALS = all
+endif
+
+$(MAKECMDGOALS):
+       make -C pvr $@

diff --git a/pvr/Makefile b/pvr/Makefile
index f253168..acdf1db 100644 (file)
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -1,3 +1,47 @@
+CONFIG_PVR = m
+
+CONFIG_PVR_RELEASE = y
+CONFIG_PVR_DEBUG = n
+CONFIG_PVR_TIMING = n
+
+CONFIG_PVR_DEBUG_EXTRA = n
+CONFIG_PVR_DEBUG_PDUMP = n
+CONFIG_PVR_PDUMP_MODE_STANDARD = n
+CONFIG_PVR_PDUMP_MODE_FULL = n
+CONFIG_PVR_EDM_DEBUG = n
+CONFIG_NO_HARDWARE = n
+CONFIG_PVR_FORCE_CLOCKS_ON = n
+CONFIG_PVR_EXAMPLES = n
+CONFIG_PVR_TRACE_CMD = n
+
+ccflags-$(CONFIG_PVR_DEBUG) += -DCONFIG_PVR_DEBUG
+ccflags-$(CONFIG_PVR_DEBUG_EXTRA) += -DCONFIG_PVR_DEBUG_EXTRA
+ccflags-$(CONFIG_PVR_DEBUG_PDUMP) += -DCONFIG_PVR_DEBUG_PDUMP \
+       -DCONFIG_PVR_PDUMP_INITIAL_MAX_FRAME_COUNT=4
+ccflags-$(CONFIG_PVR_PDUMP_MODE_STANDARD) += -DCONFIG_PVR_PDUMP_MODE_STANDARD
+ccflags-$(CONFIG_PVR_PDUMP_MODE_FULL) += -DCONFIG_PVR_PDUMP_MODE_FULL
+ccflags-$(CONFIG_PVR_EDM_DEBUG) += -DCONFIG_PVR_EDM_DEBUG
+ccflags-$(CONFIG_PVR_EXAMPLES) += -DCONFIG_PVR_EXAMPLES
+ccflags-$(CONFIG_PVR_FORCE_CLOCKS_ON) += -DCONFIG_PVR_FORCE_CLOCKS_ON
+ccflags-$(CONFIG_PVR_NO_HARDWARE) += -DCONFIG_PVR_NO_HARDWARE
+ccflags-$(CONFIG_PVR_RELEASE) += -DCONFIG_PVR_RELEASE
+ccflags-$(CONFIG_PVR_TIMING) += -DCONFIG_PVR_TIMING
+ccflags-$(CONFIG_PVR_TOOLS) += -DCONFIG_PVR_TOOLS
+ccflags-$(CONFIG_PVR_TRACE_CMD) += -DCONFIG_PVR_TRACE_CMD \
+       -DCONFIG_PVR_TRACE_CMD_BUF_SHIFT=3
+
+ccflags-y += -I$(src)/../include
+
+ifeq ($(KERNELRELEASE),)
+all:
+       $(MAKE) -C $(KERNELDIR) M=`pwd` $*
+
+clean:
+       $(MAKE) -C $(KERNELDIR) M=`pwd` clean
+endif
+
+###
+
 obj-$(CONFIG_PVR)      += omaplfb.o pvrsrvkm.o
 
 omaplfb-objs           := omaplfb_displayclass.o omaplfb_linux.o
@@ -31,7 +75,7 @@ CBUILD                        := -O2                                          \
                           -DPVR_BUILD_DIR="\"$(PVR_BUILD_DIR)\""       \
                           -DPVR_BUILD_DATE="\"$(DATE)\""
 
-ccflags-y              += $(CBUILD) -include $(srctree)/$(src)/pvrconfig.h
+ccflags-y              += $(CBUILD) -include $(src)/pvrconfig.h
 ccflags-y              += $(ccflags-m)
 
 

diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index ae6cce4..b9d023b 100644 (file)
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -39,6 +39,11 @@
 #include "kerneldisplay.h"
 #include "omaplfb.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#define acquire_console_sem console_lock
+#define release_console_sem console_unlock
+#endif
+
 static void *gpvAnchor;
 
 static int fb_idx;

diff --git a/pvr/omaplfb_linux.c b/pvr/omaplfb_linux.c
index 9ed02c5..b79a59e 100644 (file)
--- a/pvr/omaplfb_linux.c
+++ b/pvr/omaplfb_linux.c
@@ -43,7 +43,13 @@
 #include "omaplfb.h"
 #include "pvrmodule.h"
 
+#if   (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
 #include <plat/display.h>
+#else
+#include <mach/display.h>
+#endif
 
 MODULE_SUPPORTED_DEVICE(DEVNAME);
 

diff --git a/pvr/pvr_debugfs.c b/pvr/pvr_debugfs.c
index 32ca6c3..d1493fb 100644 (file)
--- a/pvr/pvr_debugfs.c
+++ b/pvr/pvr_debugfs.c
@@ -23,6 +23,7 @@
  *
  */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/vmalloc.h>
 #include <linux/mutex.h>

diff --git a/pvr/pvr_events.c b/pvr/pvr_events.c
index 6b945df..b2f6046 100644 (file)
--- a/pvr/pvr_events.c
+++ b/pvr/pvr_events.c
@@ -14,8 +14,15 @@
 #include <linux/fs.h>
 #include <linux/notifier.h>
 #include <linux/slab.h>
+#include <linux/version.h>
 
+#if   (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
 #include <plat/display.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+#include <mach/display.h>
+#endif
 
 static spinlock_t event_lock;
 static struct list_head sync_wait_list;