The patch number 9025 was added via Steven Toth <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Steven Toth <[EMAIL PROTECTED]>
S2API: Deactivate the ISDB-T definitions
We don't want to push the ISDB-T definitions into the kernel until
we have a high level of confidence in the ISDB-T API. More testing
is required before this code is released.
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 11 ++++++++---
linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 3 ++-
linux/include/linux/dvb/frontend.h | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff -r 356df2a3e687 -r 24304365d1b3
linux/drivers/media/dvb/dvb-core/dvb_frontend.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Tue Sep 23 21:14:33
2008 -0400
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Tue Sep 23 21:21:26
2008 -0400
@@ -840,6 +840,7 @@ struct dtv_cmds_h dtv_cmds[] = {
.cmd = DTV_DELIVERY_SYSTEM,
.set = 1,
},
+#if 0
[DTV_ISDB_SEGMENT_IDX] = {
.name = "DTV_ISDB_SEGMENT_IDX",
.cmd = DTV_ISDB_SEGMENT_IDX,
@@ -850,7 +851,7 @@ struct dtv_cmds_h dtv_cmds[] = {
.cmd = DTV_ISDB_SEGMENT_WIDTH,
.set = 1,
},
-
+#endif
/* Get */
[DTV_DISEQC_SLAVE_REPLY] = {
.name = "DTV_DISEQC_SLAVE_REPLY",
@@ -858,6 +859,7 @@ struct dtv_cmds_h dtv_cmds[] = {
.set = 0,
.buffer = 1,
},
+#if 0
[DTV_ISDB_LAYERA_FEC] = {
.name = "DTV_ISDB_LAYERA_FEC",
.cmd = DTV_ISDB_LAYERA_FEC,
@@ -903,6 +905,7 @@ struct dtv_cmds_h dtv_cmds[] = {
.cmd = DTV_ISDB_LAYERC_SEGMENT_WIDTH,
.set = 0,
},
+#endif
};
void dtv_property_dump(struct dtv_property *tvp)
@@ -1165,7 +1168,7 @@ int dtv_property_process_get(struct dvb_
case DTV_DELIVERY_SYSTEM:
tvp->u.data = fe->dtv_property_cache.delivery_system;
break;
-
+#if 0
/* ISDB-T Support here */
case DTV_ISDB_SEGMENT_IDX:
tvp->u.data = fe->dtv_property_cache.isdb_segment_idx;
@@ -1200,6 +1203,7 @@ int dtv_property_process_get(struct dvb_
case DTV_ISDB_LAYERC_SEGMENT_WIDTH:
tvp->u.data = fe->dtv_property_cache.isdb_layerc_segment_width;
break;
+#endif
case DTV_VOLTAGE:
tvp->u.data = fe->dtv_property_cache.voltage;
break;
@@ -1277,7 +1281,7 @@ int dtv_property_process_set(struct dvb_
case DTV_DELIVERY_SYSTEM:
fe->dtv_property_cache.delivery_system = tvp->u.data;
break;
-
+#if 0
/* ISDB-T Support here */
case DTV_ISDB_SEGMENT_IDX:
fe->dtv_property_cache.isdb_segment_idx = tvp->u.data;
@@ -1285,6 +1289,7 @@ int dtv_property_process_set(struct dvb_
case DTV_ISDB_SEGMENT_WIDTH:
fe->dtv_property_cache.isdb_segment_width = tvp->u.data;
break;
+#endif
case DTV_VOLTAGE:
fe->dtv_property_cache.voltage = tvp->u.data;
r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE,
diff -r 356df2a3e687 -r 24304365d1b3
linux/drivers/media/dvb/dvb-core/dvb_frontend.h
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h Tue Sep 23 21:14:33
2008 -0400
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h Tue Sep 23 21:21:26
2008 -0400
@@ -209,7 +209,7 @@ struct dtv_frontend_properties {
fe_rolloff_t rolloff;
fe_delivery_system_t delivery_system;
-
+#if 0
/* ISDB-T specifics */
u32 isdb_segment_idx;
u32 isdb_segment_width;
@@ -222,6 +222,7 @@ struct dtv_frontend_properties {
fe_code_rate_t isdb_layerc_fec;
fe_modulation_t isdb_layerc_modulation;
u32 isdb_layerc_segment_width;
+#endif
};
struct dvb_frontend {
diff -r 356df2a3e687 -r 24304365d1b3 linux/include/linux/dvb/frontend.h
--- a/linux/include/linux/dvb/frontend.h Tue Sep 23 21:14:33 2008 -0400
+++ b/linux/include/linux/dvb/frontend.h Tue Sep 23 21:21:26 2008 -0400
@@ -280,7 +280,7 @@ typedef enum dtv_cmd_types {
/* New commands are always appended */
DTV_DELIVERY_SYSTEM,
-
+#if 0
/* ISDB */
/* maybe a dup of DTV_ISDB_SOUND_BROADCASTING_SUBCHANNEL_ID ??? */
DTV_ISDB_SEGMENT_IDX,
@@ -309,7 +309,7 @@ typedef enum dtv_cmd_types {
DTV_ISDB_LAYERC_MODULATION,
DTV_ISDB_LAYERC_SEGMENT_WIDTH,
DTV_ISDB_LAYERC_TIME_INTERLEAVING,
-
+#endif
} dtv_cmd_types_t;
typedef enum fe_pilot {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/24304365d1b3abc34c7591067e28258f0e01495a
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
