[media] btcx-risc: move from media/i2c to media/common

The btcx-risc module is a helper module for bttv/conexant based TV cards. It isn't an i2c module at all, instead it should be in common since it is used by 4 pci drivers. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

[media] btcx-risc: move from media/i2c to media/common
The btcx-risc module is a helper module for bttv/conexant based TV cards. It isn't an i2c module at all, instead it should be in common since it is used by 4 pci drivers. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Hans Verkuil · Mauro Carvalho Chehab
1 parent 6259582077
Showing 12 changed files with 303 additions and 299 deletions Side-by-side Diff
drivers/media/common/Kconfig
drivers/media/common/Makefile
drivers/media/common/btcx-risc.c
drivers/media/common/btcx-risc.h
drivers/media/i2c/Kconfig
drivers/media/i2c/Makefile
drivers/media/i2c/btcx-risc.c
drivers/media/i2c/btcx-risc.h
drivers/media/pci/bt8xx/Makefile
drivers/media/pci/cx23885/Makefile
drivers/media/pci/cx25821/Makefile
drivers/media/pci/cx88/Makefile
@@ -8,6 +8,10 @@
 config VIDEO_CX2341X
 	tristate
  
+config VIDEO_BTCX
+	depends on PCI
+	tristate
+
 source "drivers/media/common/b2c2/Kconfig"
 source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
 obj-y += b2c2/ saa7146/ siano/
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
+obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
+/*
+
+    btcx-risc.c
+
+    bt848/bt878/cx2388x risc code generator.
+
+    (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/videodev2.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+#include "btcx-risc.h"
+
+MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
+MODULE_AUTHOR("Gerd Knorr");
+MODULE_LICENSE("GPL");
+
+static unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
+
+/* ---------------------------------------------------------- */
+/* allocate/free risc memory                                  */
+
+static int memcnt;
+
+void btcx_riscmem_free(struct pci_dev *pci,
+		       struct btcx_riscmem *risc)
+{
+	if (NULL == risc->cpu)
+		return;
+	if (debug) {
+		memcnt--;
+		printk("btcx: riscmem free [%d] dma=%lx\n",
+		       memcnt, (unsigned long)risc->dma);
+	}
+	pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
+	memset(risc,0,sizeof(*risc));
+}
+
+int btcx_riscmem_alloc(struct pci_dev *pci,
+		       struct btcx_riscmem *risc,
+		       unsigned int size)
+{
+	__le32 *cpu;
+	dma_addr_t dma = 0;
+
+	if (NULL != risc->cpu && risc->size < size)
+		btcx_riscmem_free(pci,risc);
+	if (NULL == risc->cpu) {
+		cpu = pci_alloc_consistent(pci, size, &dma);
+		if (NULL == cpu)
+			return -ENOMEM;
+		risc->cpu  = cpu;
+		risc->dma  = dma;
+		risc->size = size;
+		if (debug) {
+			memcnt++;
+			printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
+			       memcnt, (unsigned long)dma, cpu, size);
+		}
+	}
+	memset(risc->cpu,0,risc->size);
+	return 0;
+}
+
+/* ---------------------------------------------------------- */
+/* screen overlay helpers                                     */
+
+int
+btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
+		  struct v4l2_clip *clips, unsigned int n)
+{
+	if (win->left < 0) {
+		/* left */
+		clips[n].c.left = 0;
+		clips[n].c.top = 0;
+		clips[n].c.width  = -win->left;
+		clips[n].c.height = win->height;
+		n++;
+	}
+	if (win->left + win->width > swidth) {
+		/* right */
+		clips[n].c.left   = swidth - win->left;
+		clips[n].c.top    = 0;
+		clips[n].c.width  = win->width - clips[n].c.left;
+		clips[n].c.height = win->height;
+		n++;
+	}
+	if (win->top < 0) {
+		/* top */
+		clips[n].c.left = 0;
+		clips[n].c.top = 0;
+		clips[n].c.width  = win->width;
+		clips[n].c.height = -win->top;
+		n++;
+	}
+	if (win->top + win->height > sheight) {
+		/* bottom */
+		clips[n].c.left = 0;
+		clips[n].c.top = sheight - win->top;
+		clips[n].c.width  = win->width;
+		clips[n].c.height = win->height - clips[n].c.top;
+		n++;
+	}
+	return n;
+}
+
+int
+btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int mask)
+{
+	s32 nx,nw,dx;
+	unsigned int i;
+
+	/* fixup window */
+	nx = (win->left + mask) & ~mask;
+	nw = (win->width) & ~mask;
+	if (nx + nw > win->left + win->width)
+		nw -= mask+1;
+	dx = nx - win->left;
+	win->left  = nx;
+	win->width = nw;
+	if (debug)
+		printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
+		       win->width, win->height, win->left, win->top, dx);
+
+	/* fixup clips */
+	for (i = 0; i < n; i++) {
+		nx = (clips[i].c.left-dx) & ~mask;
+		nw = (clips[i].c.width) & ~mask;
+		if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
+			nw += mask+1;
+		clips[i].c.left  = nx;
+		clips[i].c.width = nw;
+		if (debug)
+			printk(KERN_DEBUG "btcx:   clip align %dx%d+%d+%d\n",
+			       clips[i].c.width, clips[i].c.height,
+			       clips[i].c.left, clips[i].c.top);
+	}
+	return 0;
+}
+
+void
+btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
+{
+	struct v4l2_clip swap;
+	int i,j,n;
+
+	if (nclips < 2)
+		return;
+	for (i = nclips-2; i >= 0; i--) {
+		for (n = 0, j = 0; j <= i; j++) {
+			if (clips[j].c.left > clips[j+1].c.left) {
+				swap = clips[j];
+				clips[j] = clips[j+1];
+				clips[j+1] = swap;
+				n++;
+			}
+		}
+		if (0 == n)
+			break;
+	}
+}
+
+void
+btcx_calc_skips(int line, int width, int *maxy,
+		struct btcx_skiplist *skips, unsigned int *nskips,
+		const struct v4l2_clip *clips, unsigned int nclips)
+{
+	unsigned int clip,skip;
+	int end, maxline;
+
+	skip=0;
+	maxline = 9999;
+	for (clip = 0; clip < nclips; clip++) {
+
+		/* sanity checks */
+		if (clips[clip].c.left + clips[clip].c.width <= 0)
+			continue;
+		if (clips[clip].c.left > (signed)width)
+			break;
+
+		/* vertical range */
+		if (line > clips[clip].c.top+clips[clip].c.height-1)
+			continue;
+		if (line < clips[clip].c.top) {
+			if (maxline > clips[clip].c.top-1)
+				maxline = clips[clip].c.top-1;
+			continue;
+		}
+		if (maxline > clips[clip].c.top+clips[clip].c.height-1)
+			maxline = clips[clip].c.top+clips[clip].c.height-1;
+
+		/* horizontal range */
+		if (0 == skip || clips[clip].c.left > skips[skip-1].end) {
+			/* new one */
+			skips[skip].start = clips[clip].c.left;
+			if (skips[skip].start < 0)
+				skips[skip].start = 0;
+			skips[skip].end = clips[clip].c.left + clips[clip].c.width;
+			if (skips[skip].end > width)
+				skips[skip].end = width;
+			skip++;
+		} else {
+			/* overlaps -- expand last one */
+			end = clips[clip].c.left + clips[clip].c.width;
+			if (skips[skip-1].end < end)
+				skips[skip-1].end = end;
+			if (skips[skip-1].end > width)
+				skips[skip-1].end = width;
+		}
+	}
+	*nskips = skip;
+	*maxy = maxline;
+
+	if (debug) {
+		printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
+		for (skip = 0; skip < *nskips; skip++) {
+			printk(" %d-%d",skips[skip].start,skips[skip].end);
+		}
+		printk("\n");
+	}
+}
+
+/* ---------------------------------------------------------- */
+
+EXPORT_SYMBOL(btcx_riscmem_alloc);
+EXPORT_SYMBOL(btcx_riscmem_free);
+
+EXPORT_SYMBOL(btcx_screen_clips);
+EXPORT_SYMBOL(btcx_align);
+EXPORT_SYMBOL(btcx_sort_clips);
+EXPORT_SYMBOL(btcx_calc_skips);
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
+/*
+ */
+struct btcx_riscmem {
+	unsigned int   size;
+	__le32         *cpu;
+	__le32         *jmp;
+	dma_addr_t     dma;
+};
+
+struct btcx_skiplist {
+	int start;
+	int end;
+};
+
+int  btcx_riscmem_alloc(struct pci_dev *pci,
+			struct btcx_riscmem *risc,
+			unsigned int size);
+void btcx_riscmem_free(struct pci_dev *pci,
+		       struct btcx_riscmem *risc);
+
+int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
+		      struct v4l2_clip *clips, unsigned int n);
+int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,
+	       unsigned int n, int mask);
+void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
+void btcx_calc_skips(int line, int width, int *maxy,
+		     struct btcx_skiplist *skips, unsigned int *nskips,
+		     const struct v4l2_clip *clips, unsigned int nclips);
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
@@ -2,10 +2,6 @@
 # Generic video config states
 #
  
-config VIDEO_BTCX
-	depends on PCI
-	tristate
-
 config VIDEO_TVEEPROM
 	tristate
 	depends on I2C
@@ -63,7 +63,6 @@
 obj-$(CONFIG_VIDEO_ADP1653)	+= adp1653.o
 obj-$(CONFIG_VIDEO_AS3645A)	+= as3645a.o
 obj-$(CONFIG_VIDEO_SMIAPP_PLL)	+= smiapp-pll.o
-obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 obj-$(CONFIG_VIDEO_AK881X)		+= ak881x.o
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
-/*
-
-    btcx-risc.c
-
-    bt848/bt878/cx2388x risc code generator.
-
-    (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/videodev2.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-
-#include "btcx-risc.h"
-
-MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
-MODULE_AUTHOR("Gerd Knorr");
-MODULE_LICENSE("GPL");
-
-static unsigned int debug;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
-
-/* ---------------------------------------------------------- */
-/* allocate/free risc memory                                  */
-
-static int memcnt;
-
-void btcx_riscmem_free(struct pci_dev *pci,
-		       struct btcx_riscmem *risc)
-{
-	if (NULL == risc->cpu)
-		return;
-	if (debug) {
-		memcnt--;
-		printk("btcx: riscmem free [%d] dma=%lx\n",
-		       memcnt, (unsigned long)risc->dma);
-	}
-	pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
-	memset(risc,0,sizeof(*risc));
-}
-
-int btcx_riscmem_alloc(struct pci_dev *pci,
-		       struct btcx_riscmem *risc,
-		       unsigned int size)
-{
-	__le32 *cpu;
-	dma_addr_t dma = 0;
-
-	if (NULL != risc->cpu && risc->size < size)
-		btcx_riscmem_free(pci,risc);
-	if (NULL == risc->cpu) {
-		cpu = pci_alloc_consistent(pci, size, &dma);
-		if (NULL == cpu)
-			return -ENOMEM;
-		risc->cpu  = cpu;
-		risc->dma  = dma;
-		risc->size = size;
-		if (debug) {
-			memcnt++;
-			printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
-			       memcnt, (unsigned long)dma, cpu, size);
-		}
-	}
-	memset(risc->cpu,0,risc->size);
-	return 0;
-}
-
-/* ---------------------------------------------------------- */
-/* screen overlay helpers                                     */
-
-int
-btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
-		  struct v4l2_clip *clips, unsigned int n)
-{
-	if (win->left < 0) {
-		/* left */
-		clips[n].c.left = 0;
-		clips[n].c.top = 0;
-		clips[n].c.width  = -win->left;
-		clips[n].c.height = win->height;
-		n++;
-	}
-	if (win->left + win->width > swidth) {
-		/* right */
-		clips[n].c.left   = swidth - win->left;
-		clips[n].c.top    = 0;
-		clips[n].c.width  = win->width - clips[n].c.left;
-		clips[n].c.height = win->height;
-		n++;
-	}
-	if (win->top < 0) {
-		/* top */
-		clips[n].c.left = 0;
-		clips[n].c.top = 0;
-		clips[n].c.width  = win->width;
-		clips[n].c.height = -win->top;
-		n++;
-	}
-	if (win->top + win->height > sheight) {
-		/* bottom */
-		clips[n].c.left = 0;
-		clips[n].c.top = sheight - win->top;
-		clips[n].c.width  = win->width;
-		clips[n].c.height = win->height - clips[n].c.top;
-		n++;
-	}
-	return n;
-}
-
-int
-btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int mask)
-{
-	s32 nx,nw,dx;
-	unsigned int i;
-
-	/* fixup window */
-	nx = (win->left + mask) & ~mask;
-	nw = (win->width) & ~mask;
-	if (nx + nw > win->left + win->width)
-		nw -= mask+1;
-	dx = nx - win->left;
-	win->left  = nx;
-	win->width = nw;
-	if (debug)
-		printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
-		       win->width, win->height, win->left, win->top, dx);
-
-	/* fixup clips */
-	for (i = 0; i < n; i++) {
-		nx = (clips[i].c.left-dx) & ~mask;
-		nw = (clips[i].c.width) & ~mask;
-		if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
-			nw += mask+1;
-		clips[i].c.left  = nx;
-		clips[i].c.width = nw;
-		if (debug)
-			printk(KERN_DEBUG "btcx:   clip align %dx%d+%d+%d\n",
-			       clips[i].c.width, clips[i].c.height,
-			       clips[i].c.left, clips[i].c.top);
-	}
-	return 0;
-}
-
-void
-btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
-{
-	struct v4l2_clip swap;
-	int i,j,n;
-
-	if (nclips < 2)
-		return;
-	for (i = nclips-2; i >= 0; i--) {
-		for (n = 0, j = 0; j <= i; j++) {
-			if (clips[j].c.left > clips[j+1].c.left) {
-				swap = clips[j];
-				clips[j] = clips[j+1];
-				clips[j+1] = swap;
-				n++;
-			}
-		}
-		if (0 == n)
-			break;
-	}
-}
-
-void
-btcx_calc_skips(int line, int width, int *maxy,
-		struct btcx_skiplist *skips, unsigned int *nskips,
-		const struct v4l2_clip *clips, unsigned int nclips)
-{
-	unsigned int clip,skip;
-	int end, maxline;
-
-	skip=0;
-	maxline = 9999;
-	for (clip = 0; clip < nclips; clip++) {
-
-		/* sanity checks */
-		if (clips[clip].c.left + clips[clip].c.width <= 0)
-			continue;
-		if (clips[clip].c.left > (signed)width)
-			break;
-
-		/* vertical range */
-		if (line > clips[clip].c.top+clips[clip].c.height-1)
-			continue;
-		if (line < clips[clip].c.top) {
-			if (maxline > clips[clip].c.top-1)
-				maxline = clips[clip].c.top-1;
-			continue;
-		}
-		if (maxline > clips[clip].c.top+clips[clip].c.height-1)
-			maxline = clips[clip].c.top+clips[clip].c.height-1;
-
-		/* horizontal range */
-		if (0 == skip || clips[clip].c.left > skips[skip-1].end) {
-			/* new one */
-			skips[skip].start = clips[clip].c.left;
-			if (skips[skip].start < 0)
-				skips[skip].start = 0;
-			skips[skip].end = clips[clip].c.left + clips[clip].c.width;
-			if (skips[skip].end > width)
-				skips[skip].end = width;
-			skip++;
-		} else {
-			/* overlaps -- expand last one */
-			end = clips[clip].c.left + clips[clip].c.width;
-			if (skips[skip-1].end < end)
-				skips[skip-1].end = end;
-			if (skips[skip-1].end > width)
-				skips[skip-1].end = width;
-		}
-	}
-	*nskips = skip;
-	*maxy = maxline;
-
-	if (debug) {
-		printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
-		for (skip = 0; skip < *nskips; skip++) {
-			printk(" %d-%d",skips[skip].start,skips[skip].end);
-		}
-		printk("\n");
-	}
-}
-
-/* ---------------------------------------------------------- */
-
-EXPORT_SYMBOL(btcx_riscmem_alloc);
-EXPORT_SYMBOL(btcx_riscmem_free);
-
-EXPORT_SYMBOL(btcx_screen_clips);
-EXPORT_SYMBOL(btcx_align);
-EXPORT_SYMBOL(btcx_sort_clips);
-EXPORT_SYMBOL(btcx_calc_skips);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
-/*
- */
-struct btcx_riscmem {
-	unsigned int   size;
-	__le32         *cpu;
-	__le32         *jmp;
-	dma_addr_t     dma;
-};
-
-struct btcx_skiplist {
-	int start;
-	int end;
-};
-
-int  btcx_riscmem_alloc(struct pci_dev *pci,
-			struct btcx_riscmem *risc,
-			unsigned int size);
-void btcx_riscmem_free(struct pci_dev *pci,
-		       struct btcx_riscmem *risc);
-
-int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
-		      struct v4l2_clip *clips, unsigned int n);
-int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,
-	       unsigned int n, int mask);
-void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
-void btcx_calc_skips(int line, int width, int *maxy,
-		     struct btcx_skiplist *skips, unsigned int *nskips,
-		     const struct v4l2_clip *clips, unsigned int nclips);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
@@ -8,5 +8,6 @@
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
@@ -8,6 +8,7 @@
 obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
  
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
@@ -8,6 +8,7 @@
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
  
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
@@ -11,6 +11,7 @@
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
  
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
...	...	@@ -8,6 +8,10 @@
8	8	config VIDEO_CX2341X
9	9	tristate
10	10
	11	+config VIDEO_BTCX
	12	+ depends on PCI
	13	+ tristate
	14	+
11	15	source "drivers/media/common/b2c2/Kconfig"
12	16	source "drivers/media/common/saa7146/Kconfig"
13	17	source "drivers/media/common/siano/Kconfig"
1	1	obj-y += b2c2/ saa7146/ siano/
2	2	obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
	3	+obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
	1	+/*
	2	+
	3	+ btcx-risc.c
	4	+
	5	+ bt848/bt878/cx2388x risc code generator.
	6	+
	7	+ (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
	8	+
	9	+ This program is free software; you can redistribute it and/or modify
	10	+ it under the terms of the GNU General Public License as published by
	11	+ the Free Software Foundation; either version 2 of the License, or
	12	+ (at your option) any later version.
	13	+
	14	+ This program is distributed in the hope that it will be useful,
	15	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
	16	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	17	+ GNU General Public License for more details.
	18	+
	19	+ You should have received a copy of the GNU General Public License
	20	+ along with this program; if not, write to the Free Software
	21	+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
	22	+
	23	+*/
	24	+
	25	+#include <linux/module.h>
	26	+#include <linux/init.h>
	27	+#include <linux/pci.h>
	28	+#include <linux/interrupt.h>
	29	+#include <linux/videodev2.h>
	30	+#include <asm/page.h>
	31	+#include <asm/pgtable.h>
	32	+
	33	+#include "btcx-risc.h"
	34	+
	35	+MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
	36	+MODULE_AUTHOR("Gerd Knorr");
	37	+MODULE_LICENSE("GPL");
	38	+
	39	+static unsigned int debug;
	40	+module_param(debug, int, 0644);
	41	+MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
	42	+
	43	+/* ---------------------------------------------------------- */
	44	+/* allocate/free risc memory */
	45	+
	46	+static int memcnt;
	47	+
	48	+void btcx_riscmem_free(struct pci_dev *pci,
	49	+ struct btcx_riscmem *risc)
	50	+{
	51	+ if (NULL == risc->cpu)
	52	+ return;
	53	+ if (debug) {
	54	+ memcnt--;
	55	+ printk("btcx: riscmem free [%d] dma=%lx\n",
	56	+ memcnt, (unsigned long)risc->dma);
	57	+ }
	58	+ pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
	59	+ memset(risc,0,sizeof(*risc));
	60	+}
	61	+
	62	+int btcx_riscmem_alloc(struct pci_dev *pci,
	63	+ struct btcx_riscmem *risc,
	64	+ unsigned int size)
	65	+{
	66	+ __le32 *cpu;
	67	+ dma_addr_t dma = 0;
	68	+
	69	+ if (NULL != risc->cpu && risc->size < size)
	70	+ btcx_riscmem_free(pci,risc);
	71	+ if (NULL == risc->cpu) {
	72	+ cpu = pci_alloc_consistent(pci, size, &dma);
	73	+ if (NULL == cpu)
	74	+ return -ENOMEM;
	75	+ risc->cpu = cpu;
	76	+ risc->dma = dma;
	77	+ risc->size = size;
	78	+ if (debug) {
	79	+ memcnt++;
	80	+ printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
	81	+ memcnt, (unsigned long)dma, cpu, size);
	82	+ }
	83	+ }
	84	+ memset(risc->cpu,0,risc->size);
	85	+ return 0;
	86	+}
	87	+
	88	+/* ---------------------------------------------------------- */
	89	+/* screen overlay helpers */
	90	+
	91	+int
	92	+btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
	93	+ struct v4l2_clip *clips, unsigned int n)
	94	+{
	95	+ if (win->left < 0) {
	96	+ /* left */
	97	+ clips[n].c.left = 0;
	98	+ clips[n].c.top = 0;
	99	+ clips[n].c.width = -win->left;
	100	+ clips[n].c.height = win->height;
	101	+ n++;
	102	+ }
	103	+ if (win->left + win->width > swidth) {
	104	+ /* right */
	105	+ clips[n].c.left = swidth - win->left;
	106	+ clips[n].c.top = 0;
	107	+ clips[n].c.width = win->width - clips[n].c.left;
	108	+ clips[n].c.height = win->height;
	109	+ n++;
	110	+ }
	111	+ if (win->top < 0) {
	112	+ /* top */
	113	+ clips[n].c.left = 0;
	114	+ clips[n].c.top = 0;
	115	+ clips[n].c.width = win->width;
	116	+ clips[n].c.height = -win->top;
	117	+ n++;
	118	+ }
	119	+ if (win->top + win->height > sheight) {
	120	+ /* bottom */
	121	+ clips[n].c.left = 0;
	122	+ clips[n].c.top = sheight - win->top;
	123	+ clips[n].c.width = win->width;
	124	+ clips[n].c.height = win->height - clips[n].c.top;
	125	+ n++;
	126	+ }
	127	+ return n;
	128	+}
	129	+
	130	+int
	131	+btcx_align(struct v4l2_rect win, struct v4l2_clip clips, unsigned int n, int mask)
	132	+{
	133	+ s32 nx,nw,dx;
	134	+ unsigned int i;
	135	+
	136	+ /* fixup window */
	137	+ nx = (win->left + mask) & ~mask;
	138	+ nw = (win->width) & ~mask;
	139	+ if (nx + nw > win->left + win->width)
	140	+ nw -= mask+1;
	141	+ dx = nx - win->left;
	142	+ win->left = nx;
	143	+ win->width = nw;
	144	+ if (debug)
	145	+ printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
	146	+ win->width, win->height, win->left, win->top, dx);
	147	+
	148	+ /* fixup clips */
	149	+ for (i = 0; i < n; i++) {
	150	+ nx = (clips[i].c.left-dx) & ~mask;
	151	+ nw = (clips[i].c.width) & ~mask;
	152	+ if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
	153	+ nw += mask+1;
	154	+ clips[i].c.left = nx;
	155	+ clips[i].c.width = nw;
	156	+ if (debug)
	157	+ printk(KERN_DEBUG "btcx: clip align %dx%d+%d+%d\n",
	158	+ clips[i].c.width, clips[i].c.height,
	159	+ clips[i].c.left, clips[i].c.top);
	160	+ }
	161	+ return 0;
	162	+}
	163	+
	164	+void
	165	+btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
	166	+{
	167	+ struct v4l2_clip swap;
	168	+ int i,j,n;
	169	+
	170	+ if (nclips < 2)
	171	+ return;
	172	+ for (i = nclips-2; i >= 0; i--) {
	173	+ for (n = 0, j = 0; j <= i; j++) {
	174	+ if (clips[j].c.left > clips[j+1].c.left) {
	175	+ swap = clips[j];
	176	+ clips[j] = clips[j+1];
	177	+ clips[j+1] = swap;
	178	+ n++;
	179	+ }
	180	+ }
	181	+ if (0 == n)
	182	+ break;
	183	+ }
	184	+}
	185	+
	186	+void
	187	+btcx_calc_skips(int line, int width, int *maxy,
	188	+ struct btcx_skiplist skips, unsigned int nskips,
	189	+ const struct v4l2_clip *clips, unsigned int nclips)
	190	+{
	191	+ unsigned int clip,skip;
	192	+ int end, maxline;
	193	+
	194	+ skip=0;
	195	+ maxline = 9999;
	196	+ for (clip = 0; clip < nclips; clip++) {
	197	+
	198	+ /* sanity checks */
	199	+ if (clips[clip].c.left + clips[clip].c.width <= 0)
	200	+ continue;
	201	+ if (clips[clip].c.left > (signed)width)
	202	+ break;
	203	+
	204	+ /* vertical range */
	205	+ if (line > clips[clip].c.top+clips[clip].c.height-1)
	206	+ continue;
	207	+ if (line < clips[clip].c.top) {
	208	+ if (maxline > clips[clip].c.top-1)
	209	+ maxline = clips[clip].c.top-1;
	210	+ continue;
	211	+ }
	212	+ if (maxline > clips[clip].c.top+clips[clip].c.height-1)
	213	+ maxline = clips[clip].c.top+clips[clip].c.height-1;
	214	+
	215	+ /* horizontal range */
	216	+ if (0 == skip \|\| clips[clip].c.left > skips[skip-1].end) {
	217	+ /* new one */
	218	+ skips[skip].start = clips[clip].c.left;
	219	+ if (skips[skip].start < 0)
	220	+ skips[skip].start = 0;
	221	+ skips[skip].end = clips[clip].c.left + clips[clip].c.width;
	222	+ if (skips[skip].end > width)
	223	+ skips[skip].end = width;
	224	+ skip++;
	225	+ } else {
	226	+ /* overlaps -- expand last one */
	227	+ end = clips[clip].c.left + clips[clip].c.width;
	228	+ if (skips[skip-1].end < end)
	229	+ skips[skip-1].end = end;
	230	+ if (skips[skip-1].end > width)
	231	+ skips[skip-1].end = width;
	232	+ }
	233	+ }
	234	+ *nskips = skip;
	235	+ *maxy = maxline;
	236	+
	237	+ if (debug) {
	238	+ printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
	239	+ for (skip = 0; skip < *nskips; skip++) {
	240	+ printk(" %d-%d",skips[skip].start,skips[skip].end);
	241	+ }
	242	+ printk("\n");
	243	+ }
	244	+}
	245	+
	246	+/* ---------------------------------------------------------- */
	247	+
	248	+EXPORT_SYMBOL(btcx_riscmem_alloc);
	249	+EXPORT_SYMBOL(btcx_riscmem_free);
	250	+
	251	+EXPORT_SYMBOL(btcx_screen_clips);
	252	+EXPORT_SYMBOL(btcx_align);
	253	+EXPORT_SYMBOL(btcx_sort_clips);
	254	+EXPORT_SYMBOL(btcx_calc_skips);
	255	+
	256	+/*
	257	+ * Local variables:
	258	+ * c-basic-offset: 8
	259	+ * End:
	260	+ */
	1	+/*
	2	+ */
	3	+struct btcx_riscmem {
	4	+ unsigned int size;
	5	+ __le32 *cpu;
	6	+ __le32 *jmp;
	7	+ dma_addr_t dma;
	8	+};
	9	+
	10	+struct btcx_skiplist {
	11	+ int start;
	12	+ int end;
	13	+};
	14	+
	15	+int btcx_riscmem_alloc(struct pci_dev *pci,
	16	+ struct btcx_riscmem *risc,
	17	+ unsigned int size);
	18	+void btcx_riscmem_free(struct pci_dev *pci,
	19	+ struct btcx_riscmem *risc);
	20	+
	21	+int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
	22	+ struct v4l2_clip *clips, unsigned int n);
	23	+int btcx_align(struct v4l2_rect win, struct v4l2_clip clips,
	24	+ unsigned int n, int mask);
	25	+void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
	26	+void btcx_calc_skips(int line, int width, int *maxy,
	27	+ struct btcx_skiplist skips, unsigned int nskips,
	28	+ const struct v4l2_clip *clips, unsigned int nclips);
	29	+
	30	+/*
	31	+ * Local variables:
	32	+ * c-basic-offset: 8
	33	+ * End:
	34	+ */
...	...	@@ -2,10 +2,6 @@
2	2	# Generic video config states
3	3	#
4	4
5		-config VIDEO_BTCX
6		- depends on PCI
7		- tristate
8		-
9	5	config VIDEO_TVEEPROM
10	6	tristate
11	7	depends on I2C
...	...	@@ -63,7 +63,6 @@
63	63	obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
64	64	obj-$(CONFIG_VIDEO_AS3645A) += as3645a.o
65	65	obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o
66		-obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
67	66	obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
68	67	obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
1		-/*
2		-
3		- btcx-risc.c
4		-
5		- bt848/bt878/cx2388x risc code generator.
6		-
7		- (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
8		-
9		- This program is free software; you can redistribute it and/or modify
10		- it under the terms of the GNU General Public License as published by
11		- the Free Software Foundation; either version 2 of the License, or
12		- (at your option) any later version.
13		-
14		- This program is distributed in the hope that it will be useful,
15		- but WITHOUT ANY WARRANTY; without even the implied warranty of
16		- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17		- GNU General Public License for more details.
18		-
19		- You should have received a copy of the GNU General Public License
20		- along with this program; if not, write to the Free Software
21		- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22		-
23		-*/
24		-
25		-#include <linux/module.h>
26		-#include <linux/init.h>
27		-#include <linux/pci.h>
28		-#include <linux/interrupt.h>
29		-#include <linux/videodev2.h>
30		-#include <asm/page.h>
31		-#include <asm/pgtable.h>
32		-
33		-#include "btcx-risc.h"
34		-
35		-MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
36		-MODULE_AUTHOR("Gerd Knorr");
37		-MODULE_LICENSE("GPL");
38		-
39		-static unsigned int debug;
40		-module_param(debug, int, 0644);
41		-MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
42		-
43		-/* ---------------------------------------------------------- */
44		-/* allocate/free risc memory */
45		-
46		-static int memcnt;
47		-
48		-void btcx_riscmem_free(struct pci_dev *pci,
49		- struct btcx_riscmem *risc)
50		-{
51		- if (NULL == risc->cpu)
52		- return;
53		- if (debug) {
54		- memcnt--;
55		- printk("btcx: riscmem free [%d] dma=%lx\n",
56		- memcnt, (unsigned long)risc->dma);
57		- }
58		- pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
59		- memset(risc,0,sizeof(*risc));
60		-}
61		-
62		-int btcx_riscmem_alloc(struct pci_dev *pci,
63		- struct btcx_riscmem *risc,
64		- unsigned int size)
65		-{
66		- __le32 *cpu;
67		- dma_addr_t dma = 0;
68		-
69		- if (NULL != risc->cpu && risc->size < size)
70		- btcx_riscmem_free(pci,risc);
71		- if (NULL == risc->cpu) {
72		- cpu = pci_alloc_consistent(pci, size, &dma);
73		- if (NULL == cpu)
74		- return -ENOMEM;
75		- risc->cpu = cpu;
76		- risc->dma = dma;
77		- risc->size = size;
78		- if (debug) {
79		- memcnt++;
80		- printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
81		- memcnt, (unsigned long)dma, cpu, size);
82		- }
83		- }
84		- memset(risc->cpu,0,risc->size);
85		- return 0;
86		-}
87		-
88		-/* ---------------------------------------------------------- */
89		-/* screen overlay helpers */
90		-
91		-int
92		-btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
93		- struct v4l2_clip *clips, unsigned int n)
94		-{
95		- if (win->left < 0) {
96		- /* left */
97		- clips[n].c.left = 0;
98		- clips[n].c.top = 0;
99		- clips[n].c.width = -win->left;
100		- clips[n].c.height = win->height;
101		- n++;
102		- }
103		- if (win->left + win->width > swidth) {
104		- /* right */
105		- clips[n].c.left = swidth - win->left;
106		- clips[n].c.top = 0;
107		- clips[n].c.width = win->width - clips[n].c.left;
108		- clips[n].c.height = win->height;
109		- n++;
110		- }
111		- if (win->top < 0) {
112		- /* top */
113		- clips[n].c.left = 0;
114		- clips[n].c.top = 0;
115		- clips[n].c.width = win->width;
116		- clips[n].c.height = -win->top;
117		- n++;
118		- }
119		- if (win->top + win->height > sheight) {
120		- /* bottom */
121		- clips[n].c.left = 0;
122		- clips[n].c.top = sheight - win->top;
123		- clips[n].c.width = win->width;
124		- clips[n].c.height = win->height - clips[n].c.top;
125		- n++;
126		- }
127		- return n;
128		-}
129		-
130		-int
131		-btcx_align(struct v4l2_rect win, struct v4l2_clip clips, unsigned int n, int mask)
132		-{
133		- s32 nx,nw,dx;
134		- unsigned int i;
135		-
136		- /* fixup window */
137		- nx = (win->left + mask) & ~mask;
138		- nw = (win->width) & ~mask;
139		- if (nx + nw > win->left + win->width)
140		- nw -= mask+1;
141		- dx = nx - win->left;
142		- win->left = nx;
143		- win->width = nw;
144		- if (debug)
145		- printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
146		- win->width, win->height, win->left, win->top, dx);
147		-
148		- /* fixup clips */
149		- for (i = 0; i < n; i++) {
150		- nx = (clips[i].c.left-dx) & ~mask;
151		- nw = (clips[i].c.width) & ~mask;
152		- if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
153		- nw += mask+1;
154		- clips[i].c.left = nx;
155		- clips[i].c.width = nw;
156		- if (debug)
157		- printk(KERN_DEBUG "btcx: clip align %dx%d+%d+%d\n",
158		- clips[i].c.width, clips[i].c.height,
159		- clips[i].c.left, clips[i].c.top);
160		- }
161		- return 0;
162		-}
163		-
164		-void
165		-btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
166		-{
167		- struct v4l2_clip swap;
168		- int i,j,n;
169		-
170		- if (nclips < 2)
171		- return;
172		- for (i = nclips-2; i >= 0; i--) {
173		- for (n = 0, j = 0; j <= i; j++) {
174		- if (clips[j].c.left > clips[j+1].c.left) {
175		- swap = clips[j];
176		- clips[j] = clips[j+1];
177		- clips[j+1] = swap;
178		- n++;
179		- }
180		- }
181		- if (0 == n)
182		- break;
183		- }
184		-}
185		-
186		-void
187		-btcx_calc_skips(int line, int width, int *maxy,
188		- struct btcx_skiplist skips, unsigned int nskips,
189		- const struct v4l2_clip *clips, unsigned int nclips)
190		-{
191		- unsigned int clip,skip;
192		- int end, maxline;
193		-
194		- skip=0;
195		- maxline = 9999;
196		- for (clip = 0; clip < nclips; clip++) {
197		-
198		- /* sanity checks */
199		- if (clips[clip].c.left + clips[clip].c.width <= 0)
200		- continue;
201		- if (clips[clip].c.left > (signed)width)
202		- break;
203		-
204		- /* vertical range */
205		- if (line > clips[clip].c.top+clips[clip].c.height-1)
206		- continue;
207		- if (line < clips[clip].c.top) {
208		- if (maxline > clips[clip].c.top-1)
209		- maxline = clips[clip].c.top-1;
210		- continue;
211		- }
212		- if (maxline > clips[clip].c.top+clips[clip].c.height-1)
213		- maxline = clips[clip].c.top+clips[clip].c.height-1;
214		-
215		- /* horizontal range */
216		- if (0 == skip \|\| clips[clip].c.left > skips[skip-1].end) {
217		- /* new one */
218		- skips[skip].start = clips[clip].c.left;
219		- if (skips[skip].start < 0)
220		- skips[skip].start = 0;
221		- skips[skip].end = clips[clip].c.left + clips[clip].c.width;
222		- if (skips[skip].end > width)
223		- skips[skip].end = width;
224		- skip++;
225		- } else {
226		- /* overlaps -- expand last one */
227		- end = clips[clip].c.left + clips[clip].c.width;
228		- if (skips[skip-1].end < end)
229		- skips[skip-1].end = end;
230		- if (skips[skip-1].end > width)
231		- skips[skip-1].end = width;
232		- }
233		- }
234		- *nskips = skip;
235		- *maxy = maxline;
236		-
237		- if (debug) {
238		- printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
239		- for (skip = 0; skip < *nskips; skip++) {
240		- printk(" %d-%d",skips[skip].start,skips[skip].end);
241		- }
242		- printk("\n");
243		- }
244		-}
245		-
246		-/* ---------------------------------------------------------- */
247		-
248		-EXPORT_SYMBOL(btcx_riscmem_alloc);
249		-EXPORT_SYMBOL(btcx_riscmem_free);
250		-
251		-EXPORT_SYMBOL(btcx_screen_clips);
252		-EXPORT_SYMBOL(btcx_align);
253		-EXPORT_SYMBOL(btcx_sort_clips);
254		-EXPORT_SYMBOL(btcx_calc_skips);
255		-
256		-/*
257		- * Local variables:
258		- * c-basic-offset: 8
259		- * End:
260		- */
1		-/*
2		- */
3		-struct btcx_riscmem {
4		- unsigned int size;
5		- __le32 *cpu;
6		- __le32 *jmp;
7		- dma_addr_t dma;
8		-};
9		-
10		-struct btcx_skiplist {
11		- int start;
12		- int end;
13		-};
14		-
15		-int btcx_riscmem_alloc(struct pci_dev *pci,
16		- struct btcx_riscmem *risc,
17		- unsigned int size);
18		-void btcx_riscmem_free(struct pci_dev *pci,
19		- struct btcx_riscmem *risc);
20		-
21		-int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
22		- struct v4l2_clip *clips, unsigned int n);
23		-int btcx_align(struct v4l2_rect win, struct v4l2_clip clips,
24		- unsigned int n, int mask);
25		-void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
26		-void btcx_calc_skips(int line, int width, int *maxy,
27		- struct btcx_skiplist skips, unsigned int nskips,
28		- const struct v4l2_clip *clips, unsigned int nclips);
29		-
30		-/*
31		- * Local variables:
32		- * c-basic-offset: 8
33		- * End:
34		- */
...	...	@@ -8,5 +8,6 @@
8	8	ccflags-y += -Idrivers/media/dvb-core
9	9	ccflags-y += -Idrivers/media/dvb-frontends
10	10	ccflags-y += -Idrivers/media/i2c
	11	+ccflags-y += -Idrivers/media/common
11	12	ccflags-y += -Idrivers/media/tuners
...	...	@@ -8,6 +8,7 @@
8	8	obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
9	9
10	10	ccflags-y += -Idrivers/media/i2c
	11	+ccflags-y += -Idrivers/media/common
11	12	ccflags-y += -Idrivers/media/tuners
12	13	ccflags-y += -Idrivers/media/dvb-core
13	14	ccflags-y += -Idrivers/media/dvb-frontends