1 diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
2 index fec66bd..24cca40 100644
3 --- a/include/linux/dvb/audio.h
4 +++ b/include/linux/dvb/audio.h
9 -#include <linux/types.h>
10 +#include <asm/types.h>
13 AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
14 diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
15 index fef9437..698fe94 100644
16 --- a/include/linux/dvb/dmx.h
17 +++ b/include/linux/dvb/dmx.h
22 -#include <linux/types.h>
23 +#include <asm/types.h>
25 #include <linux/time.h>
27 @@ -151,5 +151,7 @@ struct dmx_stc {
28 #define DMX_GET_CAPS _IOR('o', 48, dmx_caps_t)
29 #define DMX_SET_SOURCE _IOW('o', 49, dmx_source_t)
30 #define DMX_GET_STC _IOWR('o', 50, struct dmx_stc)
31 +#define DMX_ADD_PID _IOW('o', 51, __u16)
32 +#define DMX_REMOVE_PID _IOW('o', 52, __u16)
35 diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
36 index 51c8d2d..0de9dc2 100644
37 --- a/include/linux/dvb/frontend.h
38 +++ b/include/linux/dvb/frontend.h
40 #ifndef _DVBFRONTEND_H_
41 #define _DVBFRONTEND_H_
43 -#include <linux/types.h>
44 +#include <asm/types.h>
46 typedef enum fe_type {
48 @@ -62,6 +62,7 @@ typedef enum fe_caps {
49 FE_CAN_8VSB = 0x200000,
50 FE_CAN_16VSB = 0x400000,
51 FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */
52 + FE_CAN_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec modulation" */
53 FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
54 FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
55 FE_CAN_RECOVER = 0x40000000, /* frontend can recover from a cable unplug automatically */
56 @@ -173,14 +174,21 @@ typedef enum fe_modulation {
57 typedef enum fe_transmit_mode {
60 - TRANSMISSION_MODE_AUTO
61 + TRANSMISSION_MODE_AUTO,
62 + TRANSMISSION_MODE_4K,
63 + TRANSMISSION_MODE_1K,
64 + TRANSMISSION_MODE_16K,
65 + TRANSMISSION_MODE_32K,
68 typedef enum fe_bandwidth {
76 + BANDWIDTH_1_712_MHZ,
80 @@ -189,7 +197,10 @@ typedef enum fe_guard_interval {
85 + GUARD_INTERVAL_AUTO,
86 + GUARD_INTERVAL_1_128,
87 + GUARD_INTERVAL_19_128,
88 + GUARD_INTERVAL_19_256,
89 } fe_guard_interval_t;
92 @@ -268,15 +279,44 @@ struct dvb_frontend_event {
93 #define DTV_FE_CAPABILITY 16
94 #define DTV_DELIVERY_SYSTEM 17
96 -#define DTV_API_VERSION 35
97 -#define DTV_API_VERSION 35
98 -#define DTV_CODE_RATE_HP 36
99 -#define DTV_CODE_RATE_LP 37
100 -#define DTV_GUARD_INTERVAL 38
101 -#define DTV_TRANSMISSION_MODE 39
102 -#define DTV_HIERARCHY 40
103 +/* ISDB-T and ISDB-Tsb */
104 +#define DTV_ISDBT_PARTIAL_RECEPTION 18
105 +#define DTV_ISDBT_SOUND_BROADCASTING 19
107 -#define DTV_MAX_COMMAND DTV_HIERARCHY
108 +#define DTV_ISDBT_SB_SUBCHANNEL_ID 20
109 +#define DTV_ISDBT_SB_SEGMENT_IDX 21
110 +#define DTV_ISDBT_SB_SEGMENT_COUNT 22
112 +#define DTV_ISDBT_LAYERA_FEC 23
113 +#define DTV_ISDBT_LAYERA_MODULATION 24
114 +#define DTV_ISDBT_LAYERA_SEGMENT_COUNT 25
115 +#define DTV_ISDBT_LAYERA_TIME_INTERLEAVING 26
117 +#define DTV_ISDBT_LAYERB_FEC 27
118 +#define DTV_ISDBT_LAYERB_MODULATION 28
119 +#define DTV_ISDBT_LAYERB_SEGMENT_COUNT 29
120 +#define DTV_ISDBT_LAYERB_TIME_INTERLEAVING 30
122 +#define DTV_ISDBT_LAYERC_FEC 31
123 +#define DTV_ISDBT_LAYERC_MODULATION 32
124 +#define DTV_ISDBT_LAYERC_SEGMENT_COUNT 33
125 +#define DTV_ISDBT_LAYERC_TIME_INTERLEAVING 34
127 +#define DTV_API_VERSION 35
129 +#define DTV_CODE_RATE_HP 36
130 +#define DTV_CODE_RATE_LP 37
131 +#define DTV_GUARD_INTERVAL 38
132 +#define DTV_TRANSMISSION_MODE 39
133 +#define DTV_HIERARCHY 40
135 +#define DTV_ISDBT_LAYER_ENABLED 41
137 +#define DTV_ISDBS_TS_ID 42
139 +#define DTV_DVBT2_PLP_ID 43
141 +#define DTV_MAX_COMMAND DTV_DVBT2_PLP_ID
143 typedef enum fe_pilot {
145 @@ -308,6 +348,7 @@ typedef enum fe_delivery_system {
150 } fe_delivery_system_t;
153 diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h
154 index f451e7e..59ed3fe 100644
155 --- a/include/linux/dvb/net.h
156 +++ b/include/linux/dvb/net.h
161 -#include <linux/types.h>
162 +#include <asm/types.h>
166 diff --git a/include/linux/dvb/version.h b/include/linux/dvb/version.h
167 index 25b823b..1421cc8 100644
168 --- a/include/linux/dvb/version.h
169 +++ b/include/linux/dvb/version.h
171 #define _DVBVERSION_H_
173 #define DVB_API_VERSION 5
174 -#define DVB_API_VERSION_MINOR 0
175 +#define DVB_API_VERSION_MINOR 3
177 #endif /*_DVBVERSION_H_*/
178 diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
179 index 1d750c0..3fccd5d 100644
180 --- a/include/linux/dvb/video.h
181 +++ b/include/linux/dvb/video.h
182 @@ -137,7 +137,7 @@ struct video_event {
183 #define VIDEO_EVENT_FRAME_RATE_CHANGED 2
184 #define VIDEO_EVENT_DECODER_STOPPED 3
185 #define VIDEO_EVENT_VSYNC 4
186 - __kernel_time_t timestamp;
190 unsigned int frame_rate; /* in frames per 1000sec */