From 616300bd51bee80d2d122c205866aa4c20adbaa8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 14 Jun 2012 16:35:55 -0300 Subject: [media] firewire: move it one level up Move firewire to one level up, as the dvb subdirectory will be removed. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/Kconfig | 4 - drivers/media/dvb/Makefile | 2 - drivers/media/dvb/firewire/Kconfig | 19 - drivers/media/dvb/firewire/Makefile | 6 - drivers/media/dvb/firewire/firedtv-avc.c | 1457 ------------------------------ drivers/media/dvb/firewire/firedtv-ci.c | 258 ------ drivers/media/dvb/firewire/firedtv-dvb.c | 248 ----- drivers/media/dvb/firewire/firedtv-fe.c | 254 ------ drivers/media/dvb/firewire/firedtv-fw.c | 429 --------- drivers/media/dvb/firewire/firedtv-rc.c | 196 ---- drivers/media/dvb/firewire/firedtv.h | 168 ---- 11 files changed, 3041 deletions(-) delete mode 100644 drivers/media/dvb/firewire/Kconfig delete mode 100644 drivers/media/dvb/firewire/Makefile delete mode 100644 drivers/media/dvb/firewire/firedtv-avc.c delete mode 100644 drivers/media/dvb/firewire/firedtv-ci.c delete mode 100644 drivers/media/dvb/firewire/firedtv-dvb.c delete mode 100644 drivers/media/dvb/firewire/firedtv-fe.c delete mode 100644 drivers/media/dvb/firewire/firedtv-fw.c delete mode 100644 drivers/media/dvb/firewire/firedtv-rc.c delete mode 100644 drivers/media/dvb/firewire/firedtv.h (limited to 'drivers/media/dvb') diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index e610c361d185..b4665460c74d 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig @@ -39,10 +39,6 @@ comment "Supported SDMC DM1105 Adapters" depends on DVB_CORE && PCI && I2C source "drivers/media/dvb/dm1105/Kconfig" -comment "Supported FireWire (IEEE 1394) Adapters" - depends on DVB_CORE && FIREWIRE -source "drivers/media/dvb/firewire/Kconfig" - comment "Supported Earthsoft PT1 Adapters" depends on DVB_CORE && PCI && I2C source "drivers/media/dvb/pt1/Kconfig" diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index 0cee8f82a5d4..fc248268cb5a 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile @@ -16,5 +16,3 @@ obj-y := ttpci/ \ mantis/ \ ngene/ \ ddbridge/ - -obj-$(CONFIG_DVB_FIREDTV) += firewire/ diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/dvb/firewire/Kconfig deleted file mode 100644 index f3e9448c3955..000000000000 --- a/drivers/media/dvb/firewire/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -config DVB_FIREDTV - tristate "FireDTV and FloppyDTV" - depends on DVB_CORE && FIREWIRE - help - Support for DVB receivers from Digital Everywhere - which are connected via IEEE 1394 (FireWire). - - These devices don't have an MPEG decoder built in, - so you need an external software decoder to watch TV. - - To compile this driver as a module, say M here: - the module will be called firedtv. - -if DVB_FIREDTV - -config DVB_FIREDTV_INPUT - def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m) - -endif # DVB_FIREDTV diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/dvb/firewire/Makefile deleted file mode 100644 index f3148138c963..000000000000 --- a/drivers/media/dvb/firewire/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(CONFIG_DVB_FIREDTV) += firedtv.o - -firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o -firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o - -ccflags-y += -Idrivers/media/dvb-core diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c deleted file mode 100644 index d1a1a1324ef8..000000000000 --- a/drivers/media/dvb/firewire/firedtv-avc.c +++ /dev/null @@ -1,1457 +0,0 @@ -/* - * FireDTV driver (formerly known as FireSAT) - * - * Copyright (C) 2004 Andreas Monitzer - * Copyright (C) 2008 Ben Backx - * Copyright (C) 2008 Henrik Kurelid - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "firedtv.h" - -#define FCP_COMMAND_REGISTER 0xfffff0000b00ULL - -#define AVC_CTYPE_CONTROL 0x0 -#define AVC_CTYPE_STATUS 0x1 -#define AVC_CTYPE_NOTIFY 0x3 - -#define AVC_RESPONSE_ACCEPTED 0x9 -#define AVC_RESPONSE_STABLE 0xc -#define AVC_RESPONSE_CHANGED 0xd -#define AVC_RESPONSE_INTERIM 0xf - -#define AVC_SUBUNIT_TYPE_TUNER (0x05 << 3) -#define AVC_SUBUNIT_TYPE_UNIT (0x1f << 3) - -#define AVC_OPCODE_VENDOR 0x00 -#define AVC_OPCODE_READ_DESCRIPTOR 0x09 -#define AVC_OPCODE_DSIT 0xc8 -#define AVC_OPCODE_DSD 0xcb - -#define DESCRIPTOR_TUNER_STATUS 0x80 -#define DESCRIPTOR_SUBUNIT_IDENTIFIER 0x00 - -#define SFE_VENDOR_DE_COMPANYID_0 0x00 /* OUI of Digital Everywhere */ -#define SFE_VENDOR_DE_COMPANYID_1 0x12 -#define SFE_VENDOR_DE_COMPANYID_2 0x87 - -#define SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL 0x0a -#define SFE_VENDOR_OPCODE_LNB_CONTROL 0x52 -#define SFE_VENDOR_OPCODE_TUNE_QPSK 0x58 /* for DVB-S */ - -#define SFE_VENDOR_OPCODE_GET_FIRMWARE_VERSION 0x00 -#define SFE_VENDOR_OPCODE_HOST2CA 0x56 -#define SFE_VENDOR_OPCODE_CA2HOST 0x57 -#define SFE_VENDOR_OPCODE_CISTATUS 0x59 -#define SFE_VENDOR_OPCODE_TUNE_QPSK2 0x60 /* for DVB-S2 */ - -#define SFE_VENDOR_TAG_CA_RESET 0x00 -#define SFE_VENDOR_TAG_CA_APPLICATION_INFO 0x01 -#define SFE_VENDOR_TAG_CA_PMT 0x02 -#define SFE_VENDOR_TAG_CA_DATE_TIME 0x04 -#define SFE_VENDOR_TAG_CA_MMI 0x05 -#define SFE_VENDOR_TAG_CA_ENTER_MENU 0x07 - -#define EN50221_LIST_MANAGEMENT_ONLY 0x03 -#define EN50221_TAG_APP_INFO 0x9f8021 -#define EN50221_TAG_CA_INFO 0x9f8031 - -struct avc_command_frame { - u8 ctype; - u8 subunit; - u8 opcode; - u8 operand[509]; -}; - -struct avc_response_frame { - u8 response; - u8 subunit; - u8 opcode; - u8 operand[509]; -}; - -#define LAST_OPERAND (509 - 1) - -static inline void clear_operands(struct avc_command_frame *c, int from, int to) -{ - memset(&c->operand[from], 0, to - from + 1); -} - -static void pad_operands(struct avc_command_frame *c, int from) -{ - int to = ALIGN(from, 4); - - if (from <= to && to <= LAST_OPERAND) - clear_operands(c, from, to); -} - -#define AVC_DEBUG_READ_DESCRIPTOR 0x0001 -#define AVC_DEBUG_DSIT 0x0002 -#define AVC_DEBUG_DSD 0x0004 -#define AVC_DEBUG_REGISTER_REMOTE_CONTROL 0x0008 -#define AVC_DEBUG_LNB_CONTROL 0x0010 -#define AVC_DEBUG_TUNE_QPSK 0x0020 -#define AVC_DEBUG_TUNE_QPSK2 0x0040 -#define AVC_DEBUG_HOST2CA 0x0080 -#define AVC_DEBUG_CA2HOST 0x0100 -#define AVC_DEBUG_APPLICATION_PMT 0x4000 -#define AVC_DEBUG_FCP_PAYLOADS 0x8000 - -static int avc_debug; -module_param_named(debug, avc_debug, int, 0644); -MODULE_PARM_DESC(debug, "Verbose logging (none = 0" - ", FCP subactions" - ": READ DESCRIPTOR = " __stringify(AVC_DEBUG_READ_DESCRIPTOR) - ", DSIT = " __stringify(AVC_DEBUG_DSIT) - ", REGISTER_REMOTE_CONTROL = " __stringify(AVC_DEBUG_REGISTER_REMOTE_CONTROL) - ", LNB CONTROL = " __stringify(AVC_DEBUG_LNB_CONTROL) - ", TUNE QPSK = " __stringify(AVC_DEBUG_TUNE_QPSK) - ", TUNE QPSK2 = " __stringify(AVC_DEBUG_TUNE_QPSK2) - ", HOST2CA = " __stringify(AVC_DEBUG_HOST2CA) - ", CA2HOST = " __stringify(AVC_DEBUG_CA2HOST) - "; Application sent PMT = " __stringify(AVC_DEBUG_APPLICATION_PMT) - ", FCP payloads = " __stringify(AVC_DEBUG_FCP_PAYLOADS) - ", or a combination, or all = -1)"); - -/* - * This is a workaround since there is no vendor specific command to retrieve - * ca_info using AVC. If this parameter is not used, ca_system_id will be - * filled with application_manufacturer from ca_app_info. - * Digital Everywhere have said that adding ca_info is on their TODO list. - */ -static unsigned int num_fake_ca_system_ids; -static int fake_ca_system_ids[4] = { -1, -1, -1, -1 }; -module_param_array(fake_ca_system_ids, int, &num_fake_ca_system_ids, 0644); -MODULE_PARM_DESC(fake_ca_system_ids, "If your CAM application manufacturer " - "does not have the same ca_system_id as your CAS, you can " - "override what ca_system_ids are presented to the " - "application by setting this field to an array of ids."); - -static const char *debug_fcp_ctype(unsigned int ctype) -{ - static const char *ctypes[] = { - [0x0] = "CONTROL", [0x1] = "STATUS", - [0x2] = "SPECIFIC INQUIRY", [0x3] = "NOTIFY", - [0x4] = "GENERAL INQUIRY", [0x8] = "NOT IMPLEMENTED", - [0x9] = "ACCEPTED", [0xa] = "REJECTED", - [0xb] = "IN TRANSITION", [0xc] = "IMPLEMENTED/STABLE", - [0xd] = "CHANGED", [0xf] = "INTERIM", - }; - const char *ret = ctype < ARRAY_SIZE(ctypes) ? ctypes[ctype] : NULL; - - return ret ? ret : "?"; -} - -static const char *debug_fcp_opcode(unsigned int opcode, - const u8 *data, int length) -{ - switch (opcode) { - case AVC_OPCODE_VENDOR: - break; - case AVC_OPCODE_READ_DESCRIPTOR: - return avc_debug & AVC_DEBUG_READ_DESCRIPTOR ? - "ReadDescriptor" : NULL; - case AVC_OPCODE_DSIT: - return avc_debug & AVC_DEBUG_DSIT ? - "DirectSelectInfo.Type" : NULL; - case AVC_OPCODE_DSD: - return avc_debug & AVC_DEBUG_DSD ? "DirectSelectData" : NULL; - default: - return "Unknown"; - } - - if (length < 7 || - data[3] != SFE_VENDOR_DE_COMPANYID_0 || - data[4] != SFE_VENDOR_DE_COMPANYID_1 || - data[5] != SFE_VENDOR_DE_COMPANYID_2) - return "Vendor/Unknown"; - - switch (data[6]) { - case SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL: - return avc_debug & AVC_DEBUG_REGISTER_REMOTE_CONTROL ? - "RegisterRC" : NULL; - case SFE_VENDOR_OPCODE_LNB_CONTROL: - return avc_debug & AVC_DEBUG_LNB_CONTROL ? "LNBControl" : NULL; - case SFE_VENDOR_OPCODE_TUNE_QPSK: - return avc_debug & AVC_DEBUG_TUNE_QPSK ? "TuneQPSK" : NULL; - case SFE_VENDOR_OPCODE_TUNE_QPSK2: - return avc_debug & AVC_DEBUG_TUNE_QPSK2 ? "TuneQPSK2" : NULL; - case SFE_VENDOR_OPCODE_HOST2CA: - return avc_debug & AVC_DEBUG_HOST2CA ? "Host2CA" : NULL; - case SFE_VENDOR_OPCODE_CA2HOST: - return avc_debug & AVC_DEBUG_CA2HOST ? "CA2Host" : NULL; - } - return "Vendor/Unknown"; -} - -static void debug_fcp(const u8 *data, int length) -{ - unsigned int subunit_type, subunit_id, opcode; - const char *op, *prefix; - - prefix = data[0] > 7 ? "FCP <- " : "FCP -> "; - subunit_type = data[1] >> 3; - subunit_id = data[1] & 7; - opcode = subunit_type == 0x1e || subunit_id == 5 ? ~0 : data[2]; - op = debug_fcp_opcode(opcode, data, length); - - if (op) { - printk(KERN_INFO "%ssu=%x.%x l=%d: %-8s - %s\n", - prefix, subunit_type, subunit_id, length, - debug_fcp_ctype(data[0]), op); - if (avc_debug & AVC_DEBUG_FCP_PAYLOADS) - print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, - 16, 1, data, length, false); - } -} - -static void debug_pmt(char *msg, int length) -{ - printk(KERN_INFO "APP PMT -> l=%d\n", length); - print_hex_dump(KERN_INFO, "APP PMT -> ", DUMP_PREFIX_NONE, - 16, 1, msg, length, false); -} - -static int avc_write(struct firedtv *fdtv) -{ - int err, retry; - - fdtv->avc_reply_received = false; - - for (retry = 0; retry < 6; retry++) { - if (unlikely(avc_debug)) - debug_fcp(fdtv->avc_data, fdtv->avc_data_length); - - err = fdtv_write(fdtv, FCP_COMMAND_REGISTER, - fdtv->avc_data, fdtv->avc_data_length); - if (err) { - dev_err(fdtv->device, "FCP command write failed\n"); - - return err; - } - - /* - * AV/C specs say that answers should be sent within 150 ms. - * Time out after 200 ms. - */ - if (wait_event_timeout(fdtv->avc_wait, - fdtv->avc_reply_received, - msecs_to_jiffies(200)) != 0) - return 0; - } - dev_err(fdtv->device, "FCP response timed out\n"); - - return -ETIMEDOUT; -} - -static bool is_register_rc(struct avc_response_frame *r) -{ - return r->opcode == AVC_OPCODE_VENDOR && - r->operand[0] == SFE_VENDOR_DE_COMPANYID_0 && - r->operand[1] == SFE_VENDOR_DE_COMPANYID_1 && - r->operand[2] == SFE_VENDOR_DE_COMPANYID_2 && - r->operand[3] == SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL; -} - -int avc_recv(struct firedtv *fdtv, void *data, size_t length) -{ - struct avc_response_frame *r = data; - - if (unlikely(avc_debug)) - debug_fcp(data, length); - - if (length >= 8 && is_register_rc(r)) { - switch (r->response) { - case AVC_RESPONSE_CHANGED: - fdtv_handle_rc(fdtv, r->operand[4] << 8 | r->operand[5]); - schedule_work(&fdtv->remote_ctrl_work); - break; - case AVC_RESPONSE_INTERIM: - if (is_register_rc((void *)fdtv->avc_data)) - goto wake; - break; - default: - dev_info(fdtv->device, - "remote control result = %d\n", r->response); - } - return 0; - } - - if (fdtv->avc_reply_received) { - dev_err(fdtv->device, "out-of-order AVC response, ignored\n"); - return -EIO; - } - - memcpy(fdtv->avc_data, data, length); - fdtv->avc_data_length = length; -wake: - fdtv->avc_reply_received = true; - wake_up(&fdtv->avc_wait); - - return 0; -} - -static int add_pid_filter(struct firedtv *fdtv, u8 *operand) -{ - int i, n, pos = 1; - - for (i = 0, n = 0; i < 16; i++) { - if (test_bit(i, &fdtv->channel_active)) { - operand[pos++] = 0x13; /* flowfunction relay */ - operand[pos++] = 0x80; /* dsd_sel_spec_valid_flags -> PID */ - operand[pos++] = (fdtv->channel_pid[i] >> 8) & 0x1f; - operand[pos++] = fdtv->channel_pid[i] & 0xff; - operand[pos++] = 0x00; /* tableID */ - operand[pos++] = 0x00; /* filter_length */ - n++; - } - } - operand[0] = n; - - return pos; -} - -/* - * tuning command for setting the relative LNB frequency - * (not supported by the AVC standard) - */ -static int avc_tuner_tuneqpsk(struct firedtv *fdtv, - struct dtv_frontend_properties *p) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - if (fdtv->type == FIREDTV_DVB_S2) - c->operand[3] = SFE_VENDOR_OPCODE_TUNE_QPSK2; - else - c->operand[3] = SFE_VENDOR_OPCODE_TUNE_QPSK; - - c->operand[4] = (p->frequency >> 24) & 0xff; - c->operand[5] = (p->frequency >> 16) & 0xff; - c->operand[6] = (p->frequency >> 8) & 0xff; - c->operand[7] = p->frequency & 0xff; - - c->operand[8] = ((p->symbol_rate / 1000) >> 8) & 0xff; - c->operand[9] = (p->symbol_rate / 1000) & 0xff; - - switch (p->fec_inner) { - case FEC_1_2: c->operand[10] = 0x1; break; - case FEC_2_3: c->operand[10] = 0x2; break; - case FEC_3_4: c->operand[10] = 0x3; break; - case FEC_5_6: c->operand[10] = 0x4; break; - case FEC_7_8: c->operand[10] = 0x5; break; - case FEC_4_5: - case FEC_8_9: - case FEC_AUTO: - default: c->operand[10] = 0x0; - } - - if (fdtv->voltage == 0xff) - c->operand[11] = 0xff; - else if (fdtv->voltage == SEC_VOLTAGE_18) /* polarisation */ - c->operand[11] = 0; - else - c->operand[11] = 1; - - if (fdtv->tone == 0xff) - c->operand[12] = 0xff; - else if (fdtv->tone == SEC_TONE_ON) /* band */ - c->operand[12] = 1; - else - c->operand[12] = 0; - - if (fdtv->type == FIREDTV_DVB_S2) { - if (fdtv->fe.dtv_property_cache.delivery_system == SYS_DVBS2) { - switch (fdtv->fe.dtv_property_cache.modulation) { - case QAM_16: c->operand[13] = 0x1; break; - case QPSK: c->operand[13] = 0x2; break; - case PSK_8: c->operand[13] = 0x3; break; - default: c->operand[13] = 0x2; break; - } - switch (fdtv->fe.dtv_property_cache.rolloff) { - case ROLLOFF_35: c->operand[14] = 0x2; break; - case ROLLOFF_20: c->operand[14] = 0x0; break; - case ROLLOFF_25: c->operand[14] = 0x1; break; - case ROLLOFF_AUTO: - default: c->operand[14] = 0x2; break; - /* case ROLLOFF_NONE: c->operand[14] = 0xff; break; */ - } - switch (fdtv->fe.dtv_property_cache.pilot) { - case PILOT_AUTO: c->operand[15] = 0x0; break; - case PILOT_OFF: c->operand[15] = 0x0; break; - case PILOT_ON: c->operand[15] = 0x1; break; - } - } else { - c->operand[13] = 0x1; /* auto modulation */ - c->operand[14] = 0xff; /* disable rolloff */ - c->operand[15] = 0xff; /* disable pilot */ - } - return 16; - } else { - return 13; - } -} - -static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv, - struct dtv_frontend_properties *p) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - - c->opcode = AVC_OPCODE_DSD; - - c->operand[0] = 0; /* source plug */ - c->operand[1] = 0xd2; /* subfunction replace */ - c->operand[2] = 0x20; /* system id = DVB */ - c->operand[3] = 0x00; /* antenna number */ - c->operand[4] = 0x11; /* system_specific_multiplex selection_length */ - - /* multiplex_valid_flags, high byte */ - c->operand[5] = 0 << 7 /* reserved */ - | 0 << 6 /* Polarisation */ - | 0 << 5 /* Orbital_Pos */ - | 1 << 4 /* Frequency */ - | 1 << 3 /* Symbol_Rate */ - | 0 << 2 /* FEC_outer */ - | (p->fec_inner != FEC_AUTO ? 1 << 1 : 0) - | (p->modulation != QAM_AUTO ? 1 << 0 : 0); - - /* multiplex_valid_flags, low byte */ - c->operand[6] = 0 << 7 /* NetworkID */ - | 0 << 0 /* reserved */ ; - - c->operand[7] = 0x00; - c->operand[8] = 0x00; - c->operand[9] = 0x00; - c->operand[10] = 0x00; - - c->operand[11] = (((p->frequency / 4000) >> 16) & 0xff) | (2 << 6); - c->operand[12] = ((p->frequency / 4000) >> 8) & 0xff; - c->operand[13] = (p->frequency / 4000) & 0xff; - c->operand[14] = ((p->symbol_rate / 1000) >> 12) & 0xff; - c->operand[15] = ((p->symbol_rate / 1000) >> 4) & 0xff; - c->operand[16] = ((p->symbol_rate / 1000) << 4) & 0xf0; - c->operand[17] = 0x00; - - switch (p->fec_inner) { - case FEC_1_2: c->operand[18] = 0x1; break; - case FEC_2_3: c->operand[18] = 0x2; break; - case FEC_3_4: c->operand[18] = 0x3; break; - case FEC_5_6: c->operand[18] = 0x4; break; - case FEC_7_8: c->operand[18] = 0x5; break; - case FEC_8_9: c->operand[18] = 0x6; break; - case FEC_4_5: c->operand[18] = 0x8; break; - case FEC_AUTO: - default: c->operand[18] = 0x0; - } - - switch (p->modulation) { - case QAM_16: c->operand[19] = 0x08; break; - case QAM_32: c->operand[19] = 0x10; break; - case QAM_64: c->operand[19] = 0x18; break; - case QAM_128: c->operand[19] = 0x20; break; - case QAM_256: c->operand[19] = 0x28; break; - case QAM_AUTO: - default: c->operand[19] = 0x00; - } - - c->operand[20] = 0x00; - c->operand[21] = 0x00; - - return 22 + add_pid_filter(fdtv, &c->operand[22]); -} - -static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv, - struct dtv_frontend_properties *p) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - - c->opcode = AVC_OPCODE_DSD; - - c->operand[0] = 0; /* source plug */ - c->operand[1] = 0xd2; /* subfunction replace */ - c->operand[2] = 0x20; /* system id = DVB */ - c->operand[3] = 0x00; /* antenna number */ - c->operand[4] = 0x0c; /* system_specific_multiplex selection_length */ - - /* multiplex_valid_flags, high byte */ - c->operand[5] = - 0 << 7 /* reserved */ - | 1 << 6 /* CenterFrequency */ - | (p->bandwidth_hz != 0 ? 1 << 5 : 0) - | (p->modulation != QAM_AUTO ? 1 << 4 : 0) - | (p->hierarchy != HIERARCHY_AUTO ? 1 << 3 : 0) - | (p->code_rate_HP != FEC_AUTO ? 1 << 2 : 0) - | (p->code_rate_LP != FEC_AUTO ? 1 << 1 : 0) - | (p->guard_interval != GUARD_INTERVAL_AUTO ? 1 << 0 : 0); - - /* multiplex_valid_flags, low byte */ - c->operand[6] = - 0 << 7 /* NetworkID */ - | (p->transmission_mode != TRANSMISSION_MODE_AUTO ? 1 << 6 : 0) - | 0 << 5 /* OtherFrequencyFlag */ - | 0 << 0 /* reserved */ ; - - c->operand[7] = 0x0; - c->operand[8] = (p->frequency / 10) >> 24; - c->operand[9] = ((p->frequency / 10) >> 16) & 0xff; - c->operand[10] = ((p->frequency / 10) >> 8) & 0xff; - c->operand[11] = (p->frequency / 10) & 0xff; - - switch (p->bandwidth_hz) { - case 7000000: c->operand[12] = 0x20; break; - case 8000000: - case 6000000: /* not defined by AVC spec */ - case 0: - default: c->operand[12] = 0x00; - } - - switch (p->modulation) { - case QAM_16: c->operand[13] = 1 << 6; break; - case QAM_64: c->operand[13] = 2 << 6; break; - case QPSK: - default: c->operand[13] = 0x00; - } - - switch (p->hierarchy) { - case HIERARCHY_1: c->operand[13] |= 1 << 3; break; - case HIERARCHY_2: c->operand[13] |= 2 << 3; break; - case HIERARCHY_4: c->operand[13] |= 3 << 3; break; - case HIERARCHY_AUTO: - case HIERARCHY_NONE: - default: break; - } - - switch (p->code_rate_HP) { - case FEC_2_3: c->operand[13] |= 1; break; - case FEC_3_4: c->operand[13] |= 2; break; - case FEC_5_6: c->operand[13] |= 3; break; - case FEC_7_8: c->operand[13] |= 4; break; - case FEC_1_2: - default: break; - } - - switch (p->code_rate_LP) { - case FEC_2_3: c->operand[14] = 1 << 5; break; - case FEC_3_4: c->operand[14] = 2 << 5; break; - case FEC_5_6: c->operand[14] = 3 << 5; break; - case FEC_7_8: c->operand[14] = 4 << 5; break; - case FEC_1_2: - default: c->operand[14] = 0x00; break; - } - - switch (p->guard_interval) { - case GUARD_INTERVAL_1_16: c->operand[14] |= 1 << 3; break; - case GUARD_INTERVAL_1_8: c->operand[14] |= 2 << 3; break; - case GUARD_INTERVAL_1_4: c->operand[14] |= 3 << 3; break; - case GUARD_INTERVAL_1_32: - case GUARD_INTERVAL_AUTO: - default: break; - } - - switch (p->transmission_mode) { - case TRANSMISSION_MODE_8K: c->operand[14] |= 1 << 1; break; - case TRANSMISSION_MODE_2K: - case TRANSMISSION_MODE_AUTO: - default: break; - } - - c->operand[15] = 0x00; /* network_ID[0] */ - c->operand[16] = 0x00; /* network_ID[1] */ - - return 17 + add_pid_filter(fdtv, &c->operand[17]); -} - -int avc_tuner_dsd(struct firedtv *fdtv, - struct dtv_frontend_properties *p) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int pos, ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - - switch (fdtv->type) { - case FIREDTV_DVB_S: - case FIREDTV_DVB_S2: pos = avc_tuner_tuneqpsk(fdtv, p); break; - case FIREDTV_DVB_C: pos = avc_tuner_dsd_dvb_c(fdtv, p); break; - case FIREDTV_DVB_T: pos = avc_tuner_dsd_dvb_t(fdtv, p); break; - default: - BUG(); - } - pad_operands(c, pos); - - fdtv->avc_data_length = ALIGN(3 + pos, 4); - ret = avc_write(fdtv); -#if 0 - /* - * FIXME: - * u8 *status was an out-parameter of avc_tuner_dsd, unused by caller. - * Check for AVC_RESPONSE_ACCEPTED here instead? - */ - if (status) - *status = r->operand[2]; -#endif - mutex_unlock(&fdtv->avc_mutex); - - if (ret == 0) - msleep(500); - - return ret; -} - -int avc_tuner_set_pids(struct firedtv *fdtv, unsigned char pidc, u16 pid[]) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret, pos, k; - - if (pidc > 16 && pidc != 0xff) - return -EINVAL; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_DSD; - - c->operand[0] = 0; /* source plug */ - c->operand[1] = 0xd2; /* subfunction replace */ - c->operand[2] = 0x20; /* system id = DVB */ - c->operand[3] = 0x00; /* antenna number */ - c->operand[4] = 0x00; /* system_specific_multiplex selection_length */ - c->operand[5] = pidc; /* Nr_of_dsd_sel_specs */ - - pos = 6; - if (pidc != 0xff) - for (k = 0; k < pidc; k++) { - c->operand[pos++] = 0x13; /* flowfunction relay */ - c->operand[pos++] = 0x80; /* dsd_sel_spec_valid_flags -> PID */ - c->operand[pos++] = (pid[k] >> 8) & 0x1f; - c->operand[pos++] = pid[k] & 0xff; - c->operand[pos++] = 0x00; /* tableID */ - c->operand[pos++] = 0x00; /* filter_length */ - } - pad_operands(c, pos); - - fdtv->avc_data_length = ALIGN(3 + pos, 4); - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - if (ret == 0) - msleep(50); - - return ret; -} - -int avc_tuner_get_ts(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret, sl; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_DSIT; - - sl = fdtv->type == FIREDTV_DVB_T ? 0x0c : 0x11; - - c->operand[0] = 0; /* source plug */ - c->operand[1] = 0xd2; /* subfunction replace */ - c->operand[2] = 0xff; /* status */ - c->operand[3] = 0x20; /* system id = DVB */ - c->operand[4] = 0x00; /* antenna number */ - c->operand[5] = 0x0; /* system_specific_search_flags */ - c->operand[6] = sl; /* system_specific_multiplex selection_length */ - /* - * operand[7]: valid_flags[0] - * operand[8]: valid_flags[1] - * operand[7 + sl]: nr_of_dsit_sel_specs (always 0) - */ - clear_operands(c, 7, 24); - - fdtv->avc_data_length = fdtv->type == FIREDTV_DVB_T ? 24 : 28; - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - if (ret == 0) - msleep(250); - - return ret; -} - -int avc_identify_subunit(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_READ_DESCRIPTOR; - - c->operand[0] = DESCRIPTOR_SUBUNIT_IDENTIFIER; - c->operand[1] = 0xff; - c->operand[2] = 0x00; - c->operand[3] = 0x00; /* length highbyte */ - c->operand[4] = 0x08; /* length lowbyte */ - c->operand[5] = 0x00; /* offset highbyte */ - c->operand[6] = 0x0d; /* offset lowbyte */ - clear_operands(c, 7, 8); /* padding */ - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - if ((r->response != AVC_RESPONSE_STABLE && - r->response != AVC_RESPONSE_ACCEPTED) || - (r->operand[3] << 8) + r->operand[4] != 8) { - dev_err(fdtv->device, "cannot read subunit identifier\n"); - ret = -EINVAL; - } -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -#define SIZEOF_ANTENNA_INPUT_INFO 22 - -int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int length, ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_READ_DESCRIPTOR; - - c->operand[0] = DESCRIPTOR_TUNER_STATUS; - c->operand[1] = 0xff; /* read_result_status */ - /* - * operand[2]: reserved - * operand[3]: SIZEOF_ANTENNA_INPUT_INFO >> 8 - * operand[4]: SIZEOF_ANTENNA_INPUT_INFO & 0xff - */ - clear_operands(c, 2, 31); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - if (r->response != AVC_RESPONSE_STABLE && - r->response != AVC_RESPONSE_ACCEPTED) { - dev_err(fdtv->device, "cannot read tuner status\n"); - ret = -EINVAL; - goto out; - } - - length = r->operand[9]; - if (r->operand[1] != 0x10 || length != SIZEOF_ANTENNA_INPUT_INFO) { - dev_err(fdtv->device, "got invalid tuner status\n"); - ret = -EINVAL; - goto out; - } - - stat->active_system = r->operand[10]; - stat->searching = r->operand[11] >> 7 & 1; - stat->moving = r->operand[11] >> 6 & 1; - stat->no_rf = r->operand[11] >> 5 & 1; - stat->input = r->operand[12] >> 7 & 1; - stat->selected_antenna = r->operand[12] & 0x7f; - stat->ber = r->operand[13] << 24 | - r->operand[14] << 16 | - r->operand[15] << 8 | - r->operand[16]; - stat->signal_strength = r->operand[17]; - stat->raster_frequency = r->operand[18] >> 6 & 2; - stat->rf_frequency = (r->operand[18] & 0x3f) << 16 | - r->operand[19] << 8 | - r->operand[20]; - stat->man_dep_info_length = r->operand[21]; - stat->front_end_error = r->operand[22] >> 4 & 1; - stat->antenna_error = r->operand[22] >> 3 & 1; - stat->front_end_power_status = r->operand[22] >> 1 & 1; - stat->power_supply = r->operand[22] & 1; - stat->carrier_noise_ratio = r->operand[23] << 8 | - r->operand[24]; - stat->power_supply_voltage = r->operand[27]; - stat->antenna_voltage = r->operand[28]; - stat->firewire_bus_voltage = r->operand[29]; - stat->ca_mmi = r->operand[30] & 1; - stat->ca_pmt_reply = r->operand[31] >> 7 & 1; - stat->ca_date_time_request = r->operand[31] >> 6 & 1; - stat->ca_application_info = r->operand[31] >> 5 & 1; - stat->ca_module_present_status = r->operand[31] >> 4 & 1; - stat->ca_dvb_flag = r->operand[31] >> 3 & 1; - stat->ca_error_flag = r->operand[31] >> 2 & 1; - stat->ca_initialization_status = r->operand[31] >> 1 & 1; -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_lnb_control(struct firedtv *fdtv, char voltage, char burst, - char conttone, char nrdiseq, - struct dvb_diseqc_master_cmd *diseqcmd) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int pos, j, k, ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_LNB_CONTROL; - c->operand[4] = voltage; - c->operand[5] = nrdiseq; - - pos = 6; - for (j = 0; j < nrdiseq; j++) { - c->operand[pos++] = diseqcmd[j].msg_len; - - for (k = 0; k < diseqcmd[j].msg_len; k++) - c->operand[pos++] = diseqcmd[j].msg[k]; - } - c->operand[pos++] = burst; - c->operand[pos++] = conttone; - pad_operands(c, pos); - - fdtv->avc_data_length = ALIGN(3 + pos, 4); - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - if (r->response != AVC_RESPONSE_ACCEPTED) { - dev_err(fdtv->device, "LNB control failed\n"); - ret = -EINVAL; - } -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_register_remote_control(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_NOTIFY; - c->subunit = AVC_SUBUNIT_TYPE_UNIT | 7; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL; - c->operand[4] = 0; /* padding */ - - fdtv->avc_data_length = 8; - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -void avc_remote_ctrl_work(struct work_struct *work) -{ - struct firedtv *fdtv = - container_of(work, struct firedtv, remote_ctrl_work); - - /* Should it be rescheduled in failure cases? */ - avc_register_remote_control(fdtv); -} - -#if 0 /* FIXME: unused */ -int avc_tuner_host2ca(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ - clear_operands(c, 6, 8); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} -#endif - -static int get_ca_object_pos(struct avc_response_frame *r) -{ - int length = 1; - - /* Check length of length field */ - if (r->operand[7] & 0x80) - length = (r->operand[7] & 0x7f) + 1; - return length + 7; -} - -static int get_ca_object_length(struct avc_response_frame *r) -{ -#if 0 /* FIXME: unused */ - int size = 0; - int i; - - if (r->operand[7] & 0x80) - for (i = 0; i < (r->operand[7] & 0x7f); i++) { - size <<= 8; - size += r->operand[8 + i]; - } -#endif - return r->operand[7]; -} - -int avc_ca_app_info(struct firedtv *fdtv, char *app_info, unsigned int *len) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int pos, ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_STATUS; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ - clear_operands(c, 6, LAST_OPERAND); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - /* FIXME: check response code and validate response data */ - - pos = get_ca_object_pos(r); - app_info[0] = (EN50221_TAG_APP_INFO >> 16) & 0xff; - app_info[1] = (EN50221_TAG_APP_INFO >> 8) & 0xff; - app_info[2] = (EN50221_TAG_APP_INFO >> 0) & 0xff; - app_info[3] = 6 + r->operand[pos + 4]; - app_info[4] = 0x01; - memcpy(&app_info[5], &r->operand[pos], 5 + r->operand[pos + 4]); - *len = app_info[3] + 4; -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_info(struct firedtv *fdtv, char *app_info, unsigned int *len) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int i, pos, ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_STATUS; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ - clear_operands(c, 6, LAST_OPERAND); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - /* FIXME: check response code and validate response data */ - - pos = get_ca_object_pos(r); - app_info[0] = (EN50221_TAG_CA_INFO >> 16) & 0xff; - app_info[1] = (EN50221_TAG_CA_INFO >> 8) & 0xff; - app_info[2] = (EN50221_TAG_CA_INFO >> 0) & 0xff; - if (num_fake_ca_system_ids == 0) { - app_info[3] = 2; - app_info[4] = r->operand[pos + 0]; - app_info[5] = r->operand[pos + 1]; - } else { - app_info[3] = num_fake_ca_system_ids * 2; - for (i = 0; i < num_fake_ca_system_ids; i++) { - app_info[4 + i * 2] = - (fake_ca_system_ids[i] >> 8) & 0xff; - app_info[5 + i * 2] = fake_ca_system_ids[i] & 0xff; - } - } - *len = app_info[3] + 4; -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_reset(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_RESET; /* ca tag */ - c->operand[6] = 0; /* more/last */ - c->operand[7] = 1; /* length */ - c->operand[8] = 0; /* force hardware reset */ - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int list_management; - int program_info_length; - int pmt_cmd_id; - int read_pos; - int write_pos; - int es_info_length; - int crc32_csum; - int ret; - - if (unlikely(avc_debug & AVC_DEBUG_APPLICATION_PMT)) - debug_pmt(msg, length); - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_CONTROL; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - if (msg[0] != EN50221_LIST_MANAGEMENT_ONLY) { - dev_info(fdtv->device, "forcing list_management to ONLY\n"); - msg[0] = EN50221_LIST_MANAGEMENT_ONLY; - } - /* We take the cmd_id from the programme level only! */ - list_management = msg[0]; - program_info_length = ((msg[4] & 0x0f) << 8) + msg[5]; - if (program_info_length > 0) - program_info_length--; /* Remove pmt_cmd_id */ - pmt_cmd_id = msg[6]; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_PMT; /* ca tag */ - c->operand[6] = 0; /* more/last */ - /* Use three bytes for length field in case length > 127 */ - c->operand[10] = list_management; - c->operand[11] = 0x01; /* pmt_cmd=OK_descramble */ - - /* TS program map table */ - - c->operand[12] = 0x02; /* Table id=2 */ - c->operand[13] = 0x80; /* Section syntax + length */ - - c->operand[15] = msg[1]; /* Program number */ - c->operand[16] = msg[2]; - c->operand[17] = msg[3]; /* Version number and current/next */ - c->operand[18] = 0x00; /* Section number=0 */ - c->operand[19] = 0x00; /* Last section number=0 */ - c->operand[20] = 0x1f; /* PCR_PID=1FFF */ - c->operand[21] = 0xff; - c->operand[22] = (program_info_length >> 8); /* Program info length */ - c->operand[23] = (program_info_length & 0xff); - - /* CA descriptors at programme level */ - read_pos = 6; - write_pos = 24; - if (program_info_length > 0) { - pmt_cmd_id = msg[read_pos++]; - if (pmt_cmd_id != 1 && pmt_cmd_id != 4) - dev_err(fdtv->device, - "invalid pmt_cmd_id %d\n", pmt_cmd_id); - - memcpy(&c->operand[write_pos], &msg[read_pos], - program_info_length); - read_pos += program_info_length; - write_pos += program_info_length; - } - while (read_pos < length) { - c->operand[write_pos++] = msg[read_pos++]; - c->operand[write_pos++] = msg[read_pos++]; - c->operand[write_pos++] = msg[read_pos++]; - es_info_length = - ((msg[read_pos] & 0x0f) << 8) + msg[read_pos + 1]; - read_pos += 2; - if (es_info_length > 0) - es_info_length--; /* Remove pmt_cmd_id */ - c->operand[write_pos++] = es_info_length >> 8; - c->operand[write_pos++] = es_info_length & 0xff; - if (es_info_length > 0) { - pmt_cmd_id = msg[read_pos++]; - if (pmt_cmd_id != 1 && pmt_cmd_id != 4) - dev_err(fdtv->device, "invalid pmt_cmd_id %d " - "at stream level\n", pmt_cmd_id); - - memcpy(&c->operand[write_pos], &msg[read_pos], - es_info_length); - read_pos += es_info_length; - write_pos += es_info_length; - } - } - write_pos += 4; /* CRC */ - - c->operand[7] = 0x82; - c->operand[8] = (write_pos - 10) >> 8; - c->operand[9] = (write_pos - 10) & 0xff; - c->operand[14] = write_pos - 15; - - crc32_csum = crc32_be(0, &c->operand[10], c->operand[12] - 1); - c->operand[write_pos - 4] = (crc32_csum >> 24) & 0xff; - c->operand[write_pos - 3] = (crc32_csum >> 16) & 0xff; - c->operand[write_pos - 2] = (crc32_csum >> 8) & 0xff; - c->operand[write_pos - 1] = (crc32_csum >> 0) & 0xff; - pad_operands(c, write_pos); - - fdtv->avc_data_length = ALIGN(3 + write_pos, 4); - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - if (r->response != AVC_RESPONSE_ACCEPTED) { - dev_err(fdtv->device, - "CA PMT failed with response 0x%x\n", r->response); - ret = -EACCES; - } -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_get_time_date(struct firedtv *fdtv, int *interval) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_STATUS; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_DATE_TIME; /* ca tag */ - clear_operands(c, 6, LAST_OPERAND); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - /* FIXME: check response code and validate response data */ - - *interval = r->operand[get_ca_object_pos(r)]; -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_enter_menu(struct firedtv *fdtv) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_STATUS; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_ENTER_MENU; - clear_operands(c, 6, 8); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - - /* FIXME: check response code? */ - - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -int avc_ca_get_mmi(struct firedtv *fdtv, char *mmi_object, unsigned int *len) -{ - struct avc_command_frame *c = (void *)fdtv->avc_data; - struct avc_response_frame *r = (void *)fdtv->avc_data; - int ret; - - mutex_lock(&fdtv->avc_mutex); - - c->ctype = AVC_CTYPE_STATUS; - c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; - c->opcode = AVC_OPCODE_VENDOR; - - c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; - c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; - c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; - c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; - c->operand[4] = 0; /* slot */ - c->operand[5] = SFE_VENDOR_TAG_CA_MMI; - clear_operands(c, 6, LAST_OPERAND); - - fdtv->avc_data_length = 12; - ret = avc_write(fdtv); - if (ret < 0) - goto out; - - /* FIXME: check response code and validate response data */ - - *len = get_ca_object_length(r); - memcpy(mmi_object, &r->operand[get_ca_object_pos(r)], *len); -out: - mutex_unlock(&fdtv->avc_mutex); - - return ret; -} - -#define CMP_OUTPUT_PLUG_CONTROL_REG_0 0xfffff0000904ULL - -static int cmp_read(struct firedtv *fdtv, u64 addr, __be32 *data) -{ - int ret; - - ret = fdtv_read(fdtv, addr, data); - if (ret < 0) - dev_err(fdtv->device, "CMP: read I/O error\n"); - - return ret; -} - -static int cmp_lock(struct firedtv *fdtv, u64 addr, __be32 data[]) -{ - int ret; - - ret = fdtv_lock(fdtv, addr, data); - if (ret < 0) - dev_err(fdtv->device, "CMP: lock I/O error\n"); - - return ret; -} - -static inline u32 get_opcr(__be32 opcr, u32 mask, u32 shift) -{ - return (be32_to_cpu(opcr) >> shift) & mask; -} - -static inline void set_opcr(__be32 *opcr, u32 value, u32 mask, u32 shift) -{ - *opcr &= ~cpu_to_be32(mask << shift); - *opcr |= cpu_to_be32((value & mask) << shift); -} - -#define get_opcr_online(v) get_opcr((v), 0x1, 31) -#define get_opcr_p2p_connections(v) get_opcr((v), 0x3f, 24) -#define get_opcr_channel(v) get_opcr((v), 0x3f, 16) - -#define set_opcr_p2p_connections(p, v) set_opcr((p), (v), 0x3f, 24) -#define set_opcr_channel(p, v) set_opcr((p), (v), 0x3f, 16) -#define set_opcr_data_rate(p, v) set_opcr((p), (v), 0x3, 14) -#define set_opcr_overhead_id(p, v) set_opcr((p), (v), 0xf, 10) - -int cmp_establish_pp_connection(struct firedtv *fdtv, int plug, int channel) -{ - __be32 old_opcr, opcr[2]; - u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2); - int attempts = 0; - int ret; - - ret = cmp_read(fdtv, opcr_address, opcr); - if (ret < 0) - return ret; - -repeat: - if (!get_opcr_online(*opcr)) { - dev_err(fdtv->device, "CMP: output offline\n"); - return -EBUSY; - } - - old_opcr = *opcr; - - if (get_opcr_p2p_connections(*opcr)) { - if (get_opcr_channel(*opcr) != channel) { - dev_err(fdtv->device, "CMP: cannot change channel\n"); - return -EBUSY; - } - dev_info(fdtv->device, "CMP: overlaying connection\n"); - - /* We don't allocate isochronous resources. */ - } else { - set_opcr_channel(opcr, channel); - set_opcr_data_rate(opcr, 2); /* S400 */ - - /* FIXME: this is for the worst case - optimize */ - set_opcr_overhead_id(opcr, 0); - - /* FIXME: allocate isochronous channel and bandwidth at IRM */ - } - - set_opcr_p2p_connections(opcr, get_opcr_p2p_connections(*opcr) + 1); - - opcr[1] = *opcr; - opcr[0] = old_opcr; - - ret = cmp_lock(fdtv, opcr_address, opcr); - if (ret < 0) - return ret; - - if (old_opcr != *opcr) { - /* - * FIXME: if old_opcr.P2P_Connections > 0, - * deallocate isochronous channel and bandwidth at IRM - */ - - if (++attempts < 6) /* arbitrary limit */ - goto repeat; - return -EBUSY; - } - - return 0; -} - -void cmp_break_pp_connection(struct firedtv *fdtv, int plug, int channel) -{ - __be32 old_opcr, opcr[2]; - u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2); - int attempts = 0; - - if (cmp_read(fdtv, opcr_address, opcr) < 0) - return; - -repeat: - if (!get_opcr_online(*opcr) || !get_opcr_p2p_connections(*opcr) || - get_opcr_channel(*opcr) != channel) { - dev_err(fdtv->device, "CMP: no connection to break\n"); - return; - } - - old_opcr = *opcr; - set_opcr_p2p_connections(opcr, get_opcr_p2p_connections(*opcr) - 1); - - opcr[1] = *opcr; - opcr[0] = old_opcr; - - if (cmp_lock(fdtv, opcr_address, opcr) < 0) - return; - - if (old_opcr != *opcr) { - /* - * FIXME: if old_opcr.P2P_Connections == 1, i.e. we were last - * owner, deallocate isochronous channel and bandwidth at IRM - * if (...) - * fdtv->backend->dealloc_resources(fdtv, channel, bw); - */ - - if (++attempts < 6) /* arbitrary limit */ - goto repeat; - } -} diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c deleted file mode 100644 index e5ebdbfe8c19..000000000000 --- a/drivers/media/dvb/firewire/firedtv-ci.c +++ /dev/null @@ -1,258 +0,0 @@ -/* - * FireDTV driver (formerly known as FireSAT) - * - * Copyright (C) 2004 Andreas Monitzer - * Copyright (C) 2008 Henrik Kurelid - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - */ - -#include -#include -#include -#include - -#include - -#include "firedtv.h" - -#define EN50221_TAG_APP_INFO_ENQUIRY 0x9f8020 -#define EN50221_TAG_CA_INFO_ENQUIRY 0x9f8030 -#define EN50221_TAG_CA_PMT 0x9f8032 -#define EN50221_TAG_ENTER_MENU 0x9f8022 - -static int fdtv_ca_ready(struct firedtv_tuner_status *stat) -{ - return stat->ca_initialization_status == 1 && - stat->ca_error_flag == 0 && - stat->ca_dvb_flag == 1 && - stat->ca_module_present_status == 1; -} - -static int fdtv_get_ca_flags(struct firedtv_tuner_status *stat) -{ - int flags = 0; - - if (stat->ca_module_present_status == 1) - flags |= CA_CI_MODULE_PRESENT; - if (stat->ca_initialization_status == 1 && - stat->ca_error_flag == 0 && - stat->ca_dvb_flag == 1) - flags |= CA_CI_MODULE_READY; - return flags; -} - -static int fdtv_ca_get_caps(void *arg) -{ - struct ca_caps *cap = arg; - - cap->slot_num = 1; - cap->slot_type = CA_CI; - cap->descr_num = 1; - cap->descr_type = CA_ECD; - return 0; -} - -static int fdtv_ca_get_slot_info(struct firedtv *fdtv, void *arg) -{ - struct firedtv_tuner_status stat; - struct ca_slot_info *slot = arg; - int err; - - err = avc_tuner_status(fdtv, &stat); - if (err) - return err; - - if (slot->num != 0) - return -EACCES; - - slot->type = CA_CI; - slot->flags = fdtv_get_ca_flags(&stat); - return 0; -} - -static int fdtv_ca_app_info(struct firedtv *fdtv, void *arg) -{ - struct ca_msg *reply = arg; - - return avc_ca_app_info(fdtv, reply->msg, &reply->length); -} - -static int fdtv_ca_info(struct firedtv *fdtv, void *arg) -{ - struct ca_msg *reply = arg; - - return avc_ca_info(fdtv, reply->msg, &reply->length); -} - -static int fdtv_ca_get_mmi(struct firedtv *fdtv, void *arg) -{ - struct ca_msg *reply = arg; - - return avc_ca_get_mmi(fdtv, reply->msg, &reply->length); -} - -static int fdtv_ca_get_msg(struct firedtv *fdtv, void *arg) -{ - struct firedtv_tuner_status stat; - int err; - - switch (fdtv->ca_last_command) { - case EN50221_TAG_APP_INFO_ENQUIRY: - err = fdtv_ca_app_info(fdtv, arg); - break; - case EN50221_TAG_CA_INFO_ENQUIRY: - err = fdtv_ca_info(fdtv, arg); - break; - default: - err = avc_tuner_status(fdtv, &stat); - if (err) - break; - if (stat.ca_mmi == 1) - err = fdtv_ca_get_mmi(fdtv, arg); - else { - dev_info(fdtv->device, "unhandled CA message 0x%08x\n", - fdtv->ca_last_command); - err = -EACCES; - } - } - fdtv->ca_last_command = 0; - return err; -} - -static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg) -{ - struct ca_msg *msg = arg; - int data_pos; - int data_length; - int i; - - data_pos = 4; - if (msg->msg[3] & 0x80) { - data_length = 0; - for (i = 0; i < (msg->msg[3] & 0x7f); i++) - data_length = (data_length << 8) + msg->msg[data_pos++]; - } else { - data_length = msg->msg[3]; - } - - return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length); -} - -static int fdtv_ca_send_msg(struct firedtv *fdtv, void *arg) -{ - struct ca_msg *msg = arg; - int err; - - /* Do we need a semaphore for this? */ - fdtv->ca_last_command = - (msg->msg[0] << 16) + (msg->msg[1] << 8) + msg->msg[2]; - switch (fdtv->ca_last_command) { - case EN50221_TAG_CA_PMT: - err = fdtv_ca_pmt(fdtv, arg); - break; - case EN50221_TAG_APP_INFO_ENQUIRY: - /* handled in ca_get_msg */ - err = 0; - break; - case EN50221_TAG_CA_INFO_ENQUIRY: - /* handled in ca_get_msg */ - err = 0; - break; - case EN50221_TAG_ENTER_MENU: - err = avc_ca_enter_menu(fdtv); - break; - default: - dev_err(fdtv->device, "unhandled CA message 0x%08x\n", - fdtv->ca_last_command); - err = -EACCES; - } - return err; -} - -static int fdtv_ca_ioctl(struct file *file, unsigned int cmd, void *arg) -{ - struct dvb_device *dvbdev = file->private_data; - struct firedtv *fdtv = dvbdev->priv; - struct firedtv_tuner_status stat; - int err; - - switch (cmd) { - case CA_RESET: - err = avc_ca_reset(fdtv); - break; - case CA_GET_CAP: - err = fdtv_ca_get_caps(arg); - break; - case CA_GET_SLOT_INFO: - err = fdtv_ca_get_slot_info(fdtv, arg); - break; - case CA_GET_MSG: - err = fdtv_ca_get_msg(fdtv, arg); - break; - case CA_SEND_MSG: - err = fdtv_ca_send_msg(fdtv, arg); - break; - default: - dev_info(fdtv->device, "unhandled CA ioctl %u\n", cmd); - err = -EOPNOTSUPP; - } - - /* FIXME Is this necessary? */ - avc_tuner_status(fdtv, &stat); - - return err; -} - -static unsigned int fdtv_ca_io_poll(struct file *file, poll_table *wait) -{ - return POLLIN; -} - -static const struct file_operations fdtv_ca_fops = { - .owner = THIS_MODULE, - .unlocked_ioctl = dvb_generic_ioctl, - .open = dvb_generic_open, - .release = dvb_generic_release, - .poll = fdtv_ca_io_poll, - .llseek = noop_llseek, -}; - -static struct dvb_device fdtv_ca = { - .users = 1, - .readers = 1, - .writers = 1, - .fops = &fdtv_ca_fops, - .kernel_ioctl = fdtv_ca_ioctl, -}; - -int fdtv_ca_register(struct firedtv *fdtv) -{ - struct firedtv_tuner_status stat; - int err; - - if (avc_tuner_status(fdtv, &stat)) - return -EINVAL; - - if (!fdtv_ca_ready(&stat)) - return -EFAULT; - - err = dvb_register_device(&fdtv->adapter, &fdtv->cadev, - &fdtv_ca, fdtv, DVB_DEVICE_CA); - - if (stat.ca_application_info == 0) - dev_err(fdtv->device, "CaApplicationInfo is not set\n"); - if (stat.ca_date_time_request == 1) - avc_ca_get_time_date(fdtv, &fdtv->ca_time_interval); - - return err; -} - -void fdtv_ca_release(struct firedtv *fdtv) -{ - if (fdtv->cadev) - dvb_unregister_device(fdtv->cadev); -} diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c deleted file mode 100644 index eb7496eab130..000000000000 --- a/drivers/media/dvb/firewire/firedtv-dvb.c +++ /dev/null @@ -1,248 +0,0 @@ -/* - * FireDTV driver (formerly known as FireSAT) - * - * Copyright (C) 2004 Andreas Monitzer - * Copyright (C) 2008 Henrik Kurelid - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "firedtv.h" - -static int alloc_channel(struct firedtv *fdtv) -{ - int i; - - for (i = 0; i < 16; i++) - if (!__test_and_set_bit(i, &fdtv->channel_active)) - break; - return i; -} - -static void collect_channels(struct firedtv *fdtv, int *pidc, u16 pid[]) -{ - int i, n; - - for (i = 0, n = 0; i < 16; i++) - if (test_bit(i, &fdtv->channel_active)) - pid[n++] = fdtv->channel_pid[i]; - *pidc = n; -} - -static inline void dealloc_channel(struct firedtv *fdtv, int i) -{ - __clear_bit(i, &fdtv->channel_active); -} - -int fdtv_start_feed(struct dvb_demux_feed *dvbdmxfeed) -{ - struct firedtv *fdtv = dvbdmxfeed->demux->priv; - int pidc, c, ret; - u16 pids[16]; - - switch (dvbdmxfeed->type) { - case DMX_TYPE_TS: - case DMX_TYPE_SEC: - break; - default: - dev_err(fdtv->device, "can't start dmx feed: invalid type %u\n", - dvbdmxfeed->type); - return -EINVAL; - } - - if (mutex_lock_interruptible(&fdtv->demux_mutex)) - return -EINTR; - - if (dvbdmxfeed->type == DMX_TYPE_TS) { - switch (dvbdmxfeed->pes_type) { - case DMX_TS_PES_VIDEO: - case DMX_TS_PES_AUDIO: - case DMX_TS_PES_TELETEXT: - case DMX_TS_PES_PCR: - case DMX_TS_PES_OTHER: - c = alloc_channel(fdtv); - break; - default: - dev_err(fdtv->device, - "can't start dmx feed: invalid pes type %u\n", - dvbdmxfeed->pes_type); - ret = -EINVAL; - goto out; - } - } else { - c = alloc_channel(fdtv); - } - - if (c > 15) { - dev_err(fdtv->device, "can't start dmx feed: busy\n"); - ret = -EBUSY; - goto out; - } - - dvbdmxfeed->priv = (typeof(dvbdmxfeed->priv))(unsigned long)c; - fdtv->channel_pid[c] = dvbdmxfeed->pid; - collect_channels(fdtv, &pidc, pids); - - if (dvbdmxfeed->pid == 8192) { - ret = avc_tuner_get_ts(fdtv); - if (ret) { - dealloc_channel(fdtv, c); - dev_err(fdtv->device, "can't get TS\n"); - goto out; - } - } else { - ret = avc_tuner_set_pids(fdtv, pidc, pids); - if (ret) { - dealloc_channel(fdtv, c); - dev_err(fdtv->device, "can't set PIDs\n"); - goto out; - } - } -out: - mutex_unlock(&fdtv->demux_mutex); - - return ret; -} - -int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed) -{ - struct dvb_demux *demux = dvbdmxfeed->demux; - struct firedtv *fdtv = demux->priv; - int pidc, c, ret; - u16 pids[16]; - - if (dvbdmxfeed->type == DMX_TYPE_TS && - !((dvbdmxfeed->ts_type & TS_PACKET) && - (demux->dmx.frontend->source != DMX_MEMORY_FE))) { - - if (dvbdmxfeed->ts_type & TS_DECODER) { - if (dvbdmxfeed->pes_type >= DMX_TS_PES_OTHER || - !demux->pesfilter[dvbdmxfeed->pes_type]) - return -EINVAL; - - demux->pids[dvbdmxfeed->pes_type] |= 0x8000; - demux->pesfilter[dvbdmxfeed->pes_type] = NULL; - } - - if (!(dvbdmxfeed->ts_type & TS_DECODER && - dvbdmxfeed->pes_type < DMX_TS_PES_OTHER)) - return 0; - } - - if (mutex_lock_interruptible(&fdtv->demux_mutex)) - return -EINTR; - - c = (unsigned long)dvbdmxfeed->priv; - dealloc_channel(fdtv, c); - collect_channels(fdtv, &pidc, pids); - - ret = avc_tuner_set_pids(fdtv, pidc, pids); - - mutex_unlock(&fdtv->demux_mutex); - - return ret; -} - -DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); - -int fdtv_dvb_register(struct firedtv *fdtv, const char *name) -{ - int err; - - err = dvb_register_adapter(&fdtv->adapter, name, - THIS_MODULE, fdtv->device, adapter_nr); - if (err < 0) - goto fail_log; - - /*DMX_TS_FILTERING | DMX_SECTION_FILTERING*/ - fdtv->demux.dmx.capabilities = 0; - - fdtv->demux.priv = fdtv; - fdtv->demux.filternum = 16; - fdtv->demux.feednum = 16; - fdtv->demux.start_feed = fdtv_start_feed; - fdtv->demux.stop_feed = fdtv_stop_feed; - fdtv->demux.write_to_decoder = NULL; - - err = dvb_dmx_init(&fdtv->demux); - if (err) - goto fail_unreg_adapter; - - fdtv->dmxdev.filternum = 16; - fdtv->dmxdev.demux = &fdtv->demux.dmx; - fdtv->dmxdev.capabilities = 0; - - err = dvb_dmxdev_init(&fdtv->dmxdev, &fdtv->adapter); - if (err) - goto fail_dmx_release; - - fdtv->frontend.source = DMX_FRONTEND_0; - - err = fdtv->demux.dmx.add_frontend(&fdtv->demux.dmx, &fdtv->frontend); - if (err) - goto fail_dmxdev_release; - - err = fdtv->demux.dmx.connect_frontend(&fdtv->demux.dmx, - &fdtv->frontend); - if (err) - goto fail_rem_frontend; - - err = dvb_net_init(&fdtv->adapter, &fdtv->dvbnet, &fdtv->demux.dmx); - if (err) - goto fail_disconnect_frontend; - - fdtv_frontend_init(fdtv, name); - err = dvb_register_frontend(&fdtv->adapter, &fdtv->fe); - if (err) - goto fail_net_release; - - err = fdtv_ca_register(fdtv); - if (err) - dev_info(fdtv->device, - "Conditional Access Module not enabled\n"); - return 0; - -fail_net_release: - dvb_net_release(&fdtv->dvbnet); -fail_disconnect_frontend: - fdtv->demux.dmx.close(&fdtv->demux.dmx); -fail_rem_frontend: - fdtv->demux.dmx.remove_frontend(&fdtv->demux.dmx, &fdtv->frontend); -fail_dmxdev_release: - dvb_dmxdev_release(&fdtv->dmxdev); -fail_dmx_release: - dvb_dmx_release(&fdtv->demux); -fail_unreg_adapter: - dvb_unregister_adapter(&fdtv->adapter); -fail_log: - dev_err(fdtv->device, "DVB initialization failed\n"); - return err; -} - -void fdtv_dvb_unregister(struct firedtv *fdtv) -{ - fdtv_ca_release(fdtv); - dvb_unregister_frontend(&fdtv->fe); - dvb_net_release(&fdtv->dvbnet); - fdtv->demux.dmx.close(&fdtv->demux.dmx); - fdtv->demux.dmx.remove_frontend(&fdtv->demux.dmx, &fdtv->frontend); - dvb_dmxdev_release(&fdtv->dmxdev); - dvb_dmx_release(&fdtv->demux); - dvb_unregister_adapter(&fdtv->adapter); -} diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c deleted file mode 100644 index 6fe9793b98b3..000000000000 --- a/drivers/media/dvb/firewire/firedtv-fe.c +++ /dev/null @@ -1,254 +0,0 @@ -/* - * FireDTV driver (formerly known as FireSAT) - * - * Copyright (C) 2004 Andreas Monitzer - * Copyright (C) 2008 Henrik Kurelid - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - */ - -#include -#include -#include -#include -#include - -#include - -#include "firedtv.h" - -static int fdtv_dvb_init(struct dvb_frontend *fe) -{ - struct firedtv *fdtv = fe->sec_priv; - int err; - - /* FIXME - allocate free channel at IRM */ - fdtv->isochannel = fdtv->adapter.num; - - err = cmp_establish_pp_connection(fdtv, fdtv->subunit, - fdtv->isochannel); - if (err) { - dev_err(fdtv->device, - "could not establish point to point connection\n"); - return err; - } - - return fdtv_start_iso(fdtv); -} - -static int fdtv_sleep(struct dvb_frontend *fe) -{ - struct firedtv *fdtv = fe->sec_priv; - - fdtv_stop_iso(fdtv); - cmp_break_pp_connection(fdtv, fdtv->subunit, fdtv->isochannel); - fdtv->isochannel = -1; - return 0; -} - -#define LNBCONTROL_DONTCARE 0xff - -static int fdtv_diseqc_send_master_cmd(struct dvb_frontend *fe, - struct dvb_diseqc_master_cmd *cmd) -{ - struct firedtv *fdtv = fe->sec_priv; - - return avc_lnb_control(fdtv, LNBCONTROL_DONTCARE, LNBCONTROL_DONTCARE, - LNBCONTROL_DONTCARE, 1, cmd); -} - -static int fdtv_diseqc_send_burst(struct dvb_frontend *fe, - fe_sec_mini_cmd_t minicmd) -{ - return 0; -} - -static int fdtv_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone) -{ - struct firedtv *fdtv = fe->sec_priv; - - fdtv->tone = tone; - return 0; -} - -static int fdtv_set_voltage(struct dvb_frontend *fe, - fe_sec_voltage_t voltage) -{ - struct firedtv *fdtv = fe->sec_priv; - - fdtv->voltage = voltage; - return 0; -} - -static int fdtv_read_status(struct dvb_frontend *fe, fe_status_t *status) -{ - struct firedtv *fdtv = fe->sec_priv; - struct firedtv_tuner_status stat; - - if (avc_tuner_status(fdtv, &stat)) - return -EINVAL; - - if (stat.no_rf) - *status = 0; - else - *status = FE_HAS_SIGNAL | FE_HAS_VITERBI | FE_HAS_SYNC | - FE_HAS_CARRIER | FE_HAS_LOCK; - return 0; -} - -static int fdtv_read_ber(struct dvb_frontend *fe, u32 *ber) -{ - struct firedtv *fdtv = fe->sec_priv; - struct firedtv_tuner_status stat; - - if (avc_tuner_status(fdtv, &stat)) - return -EINVAL; - - *ber = stat.ber; - return 0; -} - -static int fdtv_read_signal_strength(struct dvb_frontend *fe, u16 *strength) -{ - struct firedtv *fdtv = fe->sec_priv; - struct firedtv_tuner_status stat; - - if (avc_tuner_status(fdtv, &stat)) - return -EINVAL; - - *strength = stat.signal_strength << 8; - return 0; -} - -static int fdtv_read_snr(struct dvb_frontend *fe, u16 *snr) -{ - struct firedtv *fdtv = fe->sec_priv; - struct firedtv_tuner_status stat; - - if (avc_tuner_status(fdtv, &stat)) - return -EINVAL; - - /* C/N[dB] = -10 * log10(snr / 65535) */ - *snr = stat.carrier_noise_ratio * 257; - return 0; -} - -static int fdtv_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ucblocks) -{ - return -EOPNOTSUPP; -} - -static int fdtv_set_frontend(struct dvb_frontend *fe) -{ - struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct firedtv *fdtv = fe->sec_priv; - - return avc_tuner_dsd(fdtv, p); -} - -void fdtv_frontend_init(struct firedtv *fdtv, const char *name) -{ - struct dvb_frontend_ops *ops = &fdtv->fe.ops; - struct dvb_frontend_info *fi = &ops->info; - - ops->init = fdtv_dvb_init; - ops->sleep = fdtv_sleep; - - ops->set_frontend = fdtv_set_frontend; - - ops->read_status = fdtv_read_status; - ops->read_ber = fdtv_read_ber; - ops->read_signal_strength = fdtv_read_signal_strength; - ops->read_snr = fdtv_read_snr; - ops->read_ucblocks = fdtv_read_uncorrected_blocks; - - ops->diseqc_send_master_cmd = fdtv_diseqc_send_master_cmd; - ops->diseqc_send_burst = fdtv_diseqc_send_burst; - ops->set_tone = fdtv_set_tone; - ops->set_voltage = fdtv_set_voltage; - - switch (fdtv->type) { - case FIREDTV_DVB_S: - ops->delsys[0] = SYS_DVBS; - - fi->frequency_min = 950000; - fi->frequency_max = 2150000; - fi->frequency_stepsize = 125; - fi->symbol_rate_min = 1000000; - fi->symbol_rate_max = 40000000; - - fi->caps = FE_CAN_INVERSION_AUTO | - FE_CAN_FEC_1_2 | - FE_CAN_FEC_2_3 | - FE_CAN_FEC_3_4 | - FE_CAN_FEC_5_6 | - FE_CAN_FEC_7_8 | - FE_CAN_FEC_AUTO | - FE_CAN_QPSK; - break; - - case FIREDTV_DVB_S2: - ops->delsys[0] = SYS_DVBS; - ops->delsys[1] = SYS_DVBS2; - - fi->frequency_min = 950000; - fi->frequency_max = 2150000; - fi->frequency_stepsize = 125; - fi->symbol_rate_min = 1000000; - fi->symbol_rate_max = 40000000; - - fi->caps = FE_CAN_INVERSION_AUTO | - FE_CAN_FEC_1_2 | - FE_CAN_FEC_2_3 | - FE_CAN_FEC_3_4 | - FE_CAN_FEC_5_6 | - FE_CAN_FEC_7_8 | - FE_CAN_FEC_AUTO | - FE_CAN_QPSK | - FE_CAN_2G_MODULATION; - break; - - case FIREDTV_DVB_C: - ops->delsys[0] = SYS_DVBC_ANNEX_A; - - fi->frequency_min = 47000000; - fi->frequency_max = 866000000; - fi->frequency_stepsize = 62500; - fi->symbol_rate_min = 870000; - fi->symbol_rate_max = 6900000; - - fi->caps = FE_CAN_INVERSION_AUTO | - FE_CAN_QAM_16 | - FE_CAN_QAM_32 | - FE_CAN_QAM_64 | - FE_CAN_QAM_128 | - FE_CAN_QAM_256 | - FE_CAN_QAM_AUTO; - break; - - case FIREDTV_DVB_T: - ops->delsys[0] = SYS_DVBT; - - fi->frequency_min = 49000000; - fi->frequency_max = 861000000; - fi->frequency_stepsize = 62500; - - fi->caps = FE_CAN_INVERSION_AUTO | - FE_CAN_FEC_2_3 | - FE_CAN_TRANSMISSION_MODE_AUTO | - FE_CAN_GUARD_INTERVAL_AUTO | - FE_CAN_HIERARCHY_AUTO; - break; - - default: - dev_err(fdtv->device, "no frontend for model type %d\n", - fd