Commit c01a3595 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] rtl28xxu: convert to new DVB USB 



Tested-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d584b838

drivers/media/dvb/dvb-usb-v2/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -124,3 +124,16 @@ config DVB_USB_MXL111SF 
	help

	  Say Y here to support the MxL111SF USB2.0 DTV receiver.



config DVB_USB_RTL28XXU

	tristate "Realtek RTL28xxU DVB USB support"

	depends on DVB_USB_V2 && EXPERIMENTAL

	select DVB_RTL2830

	select DVB_RTL2832

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_FC0012 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_FC0013 if !MEDIA_TUNER_CUSTOMISE

	help

	  Say Y here to support the Realtek RTL28xxU DVB USB receiver.

drivers/media/dvb/dvb-usb-v2/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o 
obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o

obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o



dvb-usb-rtl28xxu-objs = rtl28xxu.o

obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o



ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core

ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/

ccflags-y += -I$(srctree)/drivers/media/common/tuners

drivers/media/dvb/dvb-usb/rtl28xxu.c→drivers/media/dvb/dvb-usb-v2/rtl28xxu.c

+236 −371

File changed and moved.

Preview size limit exceeded, changes collapsed.

drivers/media/dvb/dvb-usb/rtl28xxu.h→drivers/media/dvb/dvb-usb-v2/rtl28xxu.h

+8 −18
Original line number Diff line number Diff line
@@ -22,27 +22,17 @@ 
#ifndef RTL28XXU_H

#define RTL28XXU_H



#define DVB_USB_LOG_PREFIX "rtl28xxu"

#include "dvb-usb.h"

#include "dvb_usb.h"



#define deb_info(args...) dprintk(dvb_usb_rtl28xxu_debug, 0x01, args)

#define deb_rc(args...)   dprintk(dvb_usb_rtl28xxu_debug, 0x02, args)

#define deb_xfer(args...) dprintk(dvb_usb_rtl28xxu_debug, 0x04, args)

#define deb_reg(args...)  dprintk(dvb_usb_rtl28xxu_debug, 0x08, args)

#define deb_i2c(args...)  dprintk(dvb_usb_rtl28xxu_debug, 0x10, args)

#define deb_fw(args...)   dprintk(dvb_usb_rtl28xxu_debug, 0x20, args)



#define deb_dump(r, t, v, i, b, l, func) { \

	int loop_; \

	func("%02x %02x %02x %02x %02x %02x %02x %02x", \

		t, r, v & 0xff, v >> 8, i & 0xff, i >> 8, l & 0xff, l >> 8); \

#define deb_dump(r, t, v, i, b, l) { \

	char *direction; \

	if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \

		func(" >>> "); \

		direction = ">>>"; \

	else \

		func(" <<< "); \

	for (loop_ = 0; loop_ < l; loop_++) \

		func("%02x ", b[loop_]); \

	func("\n");\

		direction = "<<<"; \

	dev_dbg(&d->udev->dev, "%s: %02x %02x %02x %02x %02x %02x %02x %02x " \

			"%s [%d bytes]\n",  __func__, t, r, v & 0xff, v >> 8, \

			i & 0xff, i >> 8, l & 0xff, l >> 8, direction, l); \

}



/*

drivers/media/dvb/dvb-usb/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -319,16 +319,3 @@ config DVB_USB_IT913X 
	help

	  Say Y here to support the it913x device

config DVB_USB_RTL28XXU

	tristate "Realtek RTL28xxU DVB USB support"

	depends on DVB_USB && EXPERIMENTAL

	select DVB_RTL2830

	select DVB_RTL2832

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_FC0012 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_FC0013 if !MEDIA_TUNER_CUSTOMISE

	help

	  Say Y here to support the Realtek RTL28xxU DVB USB receiver.