Commit fada1935 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: move dvb kAPI headers to include/media

Except for DVB, all media kAPI headers are at include/media.

Move the headers to it.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a114a585
Digital TV Conditional Access kABI
----------------------------------
.. kernel-doc:: drivers/media/dvb-core/dvb_ca_en50221.h
.. kernel-doc:: include/media/dvb_ca_en50221.h
......@@ -7,7 +7,7 @@ Math functions
Provide some commonly-used math functions, usually required in order to
estimate signal strength and signal to noise measurements in dB.
.. kernel-doc:: drivers/media/dvb-core/dvb_math.h
.. kernel-doc:: include/media/dvb_math.h
DVB devices
......@@ -15,7 +15,7 @@ DVB devices
Those functions are responsible for handling the DVB device nodes.
.. kernel-doc:: drivers/media/dvb-core/dvbdev.h
.. kernel-doc:: include/media/dvbdev.h
Digital TV Ring buffer
~~~~~~~~~~~~~~~~~~~~~~
......@@ -52,4 +52,4 @@ copy it from/to userspace.
Resetting the buffer counts as a read and write operation.
Two or more writers must be locked against each other.
.. kernel-doc:: drivers/media/dvb-core/dvb_ringbuffer.h
.. kernel-doc:: include/media/dvb_ringbuffer.h
......@@ -8,7 +8,7 @@ The Kernel Digital TV Demux kABI defines a driver-internal interface for
registering low-level, hardware specific driver to a hardware independent
demux layer. It is only of interest for Digital TV device driver writers.
The header file for this kABI is named ``demux.h`` and located in
``drivers/media/dvb-core``.
``include/media``.
The demux kABI should be implemented for each demux in the system. It is
used to select the TS source of a demux and to manage the demux resources.
......@@ -69,14 +69,14 @@ callbacks.
Digital TV Demux device registration functions and data structures
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. kernel-doc:: drivers/media/dvb-core/dmxdev.h
.. kernel-doc:: include/media/dmxdev.h
High-level Digital TV demux interface
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. kernel-doc:: drivers/media/dvb-core/dvb_demux.h
.. kernel-doc:: include/media/dvb_demux.h
Driver-internal low-level hardware specific driver demux interface
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. kernel-doc:: drivers/media/dvb-core/demux.h
.. kernel-doc:: include/media/demux.h
......@@ -8,7 +8,7 @@ The Digital TV Frontend kABI defines a driver-internal interface for
registering low-level, hardware specific driver to a hardware independent
frontend layer. It is only of interest for Digital TV device driver writers.
The header file for this API is named ``dvb_frontend.h`` and located in
``drivers/media/dvb-core``.
``include/media/``.
Demodulator driver
^^^^^^^^^^^^^^^^^^
......@@ -17,7 +17,7 @@ The demodulator driver is responsible to talk with the decoding part of the
hardware. Such driver should implement :c:type:`dvb_frontend_ops`, with
tells what type of digital TV standards are supported, and points to a
series of functions that allow the DVB core to command the hardware via
the code under ``drivers/media/dvb-core/dvb_frontend.c``.
the code under ``include/media/dvb_frontend.c``.
A typical example of such struct in a driver ``foo`` is::
......@@ -118,7 +118,7 @@ Satellite TV reception is::
.. |delta| unicode:: U+00394
The ``drivers/media/dvb-core/dvb_frontend.c`` has a kernel thread with is
The ``include/media/dvb_frontend.c`` has a kernel thread with is
responsible for tuning the device. It supports multiple algorithms to
detect a channel, as defined at enum :c:func:`dvbfe_algo`.
......@@ -440,4 +440,4 @@ monotonic stats at the right time.
Digital TV Frontend functions and types
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. kernel-doc:: drivers/media/dvb-core/dvb_frontend.h
.. kernel-doc:: include/media/dvb_frontend.h
Digital TV Network kABI
-----------------------
.. kernel-doc:: drivers/media/dvb-core/dvb_net.h
.. kernel-doc:: include/media/dvb_net.h
......@@ -4,6 +4,5 @@ b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
b2c2-flexcop-objs += flexcop-hw-filter.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/tuners/
......@@ -13,10 +13,10 @@
#include "flexcop-reg.h"
#include "dmxdev.h"
#include "dvb_demux.h"
#include "dvb_net.h"
#include "dvb_frontend.h"
#include <media/dmxdev.h>
#include <media/dvb_demux.h>
#include <media/dvb_net.h>
#include <media/dvb_frontend.h>
#define FC_MAX_FEED 256
......
......@@ -11,7 +11,3 @@ endif
ifeq ($(CONFIG_SMS_SIANO_DEBUGFS),y)
smsdvb-objs += smsdvb-debugfs.o
endif
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
......@@ -11,10 +11,10 @@
#include <linux/spinlock.h>
#include <linux/usb.h>
#include "dmxdev.h"
#include "dvbdev.h"
#include "dvb_demux.h"
#include "dvb_frontend.h"
#include <media/dmxdev.h>
#include <media/dvbdev.h>
#include <media/dvb_demux.h>
#include <media/dvb_frontend.h>
#include "smsdvb.h"
......
......@@ -26,10 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <linux/init.h>
#include <asm/div64.h>
#include "dmxdev.h"
#include "dvbdev.h"
#include "dvb_demux.h"
#include "dvb_frontend.h"
#include <media/dmxdev.h>
#include <media/dvbdev.h>
#include <media/dvb_demux.h>
#include <media/dvb_frontend.h>
#include "sms-cards.h"
......
......@@ -27,8 +27,8 @@
#include <linux/ioctl.h>
#include <linux/wait.h>
#include <linux/uaccess.h>
#include "dmxdev.h"
#include "dvb_vb2.h"
#include <media/dmxdev.h>
#include <media/dvb_vb2.h>
static int debug;
......
......@@ -37,8 +37,8 @@
#include <linux/sched/signal.h>
#include <linux/kthread.h>
#include "dvb_ca_en50221.h"
#include "dvb_ringbuffer.h"
#include <media/dvb_ca_en50221.h>
#include <media/dvb_ringbuffer.h>
static int dvb_ca_en50221_debug;
......
......@@ -30,7 +30,7 @@
#include <linux/uaccess.h>
#include <asm/div64.h>
#include "dvb_demux.h"
#include <media/dvb_demux.h>
static int dvb_demux_tscheck;
module_param(dvb_demux_tscheck, int, 0644);
......
......@@ -43,8 +43,8 @@
#include <linux/compat.h>
#include <asm/processor.h>
#include "dvb_frontend.h"
#include "dvbdev.h"
#include <media/dvb_frontend.h>
#include <media/dvbdev.h>
#include <linux/dvb/version.h>
static int dvb_frontend_debug;
......
......@@ -19,7 +19,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/bug.h>
#include "dvb_math.h"
#include <media/dvb_math.h>
static const unsigned short logtable[256] = {
0x0000, 0x0171, 0x02e0, 0x044e, 0x05ba, 0x0725, 0x088e, 0x09f7,
......
......@@ -64,8 +64,8 @@
#include <linux/mutex.h>
#include <linux/sched.h>
#include "dvb_demux.h"
#include "dvb_net.h"
#include <media/dvb_demux.h>
#include <media/dvb_net.h>
static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
{
......
......@@ -29,7 +29,7 @@
#include <linux/string.h>
#include <linux/uaccess.h>
#include "dvb_ringbuffer.h"
#include <media/dvb_ringbuffer.h>
#define PKT_READY 0
#define PKT_DISPOSED 1
......
......@@ -16,8 +16,8 @@
#include <linux/module.h>
#include <linux/mm.h>
#include "dvbdev.h"
#include "dvb_vb2.h"
#include <media/dvbdev.h>
#include <media/dvb_vb2.h>
#define DVB_V2_MAX_SIZE (4096 * 188)
......
......@@ -30,7 +30,7 @@
#include <linux/fs.h>
#include <linux/cdev.h>
#include <linux/mutex.h>
#include "dvbdev.h"
#include <media/dvbdev.h>
/* Due to enum tuner_pad_index */
#include <media/tuner.h>
......
......@@ -3,7 +3,6 @@
# Makefile for the kernel DVB frontend device drivers.
#
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/tuners/
# FIXME: RTL2832 SDR driver uses power management directly from USB IF driver
......
......@@ -17,7 +17,7 @@
#ifndef A8293_H
#define A8293_H
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
/*
* I2C address
......
......@@ -21,7 +21,7 @@
#ifndef AF9013_PRIV_H
#define AF9013_PRIV_H
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "af9013.h"
#include <linux/firmware.h>
#include <linux/math64.h>
......
......@@ -18,12 +18,12 @@
#ifndef AF9033_PRIV_H
#define AF9033_PRIV_H
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "af9033.h"
#include <linux/math64.h>
#include <linux/regmap.h>
#include <linux/kernel.h>
#include "dvb_math.h"
#include <media/dvb_math.h>
struct reg_val {
u32 reg;
......
......@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
#include <dvb_frontend.h>
#include <media/dvb_frontend.h>
#include "as102_fe.h"
......
......@@ -24,7 +24,7 @@
#include <linux/dvb/frontend.h>
#include <linux/types.h>
#include "ascot2e.h"
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#define MAX_WRITE_REGSIZE 10
......
......@@ -16,7 +16,7 @@
*/
#include <asm/div64.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "atbm8830.h"
#include "atbm8830_priv.h"
......
......@@ -23,7 +23,7 @@
*/
#include <linux/i2c.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "au8522_priv.h"
static int debug;
......
......@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/delay.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "au8522.h"
#include "au8522_priv.h"
......
......@@ -32,7 +32,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-mc.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "au8522.h"
#include "tuner-i2c.h"
......
......@@ -40,7 +40,7 @@
#include <linux/slab.h>
#include <linux/mutex.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "bcm3510.h"
#include "bcm3510_priv.h"
......
......@@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx22700.h"
......
......@@ -31,7 +31,7 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx22702.h"
struct cx22702_state {
......
......@@ -27,7 +27,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24110.h"
......
......@@ -22,7 +22,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24113.h"
static int debug;
......
......@@ -41,7 +41,7 @@
#include <linux/init.h>
#include <linux/firmware.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24116.h"
static int debug;
......
......@@ -32,7 +32,7 @@
#include <linux/firmware.h>
#include "tuner-i2c.h"
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24117.h"
......
......@@ -29,7 +29,7 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/firmware.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24120.h"
#define CX24120_SEARCH_RANGE_KHZ 5000
......
......@@ -24,7 +24,7 @@
#include <linux/init.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "cx24123.h"
#define XTAL 10111000
......
......@@ -23,8 +23,8 @@
#define CXD2820R_PRIV_H
#include <linux/dvb/version.h>
#include "dvb_frontend.h"
#include "dvb_math.h"
#include <media/dvb_frontend.h>
#include <media/dvb_math.h>
#include "cxd2820r.h"
#include <linux/gpio.h>
#include <linux/math64.h>
......
......@@ -31,8 +31,8 @@
#include <linux/dynamic_debug.h>
#include <linux/kernel.h>
#include "dvb_math.h"
#include "dvb_frontend.h"
#include <media/dvb_math.h>
#include <media/dvb_frontend.h>
#include "cxd2841er.h"
#include "cxd2841er_priv.h"
......
......@@ -27,7 +27,7 @@
#include <linux/i2c.h>
#include <linux/mutex.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib0070.h"
#include "dibx000_common.h"
......
......@@ -27,7 +27,7 @@
#include <linux/i2c.h>
#include <linux/mutex.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib0090.h"
#include "dibx000_common.h"
......
......@@ -30,7 +30,7 @@
#include <linux/string.h>
#include <linux/slab.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib3000.h"
#include "dib3000mb_priv.h"
......
......@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib3000mc.h"
......
......@@ -16,7 +16,7 @@
#include <linux/i2c.h>
#include <linux/mutex.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib7000m.h"
......
......@@ -16,8 +16,8 @@
#include <linux/mutex.h>
#include <asm/div64.h>
#include "dvb_math.h"
#include "dvb_frontend.h"
#include <media/dvb_math.h>
#include <media/dvb_frontend.h>
#include "dib7000p.h"
......
......@@ -16,9 +16,9 @@
#include <linux/mutex.h>
#include <asm/div64.h>
#include "dvb_math.h"
#include <media/dvb_math.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "dib8000.h"
......
......@@ -14,8 +14,8 @@
#include <linux/i2c.h>
#include <linux/mutex.h>
#include "dvb_math.h"
#include "dvb_frontend.h"
#include <media/dvb_math.h>
#include <media/dvb_frontend.h>
#include "dib9000.h"
#include "dibx000_common.h"
......
......@@ -2,5 +2,4 @@ drx39xyj-objs := drxj.o
obj-$(CONFIG_DVB_DRX39XYJ) += drx39xyj.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/tuners/
......@@ -19,7 +19,7 @@
#define DRX39XXJ_H
#include <linux/dvb/frontend.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "drx_driver.h"
struct drx39xxj_state {
......
......@@ -61,7 +61,7 @@ INCLUDE FILES
#include <linux/slab.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "drx39xxj.h"
#include "drxj.h"
......
......@@ -26,7 +26,7 @@
#include <linux/i2c.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "drxd.h"
#include "drxd_firm.h"
......
......@@ -29,10 +29,10 @@
#include <linux/hardirq.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
#include <media/dvb_frontend.h>
#include "drxk.h"
#include "drxk_hard.h"
#include "dvb_math.h"
#include <media/dvb_math.h>
static int power_down_dvbt(struct drxk_state *state, bool set_power_mode);
static int power_down_qam(struct drxk_state *state);
......