Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ca8bef authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] btcx-risc: move to bt8xx 



The btcx-risc module is no longer used by other drivers except for bttv.
So move it from common to bt8xx and make it part of the bttv driver instead
of as a separate module.

This module should never have been a common module since most of the code
has always been bttv specific.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1e451808

drivers/media/common/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ comment "common driver options" 
config VIDEO_CX2341X

	tristate



config VIDEO_BTCX

	depends on PCI

	tristate



config VIDEO_TVEEPROM

	tristate

	depends on I2C

drivers/media/common/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y += b2c2/ saa7146/ siano/

obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o

obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o

obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o

obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o

drivers/media/pci/bt8xx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config VIDEO_BT848 
	tristate "BT848 Video For Linux"

	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2

	select I2C_ALGOBIT

	select VIDEO_BTCX

	select VIDEOBUF_DMA_SG

	depends on RC_CORE

	select VIDEO_TUNER

drivers/media/pci/bt8xx/Makefile

+1 −1
Original line number Diff line number Diff line 
bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \

		       bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \

		       bttv-input.o bttv-audio-hook.o

		       bttv-input.o bttv-audio-hook.o btcx-risc.o



obj-$(CONFIG_VIDEO_BT848) += bttv.o

obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o

drivers/media/common/btcx-risc.c→drivers/media/pci/bt8xx/btcx-risc.c

+8 −22
Original line number Diff line number Diff line
@@ -32,13 +32,9 @@ 


#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)");

static unsigned int btcx_debug;

module_param(btcx_debug, int, 0644);

MODULE_PARM_DESC(btcx_debug,"debug messages, default is 0 (no)");



/* ---------------------------------------------------------- */

/* allocate/free risc memory                                  */
@@ -50,7 +46,7 @@ void btcx_riscmem_free(struct pci_dev *pci, 
{

	if (NULL == risc->cpu)

		return;

	if (debug) {

	if (btcx_debug) {

		memcnt--;

		printk("btcx: riscmem free [%d] dma=%lx\n",

		       memcnt, (unsigned long)risc->dma);
@@ -75,7 +71,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci, 
		risc->cpu  = cpu;

		risc->dma  = dma;

		risc->size = size;

		if (debug) {

		if (btcx_debug) {

			memcnt++;

			printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",

			       memcnt, (unsigned long)dma, cpu, size);
@@ -141,7 +137,7 @@ btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int m 
	dx = nx - win->left;

	win->left  = nx;

	win->width = nw;

	if (debug)

	if (btcx_debug)

		printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",

		       win->width, win->height, win->left, win->top, dx);
@@ -153,7 +149,7 @@ btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int m 
			nw += mask+1;

		clips[i].c.left  = nx;

		clips[i].c.width = nw;

		if (debug)

		if (btcx_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);
@@ -234,7 +230,7 @@ btcx_calc_skips(int line, int width, int *maxy, 
	*nskips = skip;

	*maxy = maxline;



	if (debug) {

	if (btcx_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);
@@ -242,13 +238,3 @@ btcx_calc_skips(int line, int width, int *maxy, 
		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);