merge: http://linuxtv.org/hg/~quincy/v4l-dvb

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 70 insertions, 38 deletions

diff --git a/INSTALL b/INSTALL
index acf41dbb1..d71688cdf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -58,9 +58,12 @@ release		- Allows changing kernel version.
 		  Typical usage is:
 			make release VER=2.6.12-18mdk
 			(to force compiling to 2.6.12-18mdk)
-		  This will work only if 
-			/lib/modules/2.6.12-18mdk/build/
-		  points to that kernel version
+			(This will work only if 
+			 /lib/modules/2.6.12-18mdk/build/
+			 points to that kernel version)
+		  Or
+			make release DIR=~/linux-git
+			(to force using kernel at a specific dir)
 		  To use current kernel version instead:
 			make release
 
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index a60f14c14..170712515 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -50,16 +50,6 @@
 
 #include "font.h"
 
-#ifndef kzalloc
-#define kzalloc(size, flags)                            \
-({                                                      \
-	void *__ret = kmalloc(size, flags);             \
-	if (__ret)                                      \
-		memset(__ret, 0, size);                 \
-	__ret;                                          \
-})
-#endif
-
 MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");
 MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
 MODULE_LICENSE("Dual BSD/GPL");
@@ -254,7 +244,8 @@ static u8 bars[8][3] = {
 #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15
 #define TSTAMP_MIN_X 64
 
-void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)
+static void prep_to_addr(struct sg_to_addr to_addr[],
+			 struct videobuf_buffer *vb)
 {
 	int i, pos=0;
 
@@ -265,7 +256,7 @@ void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)
 	}
 }
 
-inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
+static int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
 {
 	int p1=0,p2=pages-1,p3=pages/2;
 
@@ -286,8 +277,8 @@ inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
 	return (p1);
 }
 
-void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
-					int hmax, int line, char *timestr)
+static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
+		     int hmax, int line, char *timestr)
 {
 	int  w,i,j,pos=inipos,pgpos,oldpg,y;
 	char *p,*s,*basep;
@@ -509,7 +500,7 @@ static void vivi_thread_tick(struct vivi_dmaqueue  *dma_q)
 		dprintk(1,"%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
 }
 
-void vivi_sleep(struct vivi_dmaqueue  *dma_q)
+static void vivi_sleep(struct vivi_dmaqueue  *dma_q)
 {
 	int timeout;
 	DECLARE_WAITQUEUE(wait, current);
@@ -560,7 +551,7 @@ void vivi_sleep(struct vivi_dmaqueue  *dma_q)
 #endif
 }
 
-int vivi_thread(void *data)
+static int vivi_thread(void *data)
 {
 	struct vivi_dmaqueue  *dma_q=data;
 
@@ -600,7 +591,7 @@ int vivi_thread(void *data)
 	return 0;
 }
 
-int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
+static int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
 {
 	dma_q->frame=0;
 	dma_q->ini_jiffies=jiffies;
@@ -628,7 +619,7 @@ int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
 	return 0;
 }
 
-void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)
+static void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)
 {
 	dprintk(1,"%s\n",__FUNCTION__);
 	/* shutdown control thread */
@@ -746,8 +737,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
 	return 0;
 }
 
-void
-free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
+static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
 {
 	dprintk(1,"%s\n",__FUNCTION__);
 
@@ -871,8 +861,8 @@ static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb
 	free_buffer(vq,buf);
 }
 
-int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,
-	   int direction)
+static int vivi_map_sg(void *dev, struct scatterlist *sg, int nents,
+		       int direction)
 {
 	int i;
 
@@ -888,15 +878,15 @@ int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,
 	return nents;
 }
 
-int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
-					int direction)
+static int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
+			 int direction)
 {
 	dprintk(1,"%s\n",__FUNCTION__);
 	return 0;
 }
 
-int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist,int nr_pages,
-					int direction)
+static int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist, int nr_pages,
+			    int direction)
 {
 //	dprintk(1,"%s\n",__FUNCTION__);
 
@@ -980,7 +970,7 @@ static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)
 	return 1;
 }
 
-static inline int res_locked(struct vivi_dev *dev)
+static int res_locked(struct vivi_dev *dev)
 {
 	return (dev->resources);
 }
diff --git a/v4l/Makefile b/v4l/Makefile
index 318d7f753..58b160397 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -3,9 +3,30 @@ obj = .
 endif
 
 #################################################
+# Version Check
+
+ifneq ($(KERNELRELEASE),)
+
+-include $(TOPDIR)/Rules.make
+
+else
+
+# take version info from last module build if available
+-include $(obj)/.version
+
+ifneq ($(SRCDIR),)
+KDIR := $(SRCDIR)
+else
+KDIR := /lib/modules/$(KERNELRELEASE)/build
+endif
+
+endif
+
+#################################################
 # default compilation rule
 
 default:: Makefile.media links .version
+	echo srcdir $(SRCDIR)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
 #################################################
@@ -42,20 +63,18 @@ EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
 # Kernel 2.4/2.6 specific rules
 
 ifneq ($(KERNELRELEASE),)
+
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  export-objs	:=
  list-multi	:=
 else
+include $(obj)/Makefile.kern24
+
  multi-m	:= $(filter $(list-multi), $(obj-m))
  int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
  export-objs	:= $(filter $(int-m) $(obj-m),$(export-objs))
 endif
 
-include $(obj)/Makefile.kern24
--include $(TOPDIR)/Rules.make
-else
-# take version info from last module build if available
--include $(obj)/.version
 endif
 
 #################################################
@@ -67,11 +86,9 @@ SNAPSHOT_CFLAGS	:= -DSNAPSHOT='$(shell cat $(snapshot))'
 EXTRA_CFLAGS	+= $(SNAPSHOT_CFLAGS)
 endif
 
-KDIR		:= /lib/modules/$(KERNELRELEASE)/build
 PWD		:= $(shell pwd)
-DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
+DEST		:= /lib/modules/$(KERNELRELEASE)/v4l2
 KDIR26		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/media
-KDIRUSB		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
 
 #################################################
 # Compiler fixup rules
@@ -130,6 +147,9 @@ Makefile.media:: .version
 .version::
 ifneq ($(KERNELRELEASE),)
 	@echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version
+ifneq ($(SRCDIR),)
+	@echo -e SRCDIR=$(SRCDIR)\\n >> $(obj)/.version
+endif
 else
 	@echo "No version yet."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
@@ -140,9 +160,28 @@ ifneq ($(VER),)
 	@echo "Forcing compiling to version $(VER)."
 	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 else
+ifneq ($(DIR),)
+	@perl -e 'open IN,"<$(DIR)/Makefile"; \
+		while (<IN>) { \
+			if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; next; }\
+			if (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; next; }\
+			if (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; next; }\
+			if (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; next; }\
+		}; \
+		printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n", \
+		$$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra); \
+		printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
+	@cat .version|grep KERNELRELEASE:|sed s,'KERNELRELEASE:=','Forcing compiling to version ',
+
+	@if [ ! -f $(DIR)/scripts/kallsyms ]; then \
+		echo "*** Warning: You should configure and build kernel before compiling V4L"; \
+	fi
+
+else
 	@echo "No version specified. Using `uname -r`."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 endif
+endif
 
 links::
 	@echo creating symbolic links...