diff options
author | Steven Toth <stoth@linuxtv.org> | 2008-09-23 21:21:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:07 -0400 |
commit | 8316568930074723bdc47d6777f822be0422a5b7 (patch) | |
tree | 48849401c22d1602cf6013aeb7f449a968c2a057 /drivers/media | |
parent | fc6e8c284bcb23ac7a576b7959803168398e390a (diff) |
V4L/DVB (9025): 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.
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 99 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 13 |
2 files changed, 0 insertions, 112 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 05d0b73cf9a3..7da25372078c 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -829,17 +829,6 @@ struct dtv_cmds_h dtv_cmds[] = { | |||
829 | .cmd = DTV_DELIVERY_SYSTEM, | 829 | .cmd = DTV_DELIVERY_SYSTEM, |
830 | .set = 1, | 830 | .set = 1, |
831 | }, | 831 | }, |
832 | [DTV_ISDB_SEGMENT_IDX] = { | ||
833 | .name = "DTV_ISDB_SEGMENT_IDX", | ||
834 | .cmd = DTV_ISDB_SEGMENT_IDX, | ||
835 | .set = 1, | ||
836 | }, | ||
837 | [DTV_ISDB_SEGMENT_WIDTH] = { | ||
838 | .name = "DTV_ISDB_SEGMENT_WIDTH", | ||
839 | .cmd = DTV_ISDB_SEGMENT_WIDTH, | ||
840 | .set = 1, | ||
841 | }, | ||
842 | |||
843 | /* Get */ | 832 | /* Get */ |
844 | [DTV_DISEQC_SLAVE_REPLY] = { | 833 | [DTV_DISEQC_SLAVE_REPLY] = { |
845 | .name = "DTV_DISEQC_SLAVE_REPLY", | 834 | .name = "DTV_DISEQC_SLAVE_REPLY", |
@@ -847,51 +836,6 @@ struct dtv_cmds_h dtv_cmds[] = { | |||
847 | .set = 0, | 836 | .set = 0, |
848 | .buffer = 1, | 837 | .buffer = 1, |
849 | }, | 838 | }, |
850 | [DTV_ISDB_LAYERA_FEC] = { | ||
851 | .name = "DTV_ISDB_LAYERA_FEC", | ||
852 | .cmd = DTV_ISDB_LAYERA_FEC, | ||
853 | .set = 0, | ||
854 | }, | ||
855 | [DTV_ISDB_LAYERA_MODULATION] = { | ||
856 | .name = "DTV_ISDB_LAYERA_MODULATION", | ||
857 | .cmd = DTV_ISDB_LAYERA_MODULATION, | ||
858 | .set = 0, | ||
859 | }, | ||
860 | [DTV_ISDB_LAYERA_SEGMENT_WIDTH] = { | ||
861 | .name = "DTV_ISDB_LAYERA_SEGMENT_WIDTH", | ||
862 | .cmd = DTV_ISDB_LAYERA_SEGMENT_WIDTH, | ||
863 | .set = 0, | ||
864 | }, | ||
865 | [DTV_ISDB_LAYERB_FEC] = { | ||
866 | .name = "DTV_ISDB_LAYERB_FEC", | ||
867 | .cmd = DTV_ISDB_LAYERB_FEC, | ||
868 | .set = 0, | ||
869 | }, | ||
870 | [DTV_ISDB_LAYERB_MODULATION] = { | ||
871 | .name = "DTV_ISDB_LAYERB_MODULATION", | ||
872 | .cmd = DTV_ISDB_LAYERB_MODULATION, | ||
873 | .set = 0, | ||
874 | }, | ||
875 | [DTV_ISDB_LAYERB_SEGMENT_WIDTH] = { | ||
876 | .name = "DTV_ISDB_LAYERB_SEGMENT_WIDTH", | ||
877 | .cmd = DTV_ISDB_LAYERB_SEGMENT_WIDTH, | ||
878 | .set = 0, | ||
879 | }, | ||
880 | [DTV_ISDB_LAYERC_FEC] = { | ||
881 | .name = "DTV_ISDB_LAYERC_FEC", | ||
882 | .cmd = DTV_ISDB_LAYERC_FEC, | ||
883 | .set = 0, | ||
884 | }, | ||
885 | [DTV_ISDB_LAYERC_MODULATION] = { | ||
886 | .name = "DTV_ISDB_LAYERC_MODULATION", | ||
887 | .cmd = DTV_ISDB_LAYERC_MODULATION, | ||
888 | .set = 0, | ||
889 | }, | ||
890 | [DTV_ISDB_LAYERC_SEGMENT_WIDTH] = { | ||
891 | .name = "DTV_ISDB_LAYERC_SEGMENT_WIDTH", | ||
892 | .cmd = DTV_ISDB_LAYERC_SEGMENT_WIDTH, | ||
893 | .set = 0, | ||
894 | }, | ||
895 | }; | 839 | }; |
896 | 840 | ||
897 | void dtv_property_dump(struct dtv_property *tvp) | 841 | void dtv_property_dump(struct dtv_property *tvp) |
@@ -1154,41 +1098,6 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp, | |||
1154 | case DTV_DELIVERY_SYSTEM: | 1098 | case DTV_DELIVERY_SYSTEM: |
1155 | tvp->u.data = fe->dtv_property_cache.delivery_system; | 1099 | tvp->u.data = fe->dtv_property_cache.delivery_system; |
1156 | break; | 1100 | break; |
1157 | |||
1158 | /* ISDB-T Support here */ | ||
1159 | case DTV_ISDB_SEGMENT_IDX: | ||
1160 | tvp->u.data = fe->dtv_property_cache.isdb_segment_idx; | ||
1161 | break; | ||
1162 | case DTV_ISDB_SEGMENT_WIDTH: | ||
1163 | tvp->u.data = fe->dtv_property_cache.isdb_segment_width; | ||
1164 | break; | ||
1165 | case DTV_ISDB_LAYERA_FEC: | ||
1166 | tvp->u.data = fe->dtv_property_cache.isdb_layera_fec; | ||
1167 | break; | ||
1168 | case DTV_ISDB_LAYERA_MODULATION: | ||
1169 | tvp->u.data = fe->dtv_property_cache.isdb_layera_modulation; | ||
1170 | break; | ||
1171 | case DTV_ISDB_LAYERA_SEGMENT_WIDTH: | ||
1172 | tvp->u.data = fe->dtv_property_cache.isdb_layera_segment_width; | ||
1173 | break; | ||
1174 | case DTV_ISDB_LAYERB_FEC: | ||
1175 | tvp->u.data = fe->dtv_property_cache.isdb_layerb_fec; | ||
1176 | break; | ||
1177 | case DTV_ISDB_LAYERB_MODULATION: | ||
1178 | tvp->u.data = fe->dtv_property_cache.isdb_layerb_modulation; | ||
1179 | break; | ||
1180 | case DTV_ISDB_LAYERB_SEGMENT_WIDTH: | ||
1181 | tvp->u.data = fe->dtv_property_cache.isdb_layerb_segment_width; | ||
1182 | break; | ||
1183 | case DTV_ISDB_LAYERC_FEC: | ||
1184 | tvp->u.data = fe->dtv_property_cache.isdb_layerc_fec; | ||
1185 | break; | ||
1186 | case DTV_ISDB_LAYERC_MODULATION: | ||
1187 | tvp->u.data = fe->dtv_property_cache.isdb_layerc_modulation; | ||
1188 | break; | ||
1189 | case DTV_ISDB_LAYERC_SEGMENT_WIDTH: | ||
1190 | tvp->u.data = fe->dtv_property_cache.isdb_layerc_segment_width; | ||
1191 | break; | ||
1192 | case DTV_VOLTAGE: | 1101 | case DTV_VOLTAGE: |
1193 | tvp->u.data = fe->dtv_property_cache.voltage; | 1102 | tvp->u.data = fe->dtv_property_cache.voltage; |
1194 | break; | 1103 | break; |
@@ -1266,14 +1175,6 @@ int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp, | |||
1266 | case DTV_DELIVERY_SYSTEM: | 1175 | case DTV_DELIVERY_SYSTEM: |
1267 | fe->dtv_property_cache.delivery_system = tvp->u.data; | 1176 | fe->dtv_property_cache.delivery_system = tvp->u.data; |
1268 | break; | 1177 | break; |
1269 | |||
1270 | /* ISDB-T Support here */ | ||
1271 | case DTV_ISDB_SEGMENT_IDX: | ||
1272 | fe->dtv_property_cache.isdb_segment_idx = tvp->u.data; | ||
1273 | break; | ||
1274 | case DTV_ISDB_SEGMENT_WIDTH: | ||
1275 | fe->dtv_property_cache.isdb_segment_width = tvp->u.data; | ||
1276 | break; | ||
1277 | case DTV_VOLTAGE: | 1178 | case DTV_VOLTAGE: |
1278 | fe->dtv_property_cache.voltage = tvp->u.data; | 1179 | fe->dtv_property_cache.voltage = tvp->u.data; |
1279 | r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE, | 1180 | r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE, |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 2fa37f5a0d9a..1c575402814d 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -209,19 +209,6 @@ struct dtv_frontend_properties { | |||
209 | fe_rolloff_t rolloff; | 209 | fe_rolloff_t rolloff; |
210 | 210 | ||
211 | fe_delivery_system_t delivery_system; | 211 | fe_delivery_system_t delivery_system; |
212 | |||
213 | /* ISDB-T specifics */ | ||
214 | u32 isdb_segment_idx; | ||
215 | u32 isdb_segment_width; | ||
216 | fe_code_rate_t isdb_layera_fec; | ||
217 | fe_modulation_t isdb_layera_modulation; | ||
218 | u32 isdb_layera_segment_width; | ||
219 | fe_code_rate_t isdb_layerb_fec; | ||
220 | fe_modulation_t isdb_layerb_modulation; | ||
221 | u32 isdb_layerb_segment_width; | ||
222 | fe_code_rate_t isdb_layerc_fec; | ||
223 | fe_modulation_t isdb_layerc_modulation; | ||
224 | u32 isdb_layerc_segment_width; | ||
225 | }; | 212 | }; |
226 | 213 | ||
227 | struct dvb_frontend { | 214 | struct dvb_frontend { |