summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
-rw-r--r--linux/drivers/media/dvb/dvb-core/demux.h24
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c8
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.h10
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_demux.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_demux.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c1
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.h5
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_functions.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_i2c.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_ksyms.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c4
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.c2
13 files changed, 31 insertions, 35 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/demux.h b/linux/drivers/media/dvb/dvb-core/demux.h
index e1b3f88b6..550a5db83 100644
--- a/linux/drivers/media/dvb/dvb-core/demux.h
+++ b/linux/drivers/media/dvb/dvb-core/demux.h
@@ -26,7 +26,7 @@
#define __DEMUX_H
#include <asm/types.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#include <linux/list.h>
#include <linux/time.h>
@@ -43,10 +43,10 @@
#endif
/*
- * dmx_success_t: Success codes for the Demux Callback API.
+ * enum dmx_success: Success codes for the Demux Callback API.
*/
-typedef enum {
+enum dmx_success {
DMX_OK = 0, /* Received Ok */
DMX_LENGTH_ERROR, /* Incorrect length */
DMX_OVERRUN_ERROR, /* Receiver ring buffer overrun */
@@ -54,7 +54,7 @@ typedef enum {
DMX_FRAME_ERROR, /* Frame alignment error */
DMX_FIFO_ERROR, /* Receiver FIFO overrun */
DMX_MISSED_ERROR /* Receiver missed packet */
-} dmx_success_t;
+} ;
/*--------------------------------------------------------------------------*/
/* TS packet reception */
@@ -70,7 +70,7 @@ typedef enum {
/* PES type for filters which write to built-in decoder */
/* these should be kept identical to the types in dmx.h */
-typedef enum
+enum dmx_ts_pes
{ /* also send packets to decoder (if it exists) */
DMX_TS_PES_AUDIO0,
DMX_TS_PES_VIDEO0,
@@ -97,7 +97,7 @@ typedef enum
DMX_TS_PES_PCR3,
DMX_TS_PES_OTHER
-} dmx_ts_pes_t;
+};
#define DMX_TS_PES_AUDIO DMX_TS_PES_AUDIO0
#define DMX_TS_PES_VIDEO DMX_TS_PES_VIDEO0
@@ -113,7 +113,7 @@ struct dmx_ts_feed {
int (*set) (struct dmx_ts_feed *feed,
u16 pid,
int type,
- dmx_ts_pes_t pes_type,
+ enum dmx_ts_pes pes_type,
size_t callback_length,
size_t circular_buffer_size,
int descramble,
@@ -168,20 +168,20 @@ typedef int (*dmx_ts_cb) ( const u8 * buffer1,
const u8 * buffer2,
size_t buffer2_length,
struct dmx_ts_feed* source,
- dmx_success_t success);
+ enum dmx_success success);
typedef int (*dmx_section_cb) ( const u8 * buffer1,
size_t buffer1_len,
const u8 * buffer2,
size_t buffer2_len,
struct dmx_section_filter * source,
- dmx_success_t success);
+ enum dmx_success success);
/*--------------------------------------------------------------------------*/
/* DVB Front-End */
/*--------------------------------------------------------------------------*/
-typedef enum {
+enum dmx_frontend_source {
DMX_MEMORY_FE,
DMX_FRONTEND_0,
DMX_FRONTEND_1,
@@ -191,14 +191,14 @@ typedef enum {
DMX_STREAM_1,
DMX_STREAM_2,
DMX_STREAM_3
-} dmx_frontend_source_t;
+};
struct dmx_frontend {
struct list_head connectivity_list; /* List of front-ends that can
be connected to a particular
demux */
void* priv; /* Pointer to private data of the API client */
- dmx_frontend_source_t source;
+ enum dmx_frontend_source source;
};
/*--------------------------------------------------------------------------*/
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index 61f801f0c..74f6d9698 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -358,7 +358,7 @@ dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
static int
dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
- struct dmx_section_filter *filter, dmx_success_t success)
+ struct dmx_section_filter *filter, enum dmx_success success)
{
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) filter->priv;
int ret;
@@ -395,7 +395,7 @@ dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
static int
dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
- struct dmx_ts_feed *feed, dmx_success_t success)
+ struct dmx_ts_feed *feed, enum dmx_success success)
{
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) feed->priv;
struct dmxdev_buffer *buffer;
@@ -654,13 +654,13 @@ dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
dmx_output_t otype;
int ret;
int ts_type;
- dmx_ts_pes_t ts_pes;
+ enum dmx_ts_pes ts_pes;
struct dmx_ts_feed **tsfeed = &filter->feed.ts;
filter->feed.ts = 0;
otype=para->output;
- ts_pes=(dmx_ts_pes_t) para->pes_type;
+ ts_pes=(enum dmx_ts_pes) para->pes_type;
if (ts_pes<DMX_PES_OTHER)
ts_type=TS_DECODER;
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index c491f1e37..b448cda04 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -38,20 +38,20 @@
#include "dvbdev.h"
#include "demux.h"
-typedef enum {
+enum dmxdevype {
DMXDEV_TYPE_NONE,
DMXDEV_TYPE_SEC,
DMXDEV_TYPE_PES,
-} dmxdevype_t;
+};
-typedef enum {
+enum dmxdev_state {
DMXDEV_STATE_FREE,
DMXDEV_STATE_ALLOCATED,
DMXDEV_STATE_SET,
DMXDEV_STATE_GO,
DMXDEV_STATE_DONE,
DMXDEV_STATE_TIMEDOUT
-} dmxdev_state_t;
+};
struct dmxdev_buffer {
u8 *data;
@@ -80,7 +80,7 @@ struct dmxdev_filter {
} params;
int type;
- dmxdev_state_t state;
+ enum dmxdev_state state;
struct dmxdev *dev;
struct dmxdev_buffer buffer;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 973f3ba7a..bce746b5e 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -509,7 +509,7 @@ int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
static
int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
- dmx_ts_pes_t pes_type, size_t callback_length,
+ enum dmx_ts_pes pes_type, size_t callback_length,
size_t circular_buffer_size, int descramble,
struct timespec timeout)
{
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 35dc8d4b3..135af1031 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -91,7 +91,7 @@ struct dvb_demux_feed {
int cb_length;
int ts_type;
- dmx_ts_pes_t pes_type;
+ enum dmx_ts_pes pes_type;
int cc;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index f18c70c56..ebc550147 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -24,7 +24,6 @@
#include <asm/processor.h>
#include <asm/semaphore.h>
-#include <asm/errno.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
index 03a37b946..789ef57db 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -30,10 +30,7 @@
#include <linux/ioctl.h>
#include <linux/i2c.h>
#include <linux/module.h>
-
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(x)
-#endif
+#include <linux/errno.h>
#include <linux/dvb/frontend.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.c b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
index a2bc3ac15..5dd60df0f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_functions.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
@@ -6,7 +6,7 @@
#include <linux/version.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index c0d45e8bc..2d6e5c20d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -20,7 +20,7 @@
*/
#include <asm/semaphore.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/module.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
index af43e441a..32a615a76 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
@@ -1,5 +1,5 @@
#include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 82bf226e7..a98258794 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -24,8 +24,8 @@
*
*/
-#include <asm/errno.h>
#include <asm/uaccess.h>
+#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/ioctl.h>
@@ -139,7 +139,7 @@ static int
dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_section_filter *filter,
- dmx_success_t success)
+ enum dmx_success success)
{
struct net_device *dev=(struct net_device *) filter->priv;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index fa1970619..fb5248c98 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -33,7 +33,7 @@
#define __KERNEL_SYSCALLS__
#include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index dedba56d7..3848c873f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -22,8 +22,8 @@
*/
#include <asm/types.h>
-#include <asm/errno.h>
#include <asm/semaphore.h>
+#include <linux/errno.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/kernel.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 16:49:00 +0000