diff options
| -rw-r--r-- | drivers/ieee1394/dma.h | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/ieee1394_transactions.c | 31 | ||||
| -rw-r--r-- | drivers/ieee1394/ieee1394_transactions.h | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/iso.h | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 10 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.h | 18 | ||||
| -rw-r--r-- | drivers/media/dvb/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/Kconfig | 22 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/Makefile | 8 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-1394.c | 285 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-avc.c | 1315 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-ci.c | 260 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-dvb.c | 364 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-fe.c | 247 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-rc.c | 190 | ||||
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv.h | 182 | ||||
| -rw-r--r-- | fs/ext4/ialloc.c | 7 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 9 |
20 files changed, 2951 insertions, 8 deletions
diff --git a/drivers/ieee1394/dma.h b/drivers/ieee1394/dma.h index 2727bcd24194..467373cab8e5 100644 --- a/drivers/ieee1394/dma.h +++ b/drivers/ieee1394/dma.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <asm/types.h> | 13 | #include <asm/types.h> |
| 14 | 14 | ||
| 15 | struct file; | ||
| 15 | struct pci_dev; | 16 | struct pci_dev; |
| 16 | struct scatterlist; | 17 | struct scatterlist; |
| 17 | struct vm_area_struct; | 18 | struct vm_area_struct; |
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 2beb8d94f7bd..1028e725a27e 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c | |||
| @@ -1314,6 +1314,7 @@ EXPORT_SYMBOL(hpsb_make_lock64packet); | |||
| 1314 | EXPORT_SYMBOL(hpsb_make_phypacket); | 1314 | EXPORT_SYMBOL(hpsb_make_phypacket); |
| 1315 | EXPORT_SYMBOL(hpsb_read); | 1315 | EXPORT_SYMBOL(hpsb_read); |
| 1316 | EXPORT_SYMBOL(hpsb_write); | 1316 | EXPORT_SYMBOL(hpsb_write); |
| 1317 | EXPORT_SYMBOL(hpsb_lock); | ||
| 1317 | EXPORT_SYMBOL(hpsb_packet_success); | 1318 | EXPORT_SYMBOL(hpsb_packet_success); |
| 1318 | 1319 | ||
| 1319 | /** highlevel.c **/ | 1320 | /** highlevel.c **/ |
diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c index 10c3d9f8c038..675b3135d5f1 100644 --- a/drivers/ieee1394/ieee1394_transactions.c +++ b/drivers/ieee1394/ieee1394_transactions.c | |||
| @@ -501,8 +501,6 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation, | |||
| 501 | if (length == 0) | 501 | if (length == 0) |
| 502 | return -EINVAL; | 502 | return -EINVAL; |
| 503 | 503 | ||
| 504 | BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet | ||
| 505 | |||
| 506 | packet = hpsb_make_readpacket(host, node, addr, length); | 504 | packet = hpsb_make_readpacket(host, node, addr, length); |
| 507 | 505 | ||
| 508 | if (!packet) { | 506 | if (!packet) { |
| @@ -550,8 +548,6 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, | |||
| 550 | if (length == 0) | 548 | if (length == 0) |
| 551 | return -EINVAL; | 549 | return -EINVAL; |
| 552 | 550 | ||
| 553 | BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet | ||
| 554 | |||
| 555 | packet = hpsb_make_writepacket(host, node, addr, buffer, length); | 551 | packet = hpsb_make_writepacket(host, node, addr, buffer, length); |
| 556 | 552 | ||
| 557 | if (!packet) | 553 | if (!packet) |
| @@ -570,3 +566,30 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, | |||
| 570 | 566 | ||
| 571 | return retval; | 567 | return retval; |
| 572 | } | 568 | } |
| 569 | |||
| 570 | int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation, | ||
| 571 | u64 addr, int extcode, quadlet_t *data, quadlet_t arg) | ||
| 572 | { | ||
| 573 | struct hpsb_packet *packet; | ||
| 574 | int retval = 0; | ||
| 575 | |||
| 576 | packet = hpsb_make_lockpacket(host, node, addr, extcode, data, arg); | ||
| 577 | if (!packet) | ||
| 578 | return -ENOMEM; | ||
| 579 | |||
| 580 | packet->generation = generation; | ||
| 581 | retval = hpsb_send_packet_and_wait(packet); | ||
| 582 | if (retval < 0) | ||
| 583 | goto hpsb_lock_fail; | ||
| 584 | |||
| 585 | retval = hpsb_packet_success(packet); | ||
| 586 | |||
| 587 | if (retval == 0) | ||
| 588 | *data = packet->data[0]; | ||
| 589 | |||
| 590 | hpsb_lock_fail: | ||
| 591 | hpsb_free_tlabel(packet); | ||
| 592 | hpsb_free_packet(packet); | ||
| 593 | |||
| 594 | return retval; | ||
| 595 | } | ||
diff --git a/drivers/ieee1394/ieee1394_transactions.h b/drivers/ieee1394/ieee1394_transactions.h index d2d5bc3546d7..20b693be14b2 100644 --- a/drivers/ieee1394/ieee1394_transactions.h +++ b/drivers/ieee1394/ieee1394_transactions.h | |||
| @@ -30,6 +30,8 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation, | |||
| 30 | u64 addr, quadlet_t *buffer, size_t length); | 30 | u64 addr, quadlet_t *buffer, size_t length); |
| 31 | int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, | 31 | int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation, |
| 32 | u64 addr, quadlet_t *buffer, size_t length); | 32 | u64 addr, quadlet_t *buffer, size_t length); |
| 33 | int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation, | ||
| 34 | u64 addr, int extcode, quadlet_t *data, quadlet_t arg); | ||
| 33 | 35 | ||
| 34 | #ifdef HPSB_DEBUG_TLABELS | 36 | #ifdef HPSB_DEBUG_TLABELS |
| 35 | extern spinlock_t hpsb_tlabel_lock; | 37 | extern spinlock_t hpsb_tlabel_lock; |
diff --git a/drivers/ieee1394/iso.h b/drivers/ieee1394/iso.h index b5de5f21ef78..c2089c093aa7 100644 --- a/drivers/ieee1394/iso.h +++ b/drivers/ieee1394/iso.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define IEEE1394_ISO_H | 13 | #define IEEE1394_ISO_H |
| 14 | 14 | ||
| 15 | #include <linux/spinlock_types.h> | 15 | #include <linux/spinlock_types.h> |
| 16 | #include <linux/wait.h> | ||
| 16 | #include <asm/atomic.h> | 17 | #include <asm/atomic.h> |
| 17 | #include <asm/types.h> | 18 | #include <asm/types.h> |
| 18 | 19 | ||
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 906c5a98d814..53aada5bbe1e 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -971,6 +971,9 @@ static struct unit_directory *nodemgr_process_unit_directory | |||
| 971 | ud->ud_kv = ud_kv; | 971 | ud->ud_kv = ud_kv; |
| 972 | ud->id = (*id)++; | 972 | ud->id = (*id)++; |
| 973 | 973 | ||
| 974 | /* inherit vendor_id from root directory if none exists in unit dir */ | ||
| 975 | ud->vendor_id = ne->vendor_id; | ||
| 976 | |||
| 974 | csr1212_for_each_dir_entry(ne->csr, kv, ud_kv, dentry) { | 977 | csr1212_for_each_dir_entry(ne->csr, kv, ud_kv, dentry) { |
| 975 | switch (kv->key.id) { | 978 | switch (kv->key.id) { |
| 976 | case CSR1212_KV_ID_VENDOR: | 979 | case CSR1212_KV_ID_VENDOR: |
| @@ -1265,7 +1268,8 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr, | |||
| 1265 | csr1212_destroy_csr(csr); | 1268 | csr1212_destroy_csr(csr); |
| 1266 | } | 1269 | } |
| 1267 | 1270 | ||
| 1268 | /* Mark the node current */ | 1271 | /* Finally, mark the node current */ |
| 1272 | smp_wmb(); | ||
| 1269 | ne->generation = generation; | 1273 | ne->generation = generation; |
| 1270 | 1274 | ||
| 1271 | if (ne->in_limbo) { | 1275 | if (ne->in_limbo) { |
| @@ -1798,7 +1802,7 @@ void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet) | |||
| 1798 | { | 1802 | { |
| 1799 | packet->host = ne->host; | 1803 | packet->host = ne->host; |
| 1800 | packet->generation = ne->generation; | 1804 | packet->generation = ne->generation; |
| 1801 | barrier(); | 1805 | smp_rmb(); |
| 1802 | packet->node_id = ne->nodeid; | 1806 | packet->node_id = ne->nodeid; |
| 1803 | } | 1807 | } |
| 1804 | 1808 | ||
| @@ -1807,7 +1811,7 @@ int hpsb_node_write(struct node_entry *ne, u64 addr, | |||
| 1807 | { | 1811 | { |
| 1808 | unsigned int generation = ne->generation; | 1812 | unsigned int generation = ne->generation; |
| 1809 | 1813 | ||
| 1810 | barrier(); | 1814 | smp_rmb(); |
| 1811 | return hpsb_write(ne->host, ne->nodeid, generation, | 1815 | return hpsb_write(ne->host, ne->nodeid, generation, |
| 1812 | addr, buffer, length); | 1816 | addr, buffer, length); |
| 1813 | } | 1817 | } |
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index 15ea09733e84..ee5acdbd114a 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h | |||
| @@ -21,9 +21,11 @@ | |||
| 21 | #define _IEEE1394_NODEMGR_H | 21 | #define _IEEE1394_NODEMGR_H |
| 22 | 22 | ||
| 23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 24 | #include <asm/system.h> | ||
| 24 | #include <asm/types.h> | 25 | #include <asm/types.h> |
| 25 | 26 | ||
| 26 | #include "ieee1394_core.h" | 27 | #include "ieee1394_core.h" |
| 28 | #include "ieee1394_transactions.h" | ||
| 27 | #include "ieee1394_types.h" | 29 | #include "ieee1394_types.h" |
| 28 | 30 | ||
| 29 | struct csr1212_csr; | 31 | struct csr1212_csr; |
| @@ -154,6 +156,22 @@ static inline int hpsb_node_entry_valid(struct node_entry *ne) | |||
| 154 | void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet); | 156 | void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet); |
| 155 | int hpsb_node_write(struct node_entry *ne, u64 addr, | 157 | int hpsb_node_write(struct node_entry *ne, u64 addr, |
| 156 | quadlet_t *buffer, size_t length); | 158 | quadlet_t *buffer, size_t length); |
| 159 | static inline int hpsb_node_read(struct node_entry *ne, u64 addr, | ||
| 160 | quadlet_t *buffer, size_t length) | ||
| 161 | { | ||
| 162 | unsigned int g = ne->generation; | ||
| 163 | |||
| 164 | smp_rmb(); | ||
| 165 | return hpsb_read(ne->host, ne->nodeid, g, addr, buffer, length); | ||
| 166 | } | ||
| 167 | static inline int hpsb_node_lock(struct node_entry *ne, u64 addr, int extcode, | ||
| 168 | quadlet_t *buffer, quadlet_t arg) | ||
| 169 | { | ||
| 170 | unsigned int g = ne->generation; | ||
| 171 | |||
| 172 | smp_rmb(); | ||
| 173 | return hpsb_lock(ne->host, ne->nodeid, g, addr, extcode, buffer, arg); | ||
| 174 | } | ||
| 157 | int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *)); | 175 | int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *)); |
| 158 | 176 | ||
| 159 | int init_ieee1394_nodemgr(void); | 177 | int init_ieee1394_nodemgr(void); |
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index 40ebde53b3ce..b0198691892a 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -51,6 +51,10 @@ comment "Supported SDMC DM1105 Adapters" | |||
| 51 | depends on DVB_CORE && PCI && I2C | 51 | depends on DVB_CORE && PCI && I2C |
| 52 | source "drivers/media/dvb/dm1105/Kconfig" | 52 | source "drivers/media/dvb/dm1105/Kconfig" |
| 53 | 53 | ||
| 54 | comment "Supported FireWire (IEEE 1394) Adapters" | ||
| 55 | depends on DVB_CORE && IEEE1394 | ||
| 56 | source "drivers/media/dvb/firewire/Kconfig" | ||
| 57 | |||
| 54 | comment "Supported DVB Frontends" | 58 | comment "Supported DVB Frontends" |
| 55 | depends on DVB_CORE | 59 | depends on DVB_CORE |
| 56 | source "drivers/media/dvb/frontends/Kconfig" | 60 | source "drivers/media/dvb/frontends/Kconfig" |
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index f91e9eb15e52..6092a5bb5a7d 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile | |||
| @@ -3,3 +3,5 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ | 5 | obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ |
| 6 | |||
| 7 | obj-$(CONFIG_DVB_FIREDTV) += firewire/ | ||
diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/dvb/firewire/Kconfig new file mode 100644 index 000000000000..69028253e984 --- /dev/null +++ b/drivers/media/dvb/firewire/Kconfig | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | config DVB_FIREDTV | ||
| 2 | tristate "FireDTV and FloppyDTV" | ||
| 3 | depends on DVB_CORE && IEEE1394 | ||
| 4 | help | ||
| 5 | Support for DVB receivers from Digital Everywhere | ||
| 6 | which are connected via IEEE 1394 (FireWire). | ||
| 7 | |||
| 8 | These devices don't have an MPEG decoder built in, | ||
| 9 | so you need an external software decoder to watch TV. | ||
| 10 | |||
| 11 | To compile this driver as a module, say M here: | ||
| 12 | the module will be called firedtv. | ||
| 13 | |||
| 14 | if DVB_FIREDTV | ||
| 15 | |||
| 16 | config DVB_FIREDTV_IEEE1394 | ||
| 17 | def_bool IEEE1394 | ||
| 18 | |||
| 19 | config DVB_FIREDTV_INPUT | ||
| 20 | def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m) | ||
| 21 | |||
| 22 | endif # DVB_FIREDTV | ||
diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/dvb/firewire/Makefile new file mode 100644 index 000000000000..2034695ba194 --- /dev/null +++ b/drivers/media/dvb/firewire/Makefile | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | obj-$(CONFIG_DVB_FIREDTV) += firedtv.o | ||
| 2 | |||
| 3 | firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o | ||
| 4 | firedtv-$(CONFIG_DVB_FIREDTV_IEEE1394) += firedtv-1394.o | ||
| 5 | firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o | ||
| 6 | |||
| 7 | ccflags-y += -Idrivers/media/dvb/dvb-core | ||
| 8 | ccflags-$(CONFIG_DVB_FIREDTV_IEEE1394) += -Idrivers/ieee1394 | ||
diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c new file mode 100644 index 000000000000..4e207658c5d9 --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-1394.c | |||
| @@ -0,0 +1,285 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2007-2008 Ben Backx <ben@bbackx.com> | ||
| 6 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License as | ||
| 10 | * published by the Free Software Foundation; either version 2 of | ||
| 11 | * the License, or (at your option) any later version. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/device.h> | ||
| 15 | #include <linux/errno.h> | ||
| 16 | #include <linux/kernel.h> | ||
| 17 | #include <linux/list.h> | ||
| 18 | #include <linux/spinlock.h> | ||
| 19 | #include <linux/types.h> | ||
| 20 | |||
| 21 | #include <dma.h> | ||
| 22 | #include <csr1212.h> | ||
| 23 | #include <highlevel.h> | ||
| 24 | #include <hosts.h> | ||
| 25 | #include <ieee1394.h> | ||
| 26 | #include <iso.h> | ||
| 27 | #include <nodemgr.h> | ||
| 28 | |||
| 29 | #include "firedtv.h" | ||
| 30 | |||
| 31 | static LIST_HEAD(node_list); | ||
| 32 | static DEFINE_SPINLOCK(node_list_lock); | ||
| 33 | |||
| 34 | #define FIREWIRE_HEADER_SIZE 4 | ||
| 35 | #define CIP_HEADER_SIZE 8 | ||
| 36 | |||
| 37 | static void rawiso_activity_cb(struct hpsb_iso *iso) | ||
| 38 | { | ||
| 39 | struct firedtv *f, *fdtv = NULL; | ||
| 40 | unsigned int i, num, packet; | ||
| 41 | unsigned char *buf; | ||
| 42 | unsigned long flags; | ||
| 43 | int count; | ||
| 44 | |||
| 45 | spin_lock_irqsave(&node_list_lock, flags); | ||
| 46 | list_for_each_entry(f, &node_list, list) | ||
| 47 | if (f->backend_data == iso) { | ||
| 48 | fdtv = f; | ||
| 49 | break; | ||
| 50 | } | ||
| 51 | spin_unlock_irqrestore(&node_list_lock, flags); | ||
| 52 | |||
| 53 | packet = iso->first_packet; | ||
| 54 | num = hpsb_iso_n_ready(iso); | ||
| 55 | |||
| 56 | if (!fdtv) { | ||
| 57 | dev_err(fdtv->device, "received at unknown iso channel\n"); | ||
| 58 | goto out; | ||
| 59 | } | ||
| 60 | |||
| 61 | for (i = 0; i < num; i++, packet = (packet + 1) % iso->buf_packets) { | ||
| 62 | buf = dma_region_i(&iso->data_buf, unsigned char, | ||
| 63 | iso->infos[packet].offset + CIP_HEADER_SIZE); | ||
| 64 | count = (iso->infos[packet].len - CIP_HEADER_SIZE) / | ||
| 65 | (188 + FIREWIRE_HEADER_SIZE); | ||
| 66 | |||
| 67 | /* ignore empty packet */ | ||
| 68 | if (iso->infos[packet].len <= CIP_HEADER_SIZE) | ||
| 69 | continue; | ||
| 70 | |||
| 71 | while (count--) { | ||
| 72 | if (buf[FIREWIRE_HEADER_SIZE] == 0x47) | ||
| 73 | dvb_dmx_swfilter_packets(&fdtv->demux, | ||
| 74 | &buf[FIREWIRE_HEADER_SIZE], 1); | ||
| 75 | else | ||
| 76 | dev_err(fdtv->device, | ||
| 77 | "skipping invalid packet\n"); | ||
| 78 | buf += 188 + FIREWIRE_HEADER_SIZE; | ||
| 79 | } | ||
| 80 | } | ||
| 81 | out: | ||
| 82 | hpsb_iso_recv_release_packets(iso, num); | ||
| 83 | } | ||
| 84 | |||
| 85 | static inline struct node_entry *node_of(struct firedtv *fdtv) | ||
| 86 | { | ||
| 87 | return container_of(fdtv->device, struct unit_directory, device)->ne; | ||
| 88 | } | ||
| 89 | |||
| 90 | static int node_lock(struct firedtv *fdtv, u64 addr, void *data, __be32 arg) | ||
| 91 | { | ||
| 92 | return hpsb_node_lock(node_of(fdtv), addr, EXTCODE_COMPARE_SWAP, data, | ||
| 93 | (__force quadlet_t)arg); | ||
| 94 | } | ||
| 95 | |||
| 96 | static int node_read(struct firedtv *fdtv, u64 addr, void *data, size_t len) | ||
| 97 | { | ||
| 98 | return hpsb_node_read(node_of(fdtv), addr, data, len); | ||
| 99 | } | ||
| 100 | |||
| 101 | static int node_write(struct firedtv *fdtv, u64 addr, void *data, size_t len) | ||
| 102 | { | ||
| 103 | return hpsb_node_write(node_of(fdtv), addr, data, len); | ||
| 104 | } | ||
| 105 | |||
| 106 | #define FDTV_ISO_BUFFER_PACKETS 256 | ||
| 107 | #define FDTV_ISO_BUFFER_SIZE (FDTV_ISO_BUFFER_PACKETS * 200) | ||
| 108 | |||
| 109 | static int start_iso(struct firedtv *fdtv) | ||
| 110 | { | ||
| 111 | struct hpsb_iso *iso_handle; | ||
| 112 | int ret; | ||
| 113 | |||
| 114 | iso_handle = hpsb_iso_recv_init(node_of(fdtv)->host, | ||
| 115 | FDTV_ISO_BUFFER_SIZE, FDTV_ISO_BUFFER_PACKETS, | ||
| 116 | fdtv->isochannel, HPSB_ISO_DMA_DEFAULT, | ||
| 117 | -1, /* stat.config.irq_interval */ | ||
| 118 | rawiso_activity_cb); | ||
| 119 | if (iso_handle == NULL) { | ||
| 120 | dev_err(fdtv->device, "cannot initialize iso receive\n"); | ||
| 121 | return -ENOMEM; | ||
| 122 | } | ||
| 123 | fdtv->backend_data = iso_handle; | ||
| 124 | |||
| 125 | ret = hpsb_iso_recv_start(iso_handle, -1, -1, 0); | ||
| 126 | if (ret != 0) { | ||
| 127 | dev_err(fdtv->device, "cannot start iso receive\n"); | ||
| 128 | hpsb_iso_shutdown(iso_handle); | ||
| 129 | fdtv->backend_data = NULL; | ||
| 130 | } | ||
| 131 | return ret; | ||
| 132 | } | ||
| 133 | |||
| 134 | static void stop_iso(struct firedtv *fdtv) | ||
| 135 | { | ||
| 136 | struct hpsb_iso *iso_handle = fdtv->backend_data; | ||
| 137 | |||
| 138 | if (iso_handle != NULL) { | ||
| 139 | hpsb_iso_stop(iso_handle); | ||
| 140 | hpsb_iso_shutdown(iso_handle); | ||
| 141 | } | ||
| 142 | fdtv->backend_data = NULL; | ||
| 143 | } | ||
| 144 | |||
| 145 | static const struct firedtv_backend fdtv_1394_backend = { | ||
| 146 | .lock = node_lock, | ||
| 147 | .read = node_read, | ||
| 148 | .write = node_write, | ||
| 149 | .start_iso = start_iso, | ||
| 150 | .stop_iso = stop_iso, | ||
| 151 | }; | ||
| 152 | |||
| 153 | static void fcp_request(struct hpsb_host *host, int nodeid, int direction, | ||
| 154 | int cts, u8 *data, size_t length) | ||
| 155 | { | ||
| 156 | struct firedtv *f, *fdtv = NULL; | ||
| 157 | unsigned long flags; | ||
| 158 | int su; | ||
| 159 | |||
| 160 | if (length == 0 || (data[0] & 0xf0) != 0) | ||
| 161 | return; | ||
| 162 | |||
| 163 | su = data[1] & 0x7; | ||
| 164 | |||
| 165 | spin_lock_irqsave(&node_list_lock, flags); | ||
| 166 | list_for_each_entry(f, &node_list, list) | ||
| 167 | if (node_of(f)->host == host && | ||
| 168 | node_of(f)->nodeid == nodeid && | ||
| 169 | (f->subunit == su || (f->subunit == 0 && su == 0x7))) { | ||
| 170 | fdtv = f; | ||
| 171 | break; | ||
| 172 | } | ||
| 173 | spin_unlock_irqrestore(&node_list_lock, flags); | ||
| 174 | |||
| 175 | if (fdtv) | ||
| 176 | avc_recv(fdtv, data, length); | ||
| 177 | } | ||
| 178 | |||
| 179 | static int node_probe(struct device *dev) | ||
| 180 | { | ||
| 181 | struct unit_directory *ud = | ||
| 182 | container_of(dev, struct unit_directory, device); | ||
| 183 | struct firedtv *fdtv; | ||
| 184 | int kv_len, err; | ||
| 185 | void *kv_str; | ||
| 186 | |||
| 187 | kv_len = (ud->model_name_kv->value.leaf.len - 2) * sizeof(quadlet_t); | ||
| 188 | kv_str = CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(ud->model_name_kv); | ||
| 189 | |||
| 190 | fdtv = fdtv_alloc(dev, &fdtv_1394_backend, kv_str, kv_len); | ||
| 191 | if (!fdtv) | ||
| 192 | return -ENOMEM; | ||
| 193 | |||
| 194 | /* | ||
| 195 | * Work around a bug in udev's path_id script: Use the fw-host's dev | ||
| 196 | * instead of the unit directory's dev as parent of the input device. | ||
| 197 | */ | ||
| 198 | err = fdtv_register_rc(fdtv, dev->parent->parent); | ||
| 199 | if (err) | ||
| 200 | goto fail_free; | ||
| 201 | |||
| 202 | spin_lock_irq(&node_list_lock); | ||
| 203 | list_add_tail(&fdtv->list, &node_list); | ||
| 204 | spin_unlock_irq(&node_list_lock); | ||
| 205 | |||
| 206 | err = avc_identify_subunit(fdtv); | ||
| 207 | if (err) | ||
| 208 | goto fail; | ||
| 209 | |||
| 210 | err = fdtv_dvb_register(fdtv); | ||
| 211 | if (err) | ||
| 212 | goto fail; | ||
| 213 | |||
| 214 | avc_register_remote_control(fdtv); | ||
| 215 | return 0; | ||
| 216 | fail: | ||
| 217 | spin_lock_irq(&node_list_lock); | ||
| 218 | list_del(&fdtv->list); | ||
| 219 | spin_unlock_irq(&node_list_lock); | ||
| 220 | fdtv_unregister_rc(fdtv); | ||
| 221 | fail_free: | ||
| 222 | kfree(fdtv); | ||
| 223 | return err; | ||
| 224 | } | ||
| 225 | |||
| 226 | static int node_remove(struct device *dev) | ||
| 227 | { | ||
| 228 | struct firedtv *fdtv = dev->driver_data; | ||
| 229 | |||
| 230 | fdtv_dvb_unregister(fdtv); | ||
| 231 | |||
| 232 | spin_lock_irq(&node_list_lock); | ||
| 233 | list_del(&fdtv->list); | ||
| 234 | spin_unlock_irq(&node_list_lock); | ||
| 235 | |||
| 236 | cancel_work_sync(&fdtv->remote_ctrl_work); | ||
| 237 | fdtv_unregister_rc(fdtv); | ||
| 238 | |||
| 239 | kfree(fdtv); | ||
| 240 | return 0; | ||
| 241 | } | ||
| 242 | |||
| 243 | static int node_update(struct unit_directory *ud) | ||
| 244 | { | ||
| 245 | struct firedtv *fdtv = ud->device.driver_data; | ||
| 246 | |||
| 247 | if (fdtv->isochannel >= 0) | ||
| 248 | cmp_establish_pp_connection(fdtv, fdtv->subunit, | ||
| 249 | fdtv->isochannel); | ||
| 250 | return 0; | ||
| 251 | } | ||
| 252 | |||
| 253 | static struct hpsb_protocol_driver fdtv_driver = { | ||
| 254 | .name = "firedtv", | ||
| 255 | .update = node_update, | ||
| 256 | .driver = { | ||
| 257 | .probe = node_probe, | ||
| 258 | .remove = node_remove, | ||
| 259 | }, | ||
| 260 | }; | ||
| 261 | |||
| 262 | static struct hpsb_highlevel fdtv_highlevel = { | ||
| 263 | .name = "firedtv", | ||
| 264 | .fcp_request = fcp_request, | ||
| 265 | }; | ||
| 266 | |||
| 267 | int __init fdtv_1394_init(struct ieee1394_device_id id_table[]) | ||
| 268 | { | ||
| 269 | int ret; | ||
| 270 | |||
| 271 | hpsb_register_highlevel(&fdtv_highlevel); | ||
| 272 | fdtv_driver.id_table = id_table; | ||
| 273 | ret = hpsb_register_protocol(&fdtv_driver); | ||
| 274 | if (ret) { | ||
| 275 | printk(KERN_ERR "firedtv: failed to register protocol\n"); | ||
| 276 | hpsb_unregister_highlevel(&fdtv_highlevel); | ||
| 277 | } | ||
| 278 | return ret; | ||
| 279 | } | ||
| 280 | |||
| 281 | void __exit fdtv_1394_exit(void) | ||
| 282 | { | ||
| 283 | hpsb_unregister_protocol(&fdtv_driver); | ||
| 284 | hpsb_unregister_highlevel(&fdtv_highlevel); | ||
| 285 | } | ||
diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c new file mode 100644 index 000000000000..b55d9ccaf33e --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-avc.c | |||
| @@ -0,0 +1,1315 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2008 Ben Backx <ben@bbackx.com> | ||
| 6 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License as | ||
| 10 | * published by the Free Software Foundation; either version 2 of | ||
| 11 | * the License, or (at your option) any later version. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/bug.h> | ||
| 15 | #include <linux/crc32.h> | ||
| 16 | #include <linux/delay.h> | ||
| 17 | #include <linux/device.h> | ||
| 18 | #include <linux/jiffies.h> | ||
| 19 | #include <linux/kernel.h> | ||
| 20 | #include <linux/moduleparam.h> | ||
| 21 | #include <linux/mutex.h> | ||
| 22 | #include <linux/string.h> | ||
| 23 | #include <linux/stringify.h> | ||
| 24 | #include <linux/wait.h> | ||
| 25 | #include <linux/workqueue.h> | ||
| 26 | |||
| 27 | #include "firedtv.h" | ||
| 28 | |||
| 29 | #define FCP_COMMAND_REGISTER 0xfffff0000b00ULL | ||
| 30 | |||
| 31 | #define AVC_CTYPE_CONTROL 0x0 | ||
| 32 | #define AVC_CTYPE_STATUS 0x1 | ||
| 33 | #define AVC_CTYPE_NOTIFY 0x3 | ||
| 34 | |||
| 35 | #define AVC_RESPONSE_ACCEPTED 0x9 | ||
| 36 | #define AVC_RESPONSE_STABLE 0xc | ||
| 37 | #define AVC_RESPONSE_CHANGED 0xd | ||
| 38 | #define AVC_RESPONSE_INTERIM 0xf | ||
| 39 | |||
| 40 | #define AVC_SUBUNIT_TYPE_TUNER (0x05 << 3) | ||
| 41 | #define AVC_SUBUNIT_TYPE_UNIT (0x1f << 3) | ||
| 42 | |||
| 43 | #define AVC_OPCODE_VENDOR 0x00 | ||
| 44 | #define AVC_OPCODE_READ_DESCRIPTOR 0x09 | ||
| 45 | #define AVC_OPCODE_DSIT 0xc8 | ||
| 46 | #define AVC_OPCODE_DSD 0xcb | ||
| 47 | |||
| 48 | #define DESCRIPTOR_TUNER_STATUS 0x80 | ||
| 49 | #define DESCRIPTOR_SUBUNIT_IDENTIFIER 0x00 | ||
| 50 | |||
| 51 | #define SFE_VENDOR_DE_COMPANYID_0 0x00 /* OUI of Digital Everywhere */ | ||
| 52 | #define SFE_VENDOR_DE_COMPANYID_1 0x12 | ||
| 53 | #define SFE_VENDOR_DE_COMPANYID_2 0x87 | ||
| 54 | |||
| 55 | #define SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL 0x0a | ||
| 56 | #define SFE_VENDOR_OPCODE_LNB_CONTROL 0x52 | ||
| 57 | #define SFE_VENDOR_OPCODE_TUNE_QPSK 0x58 /* for DVB-S */ | ||
| 58 | |||
| 59 | #define SFE_VENDOR_OPCODE_GET_FIRMWARE_VERSION 0x00 | ||
| 60 | #define SFE_VENDOR_OPCODE_HOST2CA 0x56 | ||
| 61 | #define SFE_VENDOR_OPCODE_CA2HOST 0x57 | ||
| 62 | #define SFE_VENDOR_OPCODE_CISTATUS 0x59 | ||
| 63 | #define SFE_VENDOR_OPCODE_TUNE_QPSK2 0x60 /* for DVB-S2 */ | ||
| 64 | |||
| 65 | #define SFE_VENDOR_TAG_CA_RESET 0x00 | ||
| 66 | #define SFE_VENDOR_TAG_CA_APPLICATION_INFO 0x01 | ||
| 67 | #define SFE_VENDOR_TAG_CA_PMT 0x02 | ||
| 68 | #define SFE_VENDOR_TAG_CA_DATE_TIME 0x04 | ||
| 69 | #define SFE_VENDOR_TAG_CA_MMI 0x05 | ||
| 70 | #define SFE_VENDOR_TAG_CA_ENTER_MENU 0x07 | ||
| 71 | |||
| 72 | #define EN50221_LIST_MANAGEMENT_ONLY 0x03 | ||
| 73 | #define EN50221_TAG_APP_INFO 0x9f8021 | ||
| 74 | #define EN50221_TAG_CA_INFO 0x9f8031 | ||
| 75 | |||
| 76 | struct avc_command_frame { | ||
| 77 | int length; | ||
| 78 | u8 ctype; | ||
| 79 | u8 subunit; | ||
| 80 | u8 opcode; | ||
| 81 | u8 operand[509]; | ||
| 82 | }; | ||
| 83 | |||
| 84 | struct avc_response_frame { | ||
| 85 | int length; | ||
| 86 | u8 response; | ||
| 87 | u8 subunit; | ||
| 88 | u8 opcode; | ||
| 89 | u8 operand[509]; | ||
| 90 | }; | ||
| 91 | |||
| 92 | #define AVC_DEBUG_FCP_SUBACTIONS 1 | ||
| 93 | #define AVC_DEBUG_FCP_PAYLOADS 2 | ||
| 94 | |||
| 95 | static int avc_debug; | ||
| 96 | module_param_named(debug, avc_debug, int, 0644); | ||
| 97 | MODULE_PARM_DESC(debug, "Verbose logging (default = 0" | ||
| 98 | ", FCP subactions = " __stringify(AVC_DEBUG_FCP_SUBACTIONS) | ||
| 99 | ", FCP payloads = " __stringify(AVC_DEBUG_FCP_PAYLOADS) | ||
| 100 | ", or all = -1)"); | ||
| 101 | |||
| 102 | static const char *debug_fcp_ctype(unsigned int ctype) | ||
| 103 | { | ||
| 104 | static const char *ctypes[] = { | ||
| 105 | [0x0] = "CONTROL", [0x1] = "STATUS", | ||
| 106 | [0x2] = "SPECIFIC INQUIRY", [0x3] = "NOTIFY", | ||
| 107 | [0x4] = "GENERAL INQUIRY", [0x8] = "NOT IMPLEMENTED", | ||
| 108 | [0x9] = "ACCEPTED", [0xa] = "REJECTED", | ||
| 109 | [0xb] = "IN TRANSITION", [0xc] = "IMPLEMENTED/STABLE", | ||
| 110 | [0xd] = "CHANGED", [0xf] = "INTERIM", | ||
| 111 | }; | ||
| 112 | const char *ret = ctype < ARRAY_SIZE(ctypes) ? ctypes[ctype] : NULL; | ||
| 113 | |||
| 114 | return ret ? ret : "?"; | ||
| 115 | } | ||
| 116 | |||
| 117 | static const char *debug_fcp_opcode(unsigned int opcode, | ||
| 118 | const u8 *data, size_t length) | ||
| 119 | { | ||
| 120 | switch (opcode) { | ||
| 121 | case AVC_OPCODE_VENDOR: break; | ||
| 122 | case AVC_OPCODE_READ_DESCRIPTOR: return "ReadDescriptor"; | ||
| 123 | case AVC_OPCODE_DSIT: return "DirectSelectInfo.Type"; | ||
| 124 | case AVC_OPCODE_DSD: return "DirectSelectData"; | ||
| 125 | default: return "?"; | ||
| 126 | } | ||
| 127 | |||
| 128 | if (length < 7 || | ||
| 129 | data[3] != SFE_VENDOR_DE_COMPANYID_0 || | ||
| 130 | data[4] != SFE_VENDOR_DE_COMPANYID_1 || | ||
| 131 | data[5] != SFE_VENDOR_DE_COMPANYID_2) | ||
| 132 | return "Vendor"; | ||
| 133 | |||
| 134 | switch (data[6]) { | ||
| 135 | case SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL: return "RegisterRC"; | ||
| 136 | case SFE_VENDOR_OPCODE_LNB_CONTROL: return "LNBControl"; | ||
| 137 | case SFE_VENDOR_OPCODE_TUNE_QPSK: return "TuneQPSK"; | ||
| 138 | case SFE_VENDOR_OPCODE_HOST2CA: return "Host2CA"; | ||
| 139 | case SFE_VENDOR_OPCODE_CA2HOST: return "CA2Host"; | ||
| 140 | } | ||
| 141 | return "Vendor"; | ||
| 142 | } | ||
| 143 | |||
| 144 | static void debug_fcp(const u8 *data, size_t length) | ||
| 145 | { | ||
| 146 | unsigned int subunit_type, subunit_id, op; | ||
| 147 | const char *prefix = data[0] > 7 ? "FCP <- " : "FCP -> "; | ||
| 148 | |||
| 149 | if (avc_debug & AVC_DEBUG_FCP_SUBACTIONS) { | ||
| 150 | subunit_type = data[1] >> 3; | ||
| 151 | subunit_id = data[1] & 7; | ||
| 152 | op = subunit_type == 0x1e || subunit_id == 5 ? ~0 : data[2]; | ||
| 153 | printk(KERN_INFO "%ssu=%x.%x l=%d: %-8s - %s\n", | ||
| 154 | prefix, subunit_type, subunit_id, length, | ||
| 155 | debug_fcp_ctype(data[0]), | ||
| 156 | debug_fcp_opcode(op, data, length)); | ||
| 157 | } | ||
| 158 | |||
| 159 | if (avc_debug & AVC_DEBUG_FCP_PAYLOADS) | ||
| 160 | print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, 16, 1, | ||
| 161 | data, length, false); | ||
| 162 | } | ||
| 163 | |||
| 164 | static int __avc_write(struct firedtv *fdtv, | ||
| 165 | const struct avc_command_frame *c, struct avc_response_frame *r) | ||
| 166 | { | ||
| 167 | int err, retry; | ||
| 168 | |||
| 169 | if (r) | ||
| 170 | fdtv->avc_reply_received = false; | ||
| 171 | |||
| 172 | for (retry = 0; retry < 6; retry++) { | ||
| 173 | if (unlikely(avc_debug)) | ||
| 174 | debug_fcp(&c->ctype, c->length); | ||
| 175 | |||
| 176 | err = fdtv->backend->write(fdtv, FCP_COMMAND_REGISTER, | ||
| 177 | (void *)&c->ctype, c->length); | ||
| 178 | if (err) { | ||
| 179 | fdtv->avc_reply_received = true; | ||
| 180 | dev_err(fdtv->device, "FCP command write failed\n"); | ||
| 181 | return err; | ||
| 182 | } | ||
| 183 | |||
| 184 | if (!r) | ||
| 185 | return 0; | ||
| 186 | |||
| 187 | /* | ||
| 188 | * AV/C specs say that answers should be sent within 150 ms. | ||
| 189 | * Time out after 200 ms. | ||
| 190 | */ | ||
| 191 | if (wait_event_timeout(fdtv->avc_wait, | ||
| 192 | fdtv->avc_reply_received, | ||
| 193 | msecs_to_jiffies(200)) != 0) { | ||
| 194 | r->length = fdtv->response_length; | ||
| 195 | memcpy(&r->response, fdtv->response, r->length); | ||
| 196 | |||
| 197 | return 0; | ||
| 198 | } | ||
| 199 | } | ||
| 200 | dev_err(fdtv->device, "FCP response timed out\n"); | ||
| 201 | return -ETIMEDOUT; | ||
| 202 | } | ||
| 203 | |||
| 204 | static int avc_write(struct firedtv *fdtv, | ||
| 205 | const struct avc_command_frame *c, struct avc_response_frame *r) | ||
| 206 | { | ||
| 207 | int ret; | ||
| 208 | |||
| 209 | if (mutex_lock_interruptible(&fdtv->avc_mutex)) | ||
| 210 | return -EINTR; | ||
| 211 | |||
| 212 | ret = __avc_write(fdtv, c, r); | ||
| 213 | |||
| 214 | mutex_unlock(&fdtv->avc_mutex); | ||
| 215 | return ret; | ||
| 216 | } | ||
| 217 | |||
| 218 | int avc_recv(struct firedtv *fdtv, void *data, size_t length) | ||
| 219 | { | ||
| 220 | struct avc_response_frame *r = | ||
| 221 | data - offsetof(struct avc_response_frame, response); | ||
| 222 | |||
| 223 | if (unlikely(avc_debug)) | ||
| 224 | debug_fcp(data, length); | ||
| 225 | |||
| 226 | if (length >= 8 && | ||
| 227 | r->operand[0] == SFE_VENDOR_DE_COMPANYID_0 && | ||
| 228 | r->operand[1] == SFE_VENDOR_DE_COMPANYID_1 && | ||
| 229 | r->operand[2] == SFE_VENDOR_DE_COMPANYID_2 && | ||
| 230 | r->operand[3] == SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL) { | ||
| 231 | if (r->response == AVC_RESPONSE_CHANGED) { | ||
| 232 | fdtv_handle_rc(fdtv, | ||
| 233 | r->operand[4] << 8 | r->operand[5]); | ||
| 234 | schedule_work(&fdtv->remote_ctrl_work); | ||
| 235 | } else if (r->response != AVC_RESPONSE_INTERIM) { | ||
| 236 | dev_info(fdtv->device, | ||
| 237 | "remote control result = %d\n", r->response); | ||
| 238 | } | ||
| 239 | return 0; | ||
| 240 | } | ||
| 241 | |||
| 242 | if (fdtv->avc_reply_received) { | ||
| 243 | dev_err(fdtv->device, "out-of-order AVC response, ignored\n"); | ||
| 244 | return -EIO; | ||
| 245 | } | ||
| 246 | |||
| 247 | memcpy(fdtv->response, data, length); | ||
| 248 | fdtv->response_length = length; | ||
| 249 | |||
| 250 | fdtv->avc_reply_received = true; | ||
| 251 | wake_up(&fdtv->avc_wait); | ||
| 252 | |||
| 253 | return 0; | ||
| 254 | } | ||
| 255 | |||
| 256 | /* | ||
| 257 | * tuning command for setting the relative LNB frequency | ||
| 258 | * (not supported by the AVC standard) | ||
| 259 | */ | ||
| 260 | static void avc_tuner_tuneqpsk(struct firedtv *fdtv, | ||
| 261 | struct dvb_frontend_parameters *params, | ||
| 262 | struct avc_command_frame *c) | ||
| 263 | { | ||
| 264 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 265 | |||
| 266 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 267 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 268 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 269 | c->operand[3] = SFE_VENDOR_OPCODE_TUNE_QPSK; | ||
| 270 | |||
| 271 | c->operand[4] = (params->frequency >> 24) & 0xff; | ||
| 272 | c->operand[5] = (params->frequency >> 16) & 0xff; | ||
| 273 | c->operand[6] = (params->frequency >> 8) & 0xff; | ||
| 274 | c->operand[7] = params->frequency & 0xff; | ||
| 275 | |||
| 276 | c->operand[8] = ((params->u.qpsk.symbol_rate / 1000) >> 8) & 0xff; | ||
| 277 | c->operand[9] = (params->u.qpsk.symbol_rate / 1000) & 0xff; | ||
| 278 | |||
| 279 | switch (params->u.qpsk.fec_inner) { | ||
| 280 | case FEC_1_2: c->operand[10] = 0x1; break; | ||
| 281 | case FEC_2_3: c->operand[10] = 0x2; break; | ||
| 282 | case FEC_3_4: c->operand[10] = 0x3; break; | ||
| 283 | case FEC_5_6: c->operand[10] = 0x4; break; | ||
| 284 | case FEC_7_8: c->operand[10] = 0x5; break; | ||
| 285 | case FEC_4_5: | ||
| 286 | case FEC_8_9: | ||
| 287 | case FEC_AUTO: | ||
| 288 | default: c->operand[10] = 0x0; | ||
| 289 | } | ||
| 290 | |||
| 291 | if (fdtv->voltage == 0xff) | ||
| 292 | c->operand[11] = 0xff; | ||
| 293 | else if (fdtv->voltage == SEC_VOLTAGE_18) /* polarisation */ | ||
| 294 | c->operand[11] = 0; | ||
| 295 | else | ||
| 296 | c->operand[11] = 1; | ||
| 297 | |||
| 298 | if (fdtv->tone == 0xff) | ||
| 299 | c->operand[12] = 0xff; | ||
| 300 | else if (fdtv->tone == SEC_TONE_ON) /* band */ | ||
| 301 | c->operand[12] = 1; | ||
| 302 | else | ||
| 303 | c->operand[12] = 0; | ||
| 304 | |||
| 305 | if (fdtv->type == FIREDTV_DVB_S2) { | ||
| 306 | c->operand[13] = 0x1; | ||
| 307 | c->operand[14] = 0xff; | ||
| 308 | c->operand[15] = 0xff; | ||
| 309 | c->length = 20; | ||
| 310 | } else { | ||
| 311 | c->length = 16; | ||
| 312 | } | ||
| 313 | } | ||
| 314 | |||
| 315 | static void avc_tuner_dsd_dvb_c(struct dvb_frontend_parameters *params, | ||
| 316 | struct avc_command_frame *c) | ||
| 317 | { | ||
| 318 | c->opcode = AVC_OPCODE_DSD; | ||
| 319 | |||
| 320 | c->operand[0] = 0; /* source plug */ | ||
| 321 | c->operand[1] = 0xd2; /* subfunction replace */ | ||
| 322 | c->operand[2] = 0x20; /* system id = DVB */ | ||
| 323 | c->operand[3] = 0x00; /* antenna number */ | ||
| 324 | c->operand[4] = 0x11; /* system_specific_multiplex selection_length */ | ||
| 325 | |||
| 326 | /* multiplex_valid_flags, high byte */ | ||
| 327 | c->operand[5] = 0 << 7 /* reserved */ | ||
| 328 | | 0 << 6 /* Polarisation */ | ||
| 329 | | 0 << 5 /* Orbital_Pos */ | ||
| 330 | | 1 << 4 /* Frequency */ | ||
| 331 | | 1 << 3 /* Symbol_Rate */ | ||
| 332 | | 0 << 2 /* FEC_outer */ | ||
| 333 | | (params->u.qam.fec_inner != FEC_AUTO ? 1 << 1 : 0) | ||
| 334 | | (params->u.qam.modulation != QAM_AUTO ? 1 << 0 : 0); | ||
| 335 | |||
| 336 | /* multiplex_valid_flags, low byte */ | ||
| 337 | c->operand[6] = 0 << 7 /* NetworkID */ | ||
| 338 | | 0 << 0 /* reserved */ ; | ||
| 339 | |||
| 340 | c->operand[7] = 0x00; | ||
| 341 | c->operand[8] = 0x00; | ||
| 342 | c->operand[9] = 0x00; | ||
| 343 | c->operand[10] = 0x00; | ||
| 344 | |||
| 345 | c->operand[11] = (((params->frequency / 4000) >> 16) & 0xff) | (2 << 6); | ||
| 346 | c->operand[12] = ((params->frequency / 4000) >> 8) & 0xff; | ||
| 347 | c->operand[13] = (params->frequency / 4000) & 0xff; | ||
| 348 | c->operand[14] = ((params->u.qpsk.symbol_rate / 1000) >> 12) & 0xff; | ||
| 349 | c->operand[15] = ((params->u.qpsk.symbol_rate / 1000) >> 4) & 0xff; | ||
| 350 | c->operand[16] = ((params->u.qpsk.symbol_rate / 1000) << 4) & 0xf0; | ||
| 351 | c->operand[17] = 0x00; | ||
| 352 | |||
| 353 | switch (params->u.qpsk.fec_inner) { | ||
| 354 | case FEC_1_2: c->operand[18] = 0x1; break; | ||
| 355 | case FEC_2_3: c->operand[18] = 0x2; break; | ||
| 356 | case FEC_3_4: c->operand[18] = 0x3; break; | ||
| 357 | case FEC_5_6: c->operand[18] = 0x4; break; | ||
| 358 | case FEC_7_8: c->operand[18] = 0x5; break; | ||
| 359 | case FEC_8_9: c->operand[18] = 0x6; break; | ||
| 360 | case FEC_4_5: c->operand[18] = 0x8; break; | ||
| 361 | case FEC_AUTO: | ||
| 362 | default: c->operand[18] = 0x0; | ||
| 363 | } | ||
| 364 | |||
| 365 | switch (params->u.qam.modulation) { | ||
| 366 | case QAM_16: c->operand[19] = 0x08; break; | ||
| 367 | case QAM_32: c->operand[19] = 0x10; break; | ||
| 368 | case QAM_64: c->operand[19] = 0x18; break; | ||
| 369 | case QAM_128: c->operand[19] = 0x20; break; | ||
| 370 | case QAM_256: c->operand[19] = 0x28; break; | ||
| 371 | case QAM_AUTO: | ||
| 372 | default: c->operand[19] = 0x00; | ||
| 373 | } | ||
| 374 | |||
| 375 | c->operand[20] = 0x00; | ||
| 376 | c->operand[21] = 0x00; | ||
| 377 | /* Nr_of_dsd_sel_specs = 0 -> no PIDs are transmitted */ | ||
| 378 | c->operand[22] = 0x00; | ||
| 379 | |||
| 380 | c->length = 28; | ||
| 381 | } | ||
| 382 | |||
| 383 | static void avc_tuner_dsd_dvb_t(struct dvb_frontend_parameters *params, | ||
| 384 | struct avc_command_frame *c) | ||
| 385 | { | ||
| 386 | struct dvb_ofdm_parameters *ofdm = ¶ms->u.ofdm; | ||
| 387 | |||
| 388 | c->opcode = AVC_OPCODE_DSD; | ||
| 389 | |||
| 390 | c->operand[0] = 0; /* source plug */ | ||
| 391 | c->operand[1] = 0xd2; /* subfunction replace */ | ||
| 392 | c->operand[2] = 0x20; /* system id = DVB */ | ||
| 393 | c->operand[3] = 0x00; /* antenna number */ | ||
| 394 | c->operand[4] = 0x0c; /* system_specific_multiplex selection_length */ | ||
| 395 | |||
| 396 | /* multiplex_valid_flags, high byte */ | ||
| 397 | c->operand[5] = | ||
| 398 | 0 << 7 /* reserved */ | ||
| 399 | | 1 << 6 /* CenterFrequency */ | ||
| 400 | | (ofdm->bandwidth != BANDWIDTH_AUTO ? 1 << 5 : 0) | ||
| 401 | | (ofdm->constellation != QAM_AUTO ? 1 << 4 : 0) | ||
| 402 | | (ofdm->hierarchy_information != HIERARCHY_AUTO ? 1 << 3 : 0) | ||
| 403 | | (ofdm->code_rate_HP != FEC_AUTO ? 1 << 2 : 0) | ||
| 404 | | (ofdm->code_rate_LP != FEC_AUTO ? 1 << 1 : 0) | ||
| 405 | | (ofdm->guard_interval != GUARD_INTERVAL_AUTO ? 1 << 0 : 0); | ||
| 406 | |||
| 407 | /* multiplex_valid_flags, low byte */ | ||
| 408 | c->operand[6] = | ||
| 409 | 0 << 7 /* NetworkID */ | ||
| 410 | | (ofdm->transmission_mode != TRANSMISSION_MODE_AUTO ? 1 << 6 : 0) | ||
| 411 | | 0 << 5 /* OtherFrequencyFlag */ | ||
| 412 | | 0 << 0 /* reserved */ ; | ||
| 413 | |||
| 414 | c->operand[7] = 0x0; | ||
| 415 | c->operand[8] = (params->frequency / 10) >> 24; | ||
| 416 | c->operand[9] = ((params->frequency / 10) >> 16) & 0xff; | ||
| 417 | c->operand[10] = ((params->frequency / 10) >> 8) & 0xff; | ||
| 418 | c->operand[11] = (params->frequency / 10) & 0xff; | ||
| 419 | |||
| 420 | switch (ofdm->bandwidth) { | ||
| 421 | case BANDWIDTH_7_MHZ: c->operand[12] = 0x20; break; | ||
| 422 | case BANDWIDTH_8_MHZ: | ||
| 423 | case BANDWIDTH_6_MHZ: /* not defined by AVC spec */ | ||
| 424 | case BANDWIDTH_AUTO: | ||
| 425 | default: c->operand[12] = 0x00; | ||
| 426 | } | ||
| 427 | |||
| 428 | switch (ofdm->constellation) { | ||
| 429 | case QAM_16: c->operand[13] = 1 << 6; break; | ||
| 430 | case QAM_64: c->operand[13] = 2 << 6; break; | ||
| 431 | case QPSK: | ||
| 432 | default: c->operand[13] = 0x00; | ||
| 433 | } | ||
| 434 | |||
| 435 | switch (ofdm->hierarchy_information) { | ||
| 436 | case HIERARCHY_1: c->operand[13] |= 1 << 3; break; | ||
| 437 | case HIERARCHY_2: c->operand[13] |= 2 << 3; break; | ||
| 438 | case HIERARCHY_4: c->operand[13] |= 3 << 3; break; | ||
| 439 | case HIERARCHY_AUTO: | ||
| 440 | case HIERARCHY_NONE: | ||
| 441 | default: break; | ||
| 442 | } | ||
| 443 | |||
| 444 | switch (ofdm->code_rate_HP) { | ||
| 445 | case FEC_2_3: c->operand[13] |= 1; break; | ||
| 446 | case FEC_3_4: c->operand[13] |= 2; break; | ||
| 447 | case FEC_5_6: c->operand[13] |= 3; break; | ||
| 448 | case FEC_7_8: c->operand[13] |= 4; break; | ||
| 449 | case FEC_1_2: | ||
| 450 | default: break; | ||
| 451 | } | ||
| 452 | |||
| 453 | switch (ofdm->code_rate_LP) { | ||
| 454 | case FEC_2_3: c->operand[14] = 1 << 5; break; | ||
| 455 | case FEC_3_4: c->operand[14] = 2 << 5; break; | ||
| 456 | case FEC_5_6: c->operand[14] = 3 << 5; break; | ||
| 457 | case FEC_7_8: c->operand[14] = 4 << 5; break; | ||
| 458 | case FEC_1_2: | ||
| 459 | default: c->operand[14] = 0x00; break; | ||
| 460 | } | ||
| 461 | |||
| 462 | switch (ofdm->guard_interval) { | ||
| 463 | case GUARD_INTERVAL_1_16: c->operand[14] |= 1 << 3; break; | ||
| 464 | case GUARD_INTERVAL_1_8: c->operand[14] |= 2 << 3; break; | ||
| 465 | case GUARD_INTERVAL_1_4: c->operand[14] |= 3 << 3; break; | ||
| 466 | case GUARD_INTERVAL_1_32: | ||
| 467 | case GUARD_INTERVAL_AUTO: | ||
| 468 | default: break; | ||
| 469 | } | ||
| 470 | |||
| 471 | switch (ofdm->transmission_mode) { | ||
| 472 | case TRANSMISSION_MODE_8K: c->operand[14] |= 1 << 1; break; | ||
| 473 | case TRANSMISSION_MODE_2K: | ||
| 474 | case TRANSMISSION_MODE_AUTO: | ||
| 475 | default: break; | ||
| 476 | } | ||
| 477 | |||
| 478 | c->operand[15] = 0x00; /* network_ID[0] */ | ||
| 479 | c->operand[16] = 0x00; /* network_ID[1] */ | ||
| 480 | /* Nr_of_dsd_sel_specs = 0 -> no PIDs are transmitted */ | ||
| 481 | c->operand[17] = 0x00; | ||
| 482 | |||
| 483 | c->length = 24; | ||
| 484 | } | ||
| 485 | |||
| 486 | int avc_tuner_dsd(struct firedtv *fdtv, | ||
| 487 | struct dvb_frontend_parameters *params) | ||
| 488 | { | ||
| 489 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 490 | struct avc_command_frame *c = (void *)buffer; | ||
| 491 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 492 | |||
| 493 | memset(c, 0, sizeof(*c)); | ||
| 494 | |||
| 495 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 496 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 497 | |||
| 498 | switch (fdtv->type) { | ||
| 499 | case FIREDTV_DVB_S: | ||
| 500 | case FIREDTV_DVB_S2: avc_tuner_tuneqpsk(fdtv, params, c); break; | ||
| 501 | case FIREDTV_DVB_C: avc_tuner_dsd_dvb_c(params, c); break; | ||
| 502 | case FIREDTV_DVB_T: avc_tuner_dsd_dvb_t(params, c); break; | ||
| 503 | default: | ||
| 504 | BUG(); | ||
| 505 | } | ||
| 506 | |||
| 507 | if (avc_write(fdtv, c, r) < 0) | ||
| 508 | return -EIO; | ||
| 509 | |||
| 510 | msleep(500); | ||
| 511 | #if 0 | ||
| 512 | /* FIXME: */ | ||
| 513 | /* u8 *status was an out-parameter of avc_tuner_dsd, unused by caller */ | ||
| 514 | if (status) | ||
| 515 | *status = r->operand[2]; | ||
| 516 | #endif | ||
| 517 | return 0; | ||
| 518 | } | ||
| 519 | |||
| 520 | int avc_tuner_set_pids(struct firedtv *fdtv, unsigned char pidc, u16 pid[]) | ||
| 521 | { | ||
| 522 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 523 | struct avc_command_frame *c = (void *)buffer; | ||
| 524 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 525 | int pos, k; | ||
| 526 | |||
| 527 | if (pidc > 16 && pidc != 0xff) | ||
| 528 | return -EINVAL; | ||
| 529 | |||
| 530 | memset(c, 0, sizeof(*c)); | ||
| 531 | |||
| 532 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 533 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 534 | c->opcode = AVC_OPCODE_DSD; | ||
| 535 | |||
| 536 | c->operand[0] = 0; /* source plug */ | ||
| 537 | c->operand[1] = 0xd2; /* subfunction replace */ | ||
| 538 | c->operand[2] = 0x20; /* system id = DVB */ | ||
| 539 | c->operand[3] = 0x00; /* antenna number */ | ||
| 540 | c->operand[4] = 0x00; /* system_specific_multiplex selection_length */ | ||
| 541 | c->operand[5] = pidc; /* Nr_of_dsd_sel_specs */ | ||
| 542 | |||
| 543 | pos = 6; | ||
| 544 | if (pidc != 0xff) | ||
| 545 | for (k = 0; k < pidc; k++) { | ||
| 546 | c->operand[pos++] = 0x13; /* flowfunction relay */ | ||
| 547 | c->operand[pos++] = 0x80; /* dsd_sel_spec_valid_flags -> PID */ | ||
| 548 | c->operand[pos++] = (pid[k] >> 8) & 0x1f; | ||
| 549 | c->operand[pos++] = pid[k] & 0xff; | ||
| 550 | c->operand[pos++] = 0x00; /* tableID */ | ||
| 551 | c->operand[pos++] = 0x00; /* filter_length */ | ||
| 552 | } | ||
| 553 | |||
| 554 | c->length = ALIGN(3 + pos, 4); | ||
| 555 | |||
| 556 | if (avc_write(fdtv, c, r) < 0) | ||
| 557 | return -EIO; | ||
| 558 | |||
| 559 | msleep(50); | ||
| 560 | return 0; | ||
| 561 | } | ||
| 562 | |||
| 563 | int avc_tuner_get_ts(struct firedtv *fdtv) | ||
| 564 | { | ||
| 565 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 566 | struct avc_command_frame *c = (void *)buffer; | ||
| 567 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 568 | int sl; | ||
| 569 | |||
| 570 | memset(c, 0, sizeof(*c)); | ||
| 571 | |||
| 572 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 573 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 574 | c->opcode = AVC_OPCODE_DSIT; | ||
| 575 | |||
| 576 | sl = fdtv->type == FIREDTV_DVB_T ? 0x0c : 0x11; | ||
| 577 | |||
| 578 | c->operand[0] = 0; /* source plug */ | ||
| 579 | c->operand[1] = 0xd2; /* subfunction replace */ | ||
| 580 | c->operand[2] = 0xff; /* status */ | ||
| 581 | c->operand[3] = 0x20; /* system id = DVB */ | ||
| 582 | c->operand[4] = 0x00; /* antenna number */ | ||
| 583 | c->operand[5] = 0x0; /* system_specific_search_flags */ | ||
| 584 | c->operand[6] = sl; /* system_specific_multiplex selection_length */ | ||
| 585 | c->operand[7] = 0x00; /* valid_flags [0] */ | ||
| 586 | c->operand[8] = 0x00; /* valid_flags [1] */ | ||
| 587 | c->operand[7 + sl] = 0x00; /* nr_of_dsit_sel_specs (always 0) */ | ||
| 588 | |||
| 589 | c->length = fdtv->type == FIREDTV_DVB_T ? 24 : 28; | ||
| 590 | |||
| 591 | if (avc_write(fdtv, c, r) < 0) | ||
| 592 | return -EIO; | ||
| 593 | |||
| 594 | msleep(250); | ||
| 595 | return 0; | ||
| 596 | } | ||
| 597 | |||
| 598 | int avc_identify_subunit(struct firedtv *fdtv) | ||
| 599 | { | ||
| 600 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 601 | struct avc_command_frame *c = (void *)buffer; | ||
| 602 | struct avc_response_frame *r = (void *)buffer; | ||
| 603 | |||
| 604 | memset(c, 0, sizeof(*c)); | ||
| 605 | |||
| 606 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 607 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 608 | c->opcode = AVC_OPCODE_READ_DESCRIPTOR; | ||
| 609 | |||
| 610 | c->operand[0] = DESCRIPTOR_SUBUNIT_IDENTIFIER; | ||
| 611 | c->operand[1] = 0xff; | ||
| 612 | c->operand[2] = 0x00; | ||
| 613 | c->operand[3] = 0x00; /* length highbyte */ | ||
| 614 | c->operand[4] = 0x08; /* length lowbyte */ | ||
| 615 | c->operand[5] = 0x00; /* offset highbyte */ | ||
| 616 | c->operand[6] = 0x0d; /* offset lowbyte */ | ||
| 617 | |||
| 618 | c->length = 12; | ||
| 619 | |||
| 620 | if (avc_write(fdtv, c, r) < 0) | ||
| 621 | return -EIO; | ||
| 622 | |||
| 623 | if ((r->response != AVC_RESPONSE_STABLE && | ||
| 624 | r->response != AVC_RESPONSE_ACCEPTED) || | ||
| 625 | (r->operand[3] << 8) + r->operand[4] != 8) { | ||
| 626 | dev_err(fdtv->device, "cannot read subunit identifier\n"); | ||
| 627 | return -EINVAL; | ||
| 628 | } | ||
| 629 | return 0; | ||
| 630 | } | ||
| 631 | |||
| 632 | #define SIZEOF_ANTENNA_INPUT_INFO 22 | ||
| 633 | |||
| 634 | int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat) | ||
| 635 | { | ||
| 636 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 637 | struct avc_command_frame *c = (void *)buffer; | ||
| 638 | struct avc_response_frame *r = (void *)buffer; | ||
| 639 | int length; | ||
| 640 | |||
| 641 | memset(c, 0, sizeof(*c)); | ||
| 642 | |||
| 643 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 644 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 645 | c->opcode = AVC_OPCODE_READ_DESCRIPTOR; | ||
| 646 | |||
| 647 | c->operand[0] = DESCRIPTOR_TUNER_STATUS; | ||
| 648 | c->operand[1] = 0xff; /* read_result_status */ | ||
| 649 | c->operand[2] = 0x00; /* reserved */ | ||
| 650 | c->operand[3] = 0; /* SIZEOF_ANTENNA_INPUT_INFO >> 8; */ | ||
| 651 | c->operand[4] = 0; /* SIZEOF_ANTENNA_INPUT_INFO & 0xff; */ | ||
| 652 | c->operand[5] = 0x00; | ||
| 653 | c->operand[6] = 0x00; | ||
| 654 | |||
| 655 | c->length = 12; | ||
| 656 | |||
| 657 | if (avc_write(fdtv, c, r) < 0) | ||
| 658 | return -EIO; | ||
| 659 | |||
| 660 | if (r->response != AVC_RESPONSE_STABLE && | ||
| 661 | r->response != AVC_RESPONSE_ACCEPTED) { | ||
| 662 | dev_err(fdtv->device, "cannot read tuner status\n"); | ||
| 663 | return -EINVAL; | ||
| 664 | } | ||
| 665 | |||
| 666 | length = r->operand[9]; | ||
| 667 | if (r->operand[1] != 0x10 || length != SIZEOF_ANTENNA_INPUT_INFO) { | ||
| 668 | dev_err(fdtv->device, "got invalid tuner status\n"); | ||
| 669 | return -EINVAL; | ||
| 670 | } | ||
| 671 | |||
| 672 | stat->active_system = r->operand[10]; | ||
| 673 | stat->searching = r->operand[11] >> 7 & 1; | ||
| 674 | stat->moving = r->operand[11] >> 6 & 1; | ||
| 675 | stat->no_rf = r->operand[11] >> 5 & 1; | ||
| 676 | stat->input = r->operand[12] >> 7 & 1; | ||
| 677 | stat->selected_antenna = r->operand[12] & 0x7f; | ||
| 678 | stat->ber = r->operand[13] << 24 | | ||
| 679 | r->operand[14] << 16 | | ||
| 680 | r->operand[15] << 8 | | ||
| 681 | r->operand[16]; | ||
| 682 | stat->signal_strength = r->operand[17]; | ||
| 683 | stat->raster_frequency = r->operand[18] >> 6 & 2; | ||
| 684 | stat->rf_frequency = (r->operand[18] & 0x3f) << 16 | | ||
| 685 | r->operand[19] << 8 | | ||
| 686 | r->operand[20]; | ||
| 687 | stat->man_dep_info_length = r->operand[21]; | ||
| 688 | stat->front_end_error = r->operand[22] >> 4 & 1; | ||
| 689 | stat->antenna_error = r->operand[22] >> 3 & 1; | ||
| 690 | stat->front_end_power_status = r->operand[22] >> 1 & 1; | ||
| 691 | stat->power_supply = r->operand[22] & 1; | ||
| 692 | stat->carrier_noise_ratio = r->operand[23] << 8 | | ||
| 693 | r->operand[24]; | ||
| 694 | stat->power_supply_voltage = r->operand[27]; | ||
| 695 | stat->antenna_voltage = r->operand[28]; | ||
| 696 | stat->firewire_bus_voltage = r->operand[29]; | ||
| 697 | stat->ca_mmi = r->operand[30] & 1; | ||
| 698 | stat->ca_pmt_reply = r->operand[31] >> 7 & 1; | ||
| 699 | stat->ca_date_time_request = r->operand[31] >> 6 & 1; | ||
| 700 | stat->ca_application_info = r->operand[31] >> 5 & 1; | ||
| 701 | stat->ca_module_present_status = r->operand[31] >> 4 & 1; | ||
| 702 | stat->ca_dvb_flag = r->operand[31] >> 3 & 1; | ||
| 703 | stat->ca_error_flag = r->operand[31] >> 2 & 1; | ||
| 704 | stat->ca_initialization_status = r->operand[31] >> 1 & 1; | ||
| 705 | |||
| 706 | return 0; | ||
| 707 | } | ||
| 708 | |||
| 709 | int avc_lnb_control(struct firedtv *fdtv, char voltage, char burst, | ||
| 710 | char conttone, char nrdiseq, | ||
| 711 | struct dvb_diseqc_master_cmd *diseqcmd) | ||
| 712 | { | ||
| 713 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 714 | struct avc_command_frame *c = (void *)buffer; | ||
| 715 | struct avc_response_frame *r = (void *)buffer; | ||
| 716 | int i, j, k; | ||
| 717 | |||
| 718 | memset(c, 0, sizeof(*c)); | ||
| 719 | |||
| 720 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 721 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 722 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 723 | |||
| 724 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 725 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 726 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 727 | c->operand[3] = SFE_VENDOR_OPCODE_LNB_CONTROL; | ||
| 728 | |||
| 729 | c->operand[4] = voltage; | ||
| 730 | c->operand[5] = nrdiseq; | ||
| 731 | |||
| 732 | i = 6; | ||
| 733 | |||
| 734 | for (j = 0; j < nrdiseq; j++) { | ||
| 735 | c->operand[i++] = diseqcmd[j].msg_len; | ||
| 736 | |||
| 737 | for (k = 0; k < diseqcmd[j].msg_len; k++) | ||
| 738 | c->operand[i++] = diseqcmd[j].msg[k]; | ||
| 739 | } | ||
| 740 | |||
| 741 | c->operand[i++] = burst; | ||
| 742 | c->operand[i++] = conttone; | ||
| 743 | |||
| 744 | c->length = ALIGN(3 + i, 4); | ||
| 745 | |||
| 746 | if (avc_write(fdtv, c, r) < 0) | ||
| 747 | return -EIO; | ||
| 748 | |||
| 749 | if (r->response != AVC_RESPONSE_ACCEPTED) { | ||
| 750 | dev_err(fdtv->device, "LNB control failed\n"); | ||
| 751 | return -EINVAL; | ||
| 752 | } | ||
| 753 | |||
| 754 | return 0; | ||
| 755 | } | ||
| 756 | |||
| 757 | int avc_register_remote_control(struct firedtv *fdtv) | ||
| 758 | { | ||
| 759 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 760 | struct avc_command_frame *c = (void *)buffer; | ||
| 761 | |||
| 762 | memset(c, 0, sizeof(*c)); | ||
| 763 | |||
| 764 | c->ctype = AVC_CTYPE_NOTIFY; | ||
| 765 | c->subunit = AVC_SUBUNIT_TYPE_UNIT | 7; | ||
| 766 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 767 | |||
| 768 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 769 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 770 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 771 | c->operand[3] = SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL; | ||
| 772 | |||
| 773 | c->length = 8; | ||
| 774 | |||
| 775 | return avc_write(fdtv, c, NULL); | ||
| 776 | } | ||
| 777 | |||
| 778 | void avc_remote_ctrl_work(struct work_struct *work) | ||
| 779 | { | ||
| 780 | struct firedtv *fdtv = | ||
| 781 | container_of(work, struct firedtv, remote_ctrl_work); | ||
| 782 | |||
| 783 | /* Should it be rescheduled in failure cases? */ | ||
| 784 | avc_register_remote_control(fdtv); | ||
| 785 | } | ||
| 786 | |||
| 787 | #if 0 /* FIXME: unused */ | ||
| 788 | int avc_tuner_host2ca(struct firedtv *fdtv) | ||
| 789 | { | ||
| 790 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 791 | struct avc_command_frame *c = (void *)buffer; | ||
| 792 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 793 | |||
| 794 | memset(c, 0, sizeof(*c)); | ||
| 795 | |||
| 796 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 797 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 798 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 799 | |||
| 800 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 801 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 802 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 803 | c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; | ||
| 804 | c->operand[4] = 0; /* slot */ | ||
| 805 | c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ | ||
| 806 | c->operand[6] = 0; /* more/last */ | ||
| 807 | c->operand[7] = 0; /* length */ | ||
| 808 | |||
| 809 | c->length = 12; | ||
| 810 | |||
| 811 | if (avc_write(fdtv, c, r) < 0) | ||
| 812 | return -EIO; | ||
| 813 | |||
| 814 | return 0; | ||
| 815 | } | ||
| 816 | #endif | ||
| 817 | |||
| 818 | static int get_ca_object_pos(struct avc_response_frame *r) | ||
| 819 | { | ||
| 820 | int length = 1; | ||
| 821 | |||
| 822 | /* Check length of length field */ | ||
| 823 | if (r->operand[7] & 0x80) | ||
| 824 | length = (r->operand[7] & 0x7f) + 1; | ||
| 825 | return length + 7; | ||
| 826 | } | ||
| 827 | |||
| 828 | static int get_ca_object_length(struct avc_response_frame *r) | ||
| 829 | { | ||
| 830 | #if 0 /* FIXME: unused */ | ||
| 831 | int size = 0; | ||
| 832 | int i; | ||
| 833 | |||
| 834 | if (r->operand[7] & 0x80) | ||
| 835 | for (i = 0; i < (r->operand[7] & 0x7f); i++) { | ||
| 836 | size <<= 8; | ||
| 837 | size += r->operand[8 + i]; | ||
| 838 | } | ||
| 839 | #endif | ||
| 840 | return r->operand[7]; | ||
| 841 | } | ||
| 842 | |||
| 843 | int avc_ca_app_info(struct firedtv *fdtv, char *app_info, unsigned int *len) | ||
| 844 | { | ||
| 845 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 846 | struct avc_command_frame *c = (void *)buffer; | ||
| 847 | struct avc_response_frame *r = (void *)buffer; | ||
| 848 | int pos; | ||
| 849 | |||
| 850 | memset(c, 0, sizeof(*c)); | ||
| 851 | |||
| 852 | c->ctype = AVC_CTYPE_STATUS; | ||
| 853 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 854 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 855 | |||
| 856 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 857 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 858 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 859 | c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; | ||
| 860 | c->operand[4] = 0; /* slot */ | ||
| 861 | c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ | ||
| 862 | |||
| 863 | c->length = 12; | ||
| 864 | |||
| 865 | if (avc_write(fdtv, c, r) < 0) | ||
| 866 | return -EIO; | ||
| 867 | |||
| 868 | /* FIXME: check response code and validate response data */ | ||
| 869 | |||
| 870 | pos = get_ca_object_pos(r); | ||
| 871 | app_info[0] = (EN50221_TAG_APP_INFO >> 16) & 0xff; | ||
| 872 | app_info[1] = (EN50221_TAG_APP_INFO >> 8) & 0xff; | ||
| 873 | app_info[2] = (EN50221_TAG_APP_INFO >> 0) & 0xff; | ||
| 874 | app_info[3] = 6 + r->operand[pos + 4]; | ||
| 875 | app_info[4] = 0x01; | ||
| 876 | memcpy(&app_info[5], &r->operand[pos], 5 + r->operand[pos + 4]); | ||
| 877 | *len = app_info[3] + 4; | ||
| 878 | |||
| 879 | return 0; | ||
| 880 | } | ||
| 881 | |||
| 882 | int avc_ca_info(struct firedtv *fdtv, char *app_info, unsigned int *len) | ||
| 883 | { | ||
| 884 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 885 | struct avc_command_frame *c = (void *)buffer; | ||
| 886 | struct avc_response_frame *r = (void *)buffer; | ||
| 887 | int pos; | ||
| 888 | |||
| 889 | memset(c, 0, sizeof(*c)); | ||
| 890 | |||
| 891 | c->ctype = AVC_CTYPE_STATUS; | ||
| 892 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 893 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 894 | |||
| 895 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 896 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 897 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 898 | c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; | ||
| 899 | c->operand[4] = 0; /* slot */ | ||
| 900 | c->operand[5] = SFE_VENDOR_TAG_CA_APPLICATION_INFO; /* ca tag */ | ||
| 901 | |||
| 902 | c->length = 12; | ||
| 903 | |||
| 904 | if (avc_write(fdtv, c, r) < 0) | ||
| 905 | return -EIO; | ||
| 906 | |||
| 907 | pos = get_ca_object_pos(r); | ||
| 908 | app_info[0] = (EN50221_TAG_CA_INFO >> 16) & 0xff; | ||
| 909 | app_info[1] = (EN50221_TAG_CA_INFO >> 8) & 0xff; | ||
| 910 | app_info[2] = (EN50221_TAG_CA_INFO >> 0) & 0xff; | ||
| 911 | app_info[3] = 2; | ||
| 912 | app_info[4] = r->operand[pos + 0]; | ||
| 913 | app_info[5] = r->operand[pos + 1]; | ||
| 914 | *len = app_info[3] + 4; | ||
| 915 | |||
| 916 | return 0; | ||
| 917 | } | ||
| 918 | |||
| 919 | int avc_ca_reset(struct firedtv *fdtv) | ||
| 920 | { | ||
| 921 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 922 | struct avc_command_frame *c = (void *)buffer; | ||
| 923 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 924 | |||
| 925 | memset(c, 0, sizeof(*c)); | ||
| 926 | |||
| 927 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 928 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 929 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 930 | |||
| 931 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 932 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 933 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 934 | c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; | ||
| 935 | c->operand[4] = 0; /* slot */ | ||
| 936 | c->operand[5] = SFE_VENDOR_TAG_CA_RESET; /* ca tag */ | ||
| 937 | c->operand[6] = 0; /* more/last */ | ||
| 938 | c->operand[7] = 1; /* length */ | ||
| 939 | c->operand[8] = 0; /* force hardware reset */ | ||
| 940 | |||
| 941 | c->length = 12; | ||
| 942 | |||
| 943 | if (avc_write(fdtv, c, r) < 0) | ||
| 944 | return -EIO; | ||
| 945 | |||
| 946 | return 0; | ||
| 947 | } | ||
| 948 | |||
| 949 | int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) | ||
| 950 | { | ||
| 951 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 952 | struct avc_command_frame *c = (void *)buffer; | ||
| 953 | struct avc_response_frame *r = (void *)buffer; | ||
| 954 | int list_management; | ||
| 955 | int program_info_length; | ||
| 956 | int pmt_cmd_id; | ||
| 957 | int read_pos; | ||
| 958 | int write_pos; | ||
| 959 | int es_info_length; | ||
| 960 | int crc32_csum; | ||
| 961 | |||
| 962 | memset(c, 0, sizeof(*c)); | ||
| 963 | |||
| 964 | c->ctype = AVC_CTYPE_CONTROL; | ||
| 965 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 966 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 967 | |||
| 968 | if (msg[0] != EN50221_LIST_MANAGEMENT_ONLY) { | ||
| 969 | dev_info(fdtv->device, "forcing list_management to ONLY\n"); | ||
| 970 | msg[0] = EN50221_LIST_MANAGEMENT_ONLY; | ||
| 971 | } | ||
| 972 | /* We take the cmd_id from the programme level only! */ | ||
| 973 | list_management = msg[0]; | ||
| 974 | program_info_length = ((msg[4] & 0x0f) << 8) + msg[5]; | ||
| 975 | if (program_info_length > 0) | ||
| 976 | program_info_length--; /* Remove pmt_cmd_id */ | ||
| 977 | pmt_cmd_id = msg[6]; | ||
| 978 | |||
| 979 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 980 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 981 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 982 | c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; | ||
| 983 | c->operand[4] = 0; /* slot */ | ||
| 984 | c->operand[5] = SFE_VENDOR_TAG_CA_PMT; /* ca tag */ | ||
| 985 | c->operand[6] = 0; /* more/last */ | ||
| 986 | /* c->operand[7] = XXXprogram_info_length + 17; */ /* length */ | ||
| 987 | c->operand[8] = list_management; | ||
| 988 | c->operand[9] = 0x01; /* pmt_cmd=OK_descramble */ | ||
| 989 | |||
| 990 | /* TS program map table */ | ||
| 991 | |||
| 992 | c->operand[10] = 0x02; /* Table id=2 */ | ||
| 993 | c->operand[11] = 0x80; /* Section syntax + length */ | ||
| 994 | /* c->operand[12] = XXXprogram_info_length + 12; */ | ||
| 995 | c->operand[13] = msg[1]; /* Program number */ | ||
| 996 | c->operand[14] = msg[2]; | ||
| 997 | c->operand[15] = 0x01; /* Version number=0 + current/next=1 */ | ||
| 998 | c->operand[16] = 0x00; /* Section number=0 */ | ||
| 999 | c->operand[17] = 0x00; /* Last section number=0 */ | ||
| 1000 | c->operand[18] = 0x1f; /* PCR_PID=1FFF */ | ||
| 1001 | c->operand[19] = 0xff; | ||
| 1002 | c->operand[20] = (program_info_length >> 8); /* Program info length */ | ||
| 1003 | c->operand[21] = (program_info_length & 0xff); | ||
| 1004 | |||
| 1005 | /* CA descriptors at programme level */ | ||
| 1006 | read_pos = 6; | ||
| 1007 | write_pos = 22; | ||
| 1008 | if (program_info_length > 0) { | ||
| 1009 | pmt_cmd_id = msg[read_pos++]; | ||
| 1010 | if (pmt_cmd_id != 1 && pmt_cmd_id != 4) | ||
| 1011 | dev_err(fdtv->device, | ||
| 1012 | "invalid pmt_cmd_id %d\n", pmt_cmd_id); | ||
| 1013 | |||
| 1014 | memcpy(&c->operand[write_pos], &msg[read_pos], | ||
| 1015 | program_info_length); | ||
| 1016 | read_pos += program_info_length; | ||
| 1017 | write_pos += program_info_length; | ||
| 1018 | } | ||
| 1019 | while (read_pos < length) { | ||
| 1020 | c->operand[write_pos++] = msg[read_pos++]; | ||
| 1021 | c->operand[write_pos++] = msg[read_pos++]; | ||
| 1022 | c->operand[write_pos++] = msg[read_pos++]; | ||
| 1023 | es_info_length = | ||
| 1024 | ((msg[read_pos] & 0x0f) << 8) + msg[read_pos + 1]; | ||
| 1025 | read_pos += 2; | ||
| 1026 | if (es_info_length > 0) | ||
| 1027 | es_info_length--; /* Remove pmt_cmd_id */ | ||
| 1028 | c->operand[write_pos++] = es_info_length >> 8; | ||
| 1029 | c->operand[write_pos++] = es_info_length & 0xff; | ||
| 1030 | if (es_info_length > 0) { | ||
| 1031 | pmt_cmd_id = msg[read_pos++]; | ||
| 1032 | if (pmt_cmd_id != 1 && pmt_cmd_id != 4) | ||
| 1033 | dev_err(fdtv->device, "invalid pmt_cmd_id %d " | ||
| 1034 | "at stream level\n", pmt_cmd_id); | ||
| 1035 | |||
| 1036 | memcpy(&c->operand[write_pos], &msg[read_pos], | ||
| 1037 | es_info_length); | ||
| 1038 | read_pos += es_info_length; | ||
| 1039 | write_pos += es_info_length; | ||
| 1040 | } | ||
| 1041 | } | ||
| 1042 | |||
| 1043 | /* CRC */ | ||
| 1044 | c->operand[write_pos++] = 0x00; | ||
| 1045 | c->operand[write_pos++] = 0x00; | ||
| 1046 | c->operand[write_pos++] = 0x00; | ||
| 1047 | c->operand[write_pos++] = 0x00; | ||
| 1048 | |||
| 1049 | c->operand[7] = write_pos - 8; | ||
| 1050 | c->operand[12] = write_pos - 13; | ||
| 1051 | |||
| 1052 | crc32_csum = crc32_be(0, &c->operand[10], c->operand[12] - 1); | ||
| 1053 | c->operand[write_pos - 4] = (crc32_csum >> 24) & 0xff; | ||
| 1054 | c->operand[write_pos - 3] = (crc32_csum >> 16) & 0xff; | ||
| 1055 | c->operand[write_pos - 2] = (crc32_csum >> 8) & 0xff; | ||
| 1056 | c->operand[write_pos - 1] = (crc32_csum >> 0) & 0xff; | ||
| 1057 | |||
| 1058 | c->length = ALIGN(3 + write_pos, 4); | ||
| 1059 | |||
| 1060 | if (avc_write(fdtv, c, r) < 0) | ||
| 1061 | return -EIO; | ||
| 1062 | |||
| 1063 | if (r->response != AVC_RESPONSE_ACCEPTED) { | ||
| 1064 | dev_err(fdtv->device, | ||
| 1065 | "CA PMT failed with response 0x%x\n", r->response); | ||
| 1066 | return -EFAULT; | ||
| 1067 | } | ||
| 1068 | |||
| 1069 | return 0; | ||
| 1070 | } | ||
| 1071 | |||
| 1072 | int avc_ca_get_time_date(struct firedtv *fdtv, int *interval) | ||
| 1073 | { | ||
| 1074 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 1075 | struct avc_command_frame *c = (void *)buffer; | ||
| 1076 | struct avc_response_frame *r = (void *)buffer; | ||
| 1077 | |||
| 1078 | memset(c, 0, sizeof(*c)); | ||
| 1079 | |||
| 1080 | c->ctype = AVC_CTYPE_STATUS; | ||
| 1081 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 1082 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 1083 | |||
| 1084 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 1085 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 1086 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 1087 | c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; | ||
| 1088 | c->operand[4] = 0; /* slot */ | ||
| 1089 | c->operand[5] = SFE_VENDOR_TAG_CA_DATE_TIME; /* ca tag */ | ||
| 1090 | c->operand[6] = 0; /* more/last */ | ||
| 1091 | c->operand[7] = 0; /* length */ | ||
| 1092 | |||
| 1093 | c->length = 12; | ||
| 1094 | |||
| 1095 | if (avc_write(fdtv, c, r) < 0) | ||
| 1096 | return -EIO; | ||
| 1097 | |||
| 1098 | /* FIXME: check response code and validate response data */ | ||
| 1099 | |||
| 1100 | *interval = r->operand[get_ca_object_pos(r)]; | ||
| 1101 | |||
| 1102 | return 0; | ||
| 1103 | } | ||
| 1104 | |||
| 1105 | int avc_ca_enter_menu(struct firedtv *fdtv) | ||
| 1106 | { | ||
| 1107 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 1108 | struct avc_command_frame *c = (void *)buffer; | ||
| 1109 | struct avc_response_frame *r = (void *)buffer; /* FIXME: unused */ | ||
| 1110 | |||
| 1111 | memset(c, 0, sizeof(*c)); | ||
| 1112 | |||
| 1113 | c->ctype = AVC_CTYPE_STATUS; | ||
| 1114 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 1115 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 1116 | |||
| 1117 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 1118 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 1119 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 1120 | c->operand[3] = SFE_VENDOR_OPCODE_HOST2CA; | ||
| 1121 | c->operand[4] = 0; /* slot */ | ||
| 1122 | c->operand[5] = SFE_VENDOR_TAG_CA_ENTER_MENU; | ||
| 1123 | c->operand[6] = 0; /* more/last */ | ||
| 1124 | c->operand[7] = 0; /* length */ | ||
| 1125 | |||
| 1126 | c->length = 12; | ||
| 1127 | |||
| 1128 | if (avc_write(fdtv, c, r) < 0) | ||
| 1129 | return -EIO; | ||
| 1130 | |||
| 1131 | return 0; | ||
| 1132 | } | ||
| 1133 | |||
| 1134 | int avc_ca_get_mmi(struct firedtv *fdtv, char *mmi_object, unsigned int *len) | ||
| 1135 | { | ||
| 1136 | char buffer[sizeof(struct avc_command_frame)]; | ||
| 1137 | struct avc_command_frame *c = (void *)buffer; | ||
| 1138 | struct avc_response_frame *r = (void *)buffer; | ||
| 1139 | |||
| 1140 | memset(c, 0, sizeof(*c)); | ||
| 1141 | |||
| 1142 | c->ctype = AVC_CTYPE_STATUS; | ||
| 1143 | c->subunit = AVC_SUBUNIT_TYPE_TUNER | fdtv->subunit; | ||
| 1144 | c->opcode = AVC_OPCODE_VENDOR; | ||
| 1145 | |||
| 1146 | c->operand[0] = SFE_VENDOR_DE_COMPANYID_0; | ||
| 1147 | c->operand[1] = SFE_VENDOR_DE_COMPANYID_1; | ||
| 1148 | c->operand[2] = SFE_VENDOR_DE_COMPANYID_2; | ||
| 1149 | c->operand[3] = SFE_VENDOR_OPCODE_CA2HOST; | ||
| 1150 | c->operand[4] = 0; /* slot */ | ||
| 1151 | c->operand[5] = SFE_VENDOR_TAG_CA_MMI; | ||
| 1152 | c->operand[6] = 0; /* more/last */ | ||
| 1153 | c->operand[7] = 0; /* length */ | ||
| 1154 | |||
| 1155 | c->length = 12; | ||
| 1156 | |||
| 1157 | if (avc_write(fdtv, c, r) < 0) | ||
| 1158 | return -EIO; | ||
| 1159 | |||
| 1160 | /* FIXME: check response code and validate response data */ | ||
| 1161 | |||
| 1162 | *len = get_ca_object_length(r); | ||
| 1163 | memcpy(mmi_object, &r->operand[get_ca_object_pos(r)], *len); | ||
| 1164 | |||
| 1165 | return 0; | ||
| 1166 | } | ||
| 1167 | |||
| 1168 | #define CMP_OUTPUT_PLUG_CONTROL_REG_0 0xfffff0000904ULL | ||
| 1169 | |||
| 1170 | static int cmp_read(struct firedtv *fdtv, void *buf, u64 addr, size_t len) | ||
| 1171 | { | ||
| 1172 | int ret; | ||
| 1173 | |||
| 1174 | if (mutex_lock_interruptible(&fdtv->avc_mutex)) | ||
| 1175 | return -EINTR; | ||
| 1176 | |||
| 1177 | ret = fdtv->backend->read(fdtv, addr, buf, len); | ||
| 1178 | if (ret < 0) | ||
| 1179 | dev_err(fdtv->device, "CMP: read I/O error\n"); | ||
| 1180 | |||
| 1181 | mutex_unlock(&fdtv->avc_mutex); | ||
| 1182 | return ret; | ||
| 1183 | } | ||
| 1184 | |||
| 1185 | static int cmp_lock(struct firedtv *fdtv, void *data, u64 addr, __be32 arg) | ||
| 1186 | { | ||
| 1187 | int ret; | ||
| 1188 | |||
| 1189 | if (mutex_lock_interruptible(&fdtv->avc_mutex)) | ||
| 1190 | return -EINTR; | ||
| 1191 | |||
| 1192 | ret = fdtv->backend->lock(fdtv, addr, data, arg); | ||
| 1193 | if (ret < 0) | ||
| 1194 | dev_err(fdtv->device, "CMP: lock I/O error\n"); | ||
| 1195 | |||
| 1196 | mutex_unlock(&fdtv->avc_mutex); | ||
| 1197 | return ret; | ||
| 1198 | } | ||
| 1199 | |||
| 1200 | static inline u32 get_opcr(__be32 opcr, u32 mask, u32 shift) | ||
| 1201 | { | ||
| 1202 | return (be32_to_cpu(opcr) >> shift) & mask; | ||
| 1203 | } | ||
| 1204 | |||
| 1205 | static inline void set_opcr(__be32 *opcr, u32 value, u32 mask, u32 shift) | ||
| 1206 | { | ||
| 1207 | *opcr &= ~cpu_to_be32(mask << shift); | ||
| 1208 | *opcr |= cpu_to_be32((value & mask) << shift); | ||
| 1209 | } | ||
| 1210 | |||
| 1211 | #define get_opcr_online(v) get_opcr((v), 0x1, 31) | ||
| 1212 | #define get_opcr_p2p_connections(v) get_opcr((v), 0x3f, 24) | ||
| 1213 | #define get_opcr_channel(v) get_opcr((v), 0x3f, 16) | ||
| 1214 | |||
| 1215 | #define set_opcr_p2p_connections(p, v) set_opcr((p), (v), 0x3f, 24) | ||
| 1216 | #define set_opcr_channel(p, v) set_opcr((p), (v), 0x3f, 16) | ||
| 1217 | #define set_opcr_data_rate(p, v) set_opcr((p), (v), 0x3, 14) | ||
| 1218 | #define set_opcr_overhead_id(p, v) set_opcr((p), (v), 0xf, 10) | ||
| 1219 | |||
| 1220 | int cmp_establish_pp_connection(struct firedtv *fdtv, int plug, int channel) | ||
| 1221 | { | ||
| 1222 | __be32 old_opcr, opcr; | ||
| 1223 | u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2); | ||
| 1224 | int attempts = 0; | ||
| 1225 | int ret; | ||
| 1226 | |||
| 1227 | ret = cmp_read(fdtv, &opcr, opcr_address, 4); | ||
| 1228 | if (ret < 0) | ||
| 1229 | return ret; | ||
| 1230 | |||
| 1231 | repeat: | ||
| 1232 | if (!get_opcr_online(opcr)) { | ||
| 1233 | dev_err(fdtv->device, "CMP: output offline\n"); | ||
| 1234 | return -EBUSY; | ||
| 1235 | } | ||
| 1236 | |||
| 1237 | old_opcr = opcr; | ||
| 1238 | |||
| 1239 | if (get_opcr_p2p_connections(opcr)) { | ||
| 1240 | if (get_opcr_channel(opcr) != channel) { | ||
| 1241 | dev_err(fdtv->device, "CMP: cannot change channel\n"); | ||
| 1242 | return -EBUSY; | ||
| 1243 | } | ||
| 1244 | dev_info(fdtv->device, "CMP: overlaying connection\n"); | ||
| 1245 | |||
| 1246 | /* We don't allocate isochronous resources. */ | ||
| 1247 | } else { | ||
| 1248 | set_opcr_channel(&opcr, channel); | ||
| 1249 | set_opcr_data_rate(&opcr, 2); /* S400 */ | ||
| 1250 | |||
| 1251 | /* FIXME: this is for the worst case - optimize */ | ||
| 1252 | set_opcr_overhead_id(&opcr, 0); | ||
| 1253 | |||
| 1254 | /* | ||
| 1255 | * FIXME: allocate isochronous channel and bandwidth at IRM | ||
| 1256 | * fdtv->backend->alloc_resources(fdtv, channels_mask, bw); | ||
| 1257 | */ | ||
| 1258 | } | ||
| 1259 | |||
| 1260 | set_opcr_p2p_connections(&opcr, get_opcr_p2p_connections(opcr) + 1); | ||
| 1261 | |||
| 1262 | ret = cmp_lock(fdtv, &opcr, opcr_address, old_opcr); | ||
| 1263 | if (ret < 0) | ||
| 1264 | return ret; | ||
| 1265 | |||
| 1266 | if (old_opcr != opcr) { | ||
| 1267 | /* | ||
| 1268 | * FIXME: if old_opcr.P2P_Connections > 0, | ||
| 1269 | * deallocate isochronous channel and bandwidth at IRM | ||
| 1270 | * if (...) | ||
| 1271 | * fdtv->backend->dealloc_resources(fdtv, channel, bw); | ||
| 1272 | */ | ||
| 1273 | |||
| 1274 | if (++attempts < 6) /* arbitrary limit */ | ||
| 1275 | goto repeat; | ||
| 1276 | return -EBUSY; | ||
| 1277 | } | ||
| 1278 | |||
| 1279 | return 0; | ||
| 1280 | } | ||
| 1281 | |||
| 1282 | void cmp_break_pp_connection(struct firedtv *fdtv, int plug, int channel) | ||
| 1283 | { | ||
| 1284 | __be32 old_opcr, opcr; | ||
| 1285 | u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2); | ||
| 1286 | int attempts = 0; | ||
| 1287 | |||
| 1288 | if (cmp_read(fdtv, &opcr, opcr_address, 4) < 0) | ||
| 1289 | return; | ||
| 1290 | |||
| 1291 | repeat: | ||
| 1292 | if (!get_opcr_online(opcr) || !get_opcr_p2p_connections(opcr) || | ||
| 1293 | get_opcr_channel(opcr) != channel) { | ||
| 1294 | dev_err(fdtv->device, "CMP: no connection to break\n"); | ||
| 1295 | return; | ||
| 1296 | } | ||
| 1297 | |||
| 1298 | old_opcr = opcr; | ||
| 1299 | set_opcr_p2p_connections(&opcr, get_opcr_p2p_connections(opcr) - 1); | ||
| 1300 | |||
| 1301 | if (cmp_lock(fdtv, &opcr, opcr_address, old_opcr) < 0) | ||
| 1302 | return; | ||
| 1303 | |||
| 1304 | if (old_opcr != opcr) { | ||
| 1305 | /* | ||
| 1306 | * FIXME: if old_opcr.P2P_Connections == 1, i.e. we were last | ||
| 1307 | * owner, deallocate isochronous channel and bandwidth at IRM | ||
| 1308 | * if (...) | ||
| 1309 | * fdtv->backend->dealloc_resources(fdtv, channel, bw); | ||
| 1310 | */ | ||
| 1311 | |||
| 1312 | if (++attempts < 6) /* arbitrary limit */ | ||
| 1313 | goto repeat; | ||
| 1314 | } | ||
| 1315 | } | ||
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c new file mode 100644 index 000000000000..eeb80d0ea3ff --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-ci.c | |||
| @@ -0,0 +1,260 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License as | ||
| 9 | * published by the Free Software Foundation; either version 2 of | ||
| 10 | * the License, or (at your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/device.h> | ||
| 14 | #include <linux/dvb/ca.h> | ||
| 15 | #include <linux/fs.h> | ||
| 16 | #include <linux/module.h> | ||
| 17 | |||
| 18 | #include <dvbdev.h> | ||
| 19 | |||
| 20 | #include "firedtv.h" | ||
| 21 | |||
| 22 | #define EN50221_TAG_APP_INFO_ENQUIRY 0x9f8020 | ||
| 23 | #define EN50221_TAG_CA_INFO_ENQUIRY 0x9f8030 | ||
| 24 | #define EN50221_TAG_CA_PMT 0x9f8032 | ||
| 25 | #define EN50221_TAG_ENTER_MENU 0x9f8022 | ||
| 26 | |||
| 27 | static int fdtv_ca_ready(struct firedtv_tuner_status *stat) | ||
| 28 | { | ||
| 29 | return stat->ca_initialization_status == 1 && | ||
| 30 | stat->ca_error_flag == 0 && | ||
| 31 | stat->ca_dvb_flag == 1 && | ||
| 32 | stat->ca_module_present_status == 1; | ||
| 33 | } | ||
| 34 | |||
| 35 | static int fdtv_get_ca_flags(struct firedtv_tuner_status *stat) | ||
| 36 | { | ||
| 37 | int flags = 0; | ||
| 38 | |||
| 39 | if (stat->ca_module_present_status == 1) | ||
| 40 | flags |= CA_CI_MODULE_PRESENT; | ||
| 41 | if (stat->ca_initialization_status == 1 && | ||
| 42 | stat->ca_error_flag == 0 && | ||
| 43 | stat->ca_dvb_flag == 1) | ||
| 44 | flags |= CA_CI_MODULE_READY; | ||
| 45 | return flags; | ||
| 46 | } | ||
| 47 | |||
| 48 | static int fdtv_ca_reset(struct firedtv *fdtv) | ||
| 49 | { | ||
| 50 | return avc_ca_reset(fdtv) ? -EFAULT : 0; | ||
| 51 | } | ||
| 52 | |||
| 53 | static int fdtv_ca_get_caps(void *arg) | ||
| 54 | { | ||
| 55 | struct ca_caps *cap = arg; | ||
| 56 | |||
| 57 | cap->slot_num = 1; | ||
| 58 | cap->slot_type = CA_CI; | ||
| 59 | cap->descr_num = 1; | ||
| 60 | cap->descr_type = CA_ECD; | ||
| 61 | return 0; | ||
| 62 | } | ||
| 63 | |||
| 64 | static int fdtv_ca_get_slot_info(struct firedtv *fdtv, void *arg) | ||
| 65 | { | ||
| 66 | struct firedtv_tuner_status stat; | ||
| 67 | struct ca_slot_info *slot = arg; | ||
| 68 | |||
| 69 | if (avc_tuner_status(fdtv, &stat)) | ||
| 70 | return -EFAULT; | ||
| 71 | |||
| 72 | if (slot->num != 0) | ||
| 73 | return -EFAULT; | ||
| 74 | |||
| 75 | slot->type = CA_CI; | ||
| 76 | slot->flags = fdtv_get_ca_flags(&stat); | ||
| 77 | return 0; | ||
| 78 | } | ||
| 79 | |||
| 80 | static int fdtv_ca_app_info(struct firedtv *fdtv, void *arg) | ||
| 81 | { | ||
| 82 | struct ca_msg *reply = arg; | ||
| 83 | |||
| 84 | return avc_ca_app_info(fdtv, reply->msg, &reply->length) ? -EFAULT : 0; | ||
| 85 | } | ||
| 86 | |||
| 87 | static int fdtv_ca_info(struct firedtv *fdtv, void *arg) | ||
| 88 | { | ||
| 89 | struct ca_msg *reply = arg; | ||
| 90 | |||
| 91 | return avc_ca_info(fdtv, reply->msg, &reply->length) ? -EFAULT : 0; | ||
| 92 | } | ||
| 93 | |||
| 94 | static int fdtv_ca_get_mmi(struct firedtv *fdtv, void *arg) | ||
| 95 | { | ||
| 96 | struct ca_msg *reply = arg; | ||
| 97 | |||
| 98 | return avc_ca_get_mmi(fdtv, reply->msg, &reply->length) ? -EFAULT : 0; | ||
| 99 | } | ||
| 100 | |||
| 101 | static int fdtv_ca_get_msg(struct firedtv *fdtv, void *arg) | ||
| 102 | { | ||
| 103 | struct firedtv_tuner_status stat; | ||
| 104 | int err; | ||
| 105 | |||
| 106 | switch (fdtv->ca_last_command) { | ||
| 107 | case EN50221_TAG_APP_INFO_ENQUIRY: | ||
| 108 | err = fdtv_ca_app_info(fdtv, arg); | ||
| 109 | break; | ||
| 110 | case EN50221_TAG_CA_INFO_ENQUIRY: | ||
| 111 | err = fdtv_ca_info(fdtv, arg); | ||
| 112 | break; | ||
| 113 | default: | ||
| 114 | if (avc_tuner_status(fdtv, &stat)) | ||
| 115 | err = -EFAULT; | ||
| 116 | else if (stat.ca_mmi == 1) | ||
| 117 | err = fdtv_ca_get_mmi(fdtv, arg); | ||
| 118 | else { | ||
| 119 | dev_info(fdtv->device, "unhandled CA message 0x%08x\n", | ||
| 120 | fdtv->ca_last_command); | ||
| 121 | err = -EFAULT; | ||
| 122 | } | ||
| 123 | } | ||
| 124 | fdtv->ca_last_command = 0; | ||
| 125 | return err; | ||
| 126 | } | ||
| 127 | |||
| 128 | static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg) | ||
| 129 | { | ||
| 130 | struct ca_msg *msg = arg; | ||
| 131 | int data_pos; | ||
| 132 | int data_length; | ||
| 133 | int i; | ||
| 134 | |||
| 135 | data_pos = 4; | ||
| 136 | if (msg->msg[3] & 0x80) { | ||
| 137 | data_length = 0; | ||
| 138 | for (i = 0; i < (msg->msg[3] & 0x7f); i++) | ||
| 139 | data_length = (data_length << 8) + msg->msg[data_pos++]; | ||
| 140 | } else { | ||
| 141 | data_length = msg->msg[3]; | ||
| 142 | } | ||
| 143 | |||
| 144 | return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length) ? -EFAULT : 0; | ||
| 145 | } | ||
| 146 | |||
| 147 | static int fdtv_ca_send_msg(struct firedtv *fdtv, void *arg) | ||
| 148 | { | ||
| 149 | struct ca_msg *msg = arg; | ||
| 150 | int err; | ||
| 151 | |||
| 152 | /* Do we need a semaphore for this? */ | ||
| 153 | fdtv->ca_last_command = | ||
| 154 | (msg->msg[0] << 16) + (msg->msg[1] << 8) + msg->msg[2]; | ||
| 155 | switch (fdtv->ca_last_command) { | ||
| 156 | case EN50221_TAG_CA_PMT: | ||
| 157 | err = fdtv_ca_pmt(fdtv, arg); | ||
| 158 | break; | ||
| 159 | case EN50221_TAG_APP_INFO_ENQUIRY: | ||
| 160 | /* handled in ca_get_msg */ | ||
| 161 | err = 0; | ||
| 162 | break; | ||
| 163 | case EN50221_TAG_CA_INFO_ENQUIRY: | ||
| 164 | /* handled in ca_get_msg */ | ||
| 165 | err = 0; | ||
| 166 | break; | ||
| 167 | case EN50221_TAG_ENTER_MENU: | ||
| 168 | err = avc_ca_enter_menu(fdtv); | ||
| 169 | break; | ||
| 170 | default: | ||
| 171 | dev_err(fdtv->device, "unhandled CA message 0x%08x\n", | ||
| 172 | fdtv->ca_last_command); | ||
| 173 | err = -EFAULT; | ||
| 174 | } | ||
| 175 | return err; | ||
| 176 | } | ||
| 177 | |||
| 178 | static int fdtv_ca_ioctl(struct inode *inode, struct file *file, | ||
| 179 | unsigned int cmd, void *arg) | ||
| 180 | { | ||
| 181 | struct dvb_device *dvbdev = file->private_data; | ||
| 182 | struct firedtv *fdtv = dvbdev->priv; | ||
| 183 | struct firedtv_tuner_status stat; | ||
| 184 | int err; | ||
| 185 | |||
| 186 | switch (cmd) { | ||
| 187 | case CA_RESET: | ||
| 188 | err = fdtv_ca_reset(fdtv); | ||
| 189 | break; | ||
| 190 | case CA_GET_CAP: | ||
| 191 | err = fdtv_ca_get_caps(arg); | ||
| 192 | break; | ||
| 193 | case CA_GET_SLOT_INFO: | ||
| 194 | err = fdtv_ca_get_slot_info(fdtv, arg); | ||
| 195 | break; | ||
| 196 | case CA_GET_MSG: | ||
| 197 | err = fdtv_ca_get_msg(fdtv, arg); | ||
| 198 | break; | ||
| 199 | case CA_SEND_MSG: | ||
| 200 | err = fdtv_ca_send_msg(fdtv, arg); | ||
| 201 | break; | ||
| 202 | default: | ||
| 203 | dev_info(fdtv->device, "unhandled CA ioctl %u\n", cmd); | ||
| 204 | err = -EOPNOTSUPP; | ||
| 205 | } | ||
| 206 | |||
| 207 | /* FIXME Is this necessary? */ | ||
| 208 | avc_tuner_status(fdtv, &stat); | ||
| 209 | |||
| 210 | return err; | ||
| 211 | } | ||
| 212 | |||
| 213 | static unsigned int fdtv_ca_io_poll(struct file *file, poll_table *wait) | ||
| 214 | { | ||
| 215 | return POLLIN; | ||
| 216 | } | ||
| 217 | |||
| 218 | static struct file_operations fdtv_ca_fops = { | ||
| 219 | .owner = THIS_MODULE, | ||
| 220 | .ioctl = dvb_generic_ioctl, | ||
| 221 | .open = dvb_generic_open, | ||
| 222 | .release = dvb_generic_release, | ||
| 223 | .poll = fdtv_ca_io_poll, | ||
| 224 | }; | ||
| 225 | |||
| 226 | static struct dvb_device fdtv_ca = { | ||
| 227 | .users = 1, | ||
| 228 | .readers = 1, | ||
| 229 | .writers = 1, | ||
| 230 | .fops = &fdtv_ca_fops, | ||
| 231 | .kernel_ioctl = fdtv_ca_ioctl, | ||
| 232 | }; | ||
| 233 | |||
| 234 | int fdtv_ca_register(struct firedtv *fdtv) | ||
| 235 | { | ||
| 236 | struct firedtv_tuner_status stat; | ||
| 237 | int err; | ||
| 238 | |||
| 239 | if (avc_tuner_status(fdtv, &stat)) | ||
| 240 | return -EINVAL; | ||
| 241 | |||
| 242 | if (!fdtv_ca_ready(&stat)) | ||
| 243 | return -EFAULT; | ||
| 244 | |||
| 245 | err = dvb_register_device(&fdtv->adapter, &fdtv->cadev, | ||
| 246 | &fdtv_ca, fdtv, DVB_DEVICE_CA); | ||
| 247 | |||
| 248 | if (stat.ca_application_info == 0) | ||
| 249 | dev_err(fdtv->device, "CaApplicationInfo is not set\n"); | ||
| 250 | if (stat.ca_date_time_request == 1) | ||
| 251 | avc_ca_get_time_date(fdtv, &fdtv->ca_time_interval); | ||
| 252 | |||
| 253 | return err; | ||
| 254 | } | ||
| 255 | |||
| 256 | void fdtv_ca_release(struct firedtv *fdtv) | ||
| 257 | { | ||
| 258 | if (fdtv->cadev) | ||
| 259 | dvb_unregister_device(fdtv->cadev); | ||
| 260 | } | ||
diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c new file mode 100644 index 000000000000..9d308dd32a5c --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-dvb.c | |||
| @@ -0,0 +1,364 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License as | ||
| 9 | * published by the Free Software Foundation; either version 2 of | ||
| 10 | * the License, or (at your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/bitops.h> | ||
| 14 | #include <linux/device.h> | ||
| 15 | #include <linux/errno.h> | ||
| 16 | #include <linux/kernel.h> | ||
| 17 | #include <linux/mod_devicetable.h> | ||
| 18 | #include <linux/module.h> | ||
| 19 | #include <linux/mutex.h> | ||
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/string.h> | ||
| 22 | #include <linux/types.h> | ||
| 23 | #include <linux/wait.h> | ||
| 24 | #include <linux/workqueue.h> | ||
| 25 | |||
| 26 | #include <dmxdev.h> | ||
| 27 | #include <dvb_demux.h> | ||
| 28 | #include <dvbdev.h> | ||
| 29 | #include <dvb_frontend.h> | ||
| 30 | |||
| 31 | #include "firedtv.h" | ||
| 32 | |||
| 33 | static int alloc_channel(struct firedtv *fdtv) | ||
| 34 | { | ||
| 35 | int i; | ||
| 36 | |||
| 37 | for (i = 0; i < 16; i++) | ||
| 38 | if (!__test_and_set_bit(i, &fdtv->channel_active)) | ||
| 39 | break; | ||
| 40 | return i; | ||
| 41 | } | ||
| 42 | |||
| 43 | static void collect_channels(struct firedtv *fdtv, int *pidc, u16 pid[]) | ||
| 44 | { | ||
| 45 | int i, n; | ||
| 46 | |||
| 47 | for (i = 0, n = 0; i < 16; i++) | ||
| 48 | if (test_bit(i, &fdtv->channel_active)) | ||
| 49 | pid[n++] = fdtv->channel_pid[i]; | ||
| 50 | *pidc = n; | ||
| 51 | } | ||
| 52 | |||
| 53 | static inline void dealloc_channel(struct firedtv *fdtv, int i) | ||
| 54 | { | ||
| 55 | __clear_bit(i, &fdtv->channel_active); | ||
| 56 | } | ||
| 57 | |||
| 58 | int fdtv_start_feed(struct dvb_demux_feed *dvbdmxfeed) | ||
| 59 | { | ||
| 60 | struct firedtv *fdtv = dvbdmxfeed->demux->priv; | ||
| 61 | int pidc, c, ret; | ||
| 62 | u16 pids[16]; | ||
| 63 | |||
| 64 | switch (dvbdmxfeed->type) { | ||
| 65 | case DMX_TYPE_TS: | ||
| 66 | case DMX_TYPE_SEC: | ||
| 67 | break; | ||
| 68 | default: | ||
| 69 | dev_err(fdtv->device, "can't start dmx feed: invalid type %u\n", | ||
| 70 | dvbdmxfeed->type); | ||
| 71 | return -EINVAL; | ||
| 72 | } | ||
| 73 | |||
| 74 | if (mutex_lock_interruptible(&fdtv->demux_mutex)) | ||
| 75 | return -EINTR; | ||
| 76 | |||
| 77 | if (dvbdmxfeed->type == DMX_TYPE_TS) { | ||
| 78 | switch (dvbdmxfeed->pes_type) { | ||
| 79 | case DMX_TS_PES_VIDEO: | ||
| 80 | case DMX_TS_PES_AUDIO: | ||
| 81 | case DMX_TS_PES_TELETEXT: | ||
| 82 | case DMX_TS_PES_PCR: | ||
| 83 | case DMX_TS_PES_OTHER: | ||
| 84 | c = alloc_channel(fdtv); | ||
| 85 | break; | ||
| 86 | default: | ||
| 87 | dev_err(fdtv->device, | ||
| 88 | "can't start dmx feed: invalid pes type %u\n", | ||
| 89 | dvbdmxfeed->pes_type); | ||
| 90 | ret = -EINVAL; | ||
| 91 | goto out; | ||
| 92 | } | ||
| 93 | } else { | ||
| 94 | c = alloc_channel(fdtv); | ||
| 95 | } | ||
| 96 | |||
| 97 | if (c > 15) { | ||
| 98 | dev_err(fdtv->device, "can't start dmx feed: busy\n"); | ||
| 99 | ret = -EBUSY; | ||
| 100 | goto out; | ||
| 101 | } | ||
| 102 | |||
| 103 | dvbdmxfeed->priv = (typeof(dvbdmxfeed->priv))(unsigned long)c; | ||
| 104 | fdtv->channel_pid[c] = dvbdmxfeed->pid; | ||
| 105 | collect_channels(fdtv, &pidc, pids); | ||
| 106 | |||
| 107 | if (dvbdmxfeed->pid == 8192) { | ||
| 108 | ret = avc_tuner_get_ts(fdtv); | ||
| 109 | if (ret) { | ||
| 110 | dealloc_channel(fdtv, c); | ||
| 111 | dev_err(fdtv->device, "can't get TS\n"); | ||
| 112 | goto out; | ||
| 113 | } | ||
| 114 | } else { | ||
| 115 | ret = avc_tuner_set_pids(fdtv, pidc, pids); | ||
| 116 | if (ret) { | ||
| 117 | dealloc_channel(fdtv, c); | ||
| 118 | dev_err(fdtv->device, "can't set PIDs\n"); | ||
| 119 | goto out; | ||
| 120 | } | ||
| 121 | } | ||
| 122 | out: | ||
| 123 | mutex_unlock(&fdtv->demux_mutex); | ||
| 124 | |||
| 125 | return ret; | ||
| 126 | } | ||
| 127 | |||
| 128 | int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed) | ||
| 129 | { | ||
| 130 | struct dvb_demux *demux = dvbdmxfeed->demux; | ||
| 131 | struct firedtv *fdtv = demux->priv; | ||
| 132 | int pidc, c, ret; | ||
| 133 | u16 pids[16]; | ||
| 134 | |||
| 135 | if (dvbdmxfeed->type == DMX_TYPE_TS && | ||
| 136 | !((dvbdmxfeed->ts_type & TS_PACKET) && | ||
| 137 | (demux->dmx.frontend->source != DMX_MEMORY_FE))) { | ||
| 138 | |||
| 139 | if (dvbdmxfeed->ts_type & TS_DECODER) { | ||
| 140 | if (dvbdmxfeed->pes_type >= DMX_TS_PES_OTHER || | ||
| 141 | !demux->pesfilter[dvbdmxfeed->pes_type]) | ||
| 142 | return -EINVAL; | ||
| 143 | |||
| 144 | demux->pids[dvbdmxfeed->pes_type] |= 0x8000; | ||
| 145 | demux->pesfilter[dvbdmxfeed->pes_type] = NULL; | ||
| 146 | } | ||
| 147 | |||
| 148 | if (!(dvbdmxfeed->ts_type & TS_DECODER && | ||
| 149 | dvbdmxfeed->pes_type < DMX_TS_PES_OTHER)) | ||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | if (mutex_lock_interruptible(&fdtv->demux_mutex)) | ||
| 154 | return -EINTR; | ||
| 155 | |||
| 156 | c = (unsigned long)dvbdmxfeed->priv; | ||
| 157 | dealloc_channel(fdtv, c); | ||
| 158 | collect_channels(fdtv, &pidc, pids); | ||
| 159 | |||
| 160 | ret = avc_tuner_set_pids(fdtv, pidc, pids); | ||
| 161 | |||
| 162 | mutex_unlock(&fdtv->demux_mutex); | ||
| 163 | |||
| 164 | return ret; | ||
| 165 | } | ||
| 166 | |||
| 167 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | ||
| 168 | |||
| 169 | int fdtv_dvb_register(struct firedtv *fdtv) | ||
| 170 | { | ||
| 171 | int err; | ||
| 172 | |||
| 173 | err = dvb_register_adapter(&fdtv->adapter, fdtv_model_names[fdtv->type], | ||
| 174 | THIS_MODULE, fdtv->device, adapter_nr); | ||
| 175 | if (err < 0) | ||
| 176 | goto fail_log; | ||
| 177 | |||
| 178 | /*DMX_TS_FILTERING | DMX_SECTION_FILTERING*/ | ||
| 179 | fdtv->demux.dmx.capabilities = 0; | ||
| 180 | |||
| 181 | fdtv->demux.priv = fdtv; | ||
| 182 | fdtv->demux.filternum = 16; | ||
| 183 | fdtv->demux.feednum = 16; | ||
| 184 | fdtv->demux.start_feed = fdtv_start_feed; | ||
| 185 | fdtv->demux.stop_feed = fdtv_stop_feed; | ||
| 186 | fdtv->demux.write_to_decoder = NULL; | ||
| 187 | |||
| 188 | err = dvb_dmx_init(&fdtv->demux); | ||
| 189 | if (err) | ||
| 190 | goto fail_unreg_adapter; | ||
| 191 | |||
| 192 | fdtv->dmxdev.filternum = 16; | ||
| 193 | fdtv->dmxdev.demux = &fdtv->demux.dmx; | ||
| 194 | fdtv->dmxdev.capabilities = 0; | ||
| 195 | |||
| 196 | err = dvb_dmxdev_init(&fdtv->dmxdev, &fdtv->adapter); | ||
| 197 | if (err) | ||
| 198 | goto fail_dmx_release; | ||
| 199 | |||
| 200 | fdtv->frontend.source = DMX_FRONTEND_0; | ||
| 201 | |||
| 202 | err = fdtv->demux.dmx.add_frontend(&fdtv->demux.dmx, &fdtv->frontend); | ||
| 203 | if (err) | ||
| 204 | goto fail_dmxdev_release; | ||
| 205 | |||
| 206 | err = fdtv->demux.dmx.connect_frontend(&fdtv->demux.dmx, | ||
| 207 | &fdtv->frontend); | ||
| 208 | if (err) | ||
| 209 | goto fail_rem_frontend; | ||
| 210 | |||
| 211 | dvb_net_init(&fdtv->adapter, &fdtv->dvbnet, &fdtv->demux.dmx); | ||
| 212 | |||
| 213 | fdtv_frontend_init(fdtv); | ||
| 214 | err = dvb_register_frontend(&fdtv->adapter, &fdtv->fe); | ||
| 215 | if (err) | ||
| 216 | goto fail_net_release; | ||
| 217 | |||
| 218 | err = fdtv_ca_register(fdtv); | ||
| 219 | if (err) | ||
| 220 | dev_info(fdtv->device, | ||
| 221 | "Conditional Access Module not enabled\n"); | ||
| 222 | return 0; | ||
| 223 | |||
| 224 | fail_net_release: | ||
| 225 | dvb_net_release(&fdtv->dvbnet); | ||
| 226 | fdtv->demux.dmx.close(&fdtv->demux.dmx); | ||
| 227 | fail_rem_frontend: | ||
| 228 | fdtv->demux.dmx.remove_frontend(&fdtv->demux.dmx, &fdtv->frontend); | ||
| 229 | fail_dmxdev_release: | ||
| 230 | dvb_dmxdev_release(&fdtv->dmxdev); | ||
| 231 | fail_dmx_release: | ||
| 232 | dvb_dmx_release(&fdtv->demux); | ||
| 233 | fail_unreg_adapter: | ||
| 234 | dvb_unregister_adapter(&fdtv->adapter); | ||
| 235 | fail_log: | ||
| 236 | dev_err(fdtv->device, "DVB initialization failed\n"); | ||
| 237 | return err; | ||
| 238 | } | ||
| 239 | |||
| 240 | void fdtv_dvb_unregister(struct firedtv *fdtv) | ||
| 241 | { | ||
| 242 | fdtv_ca_release(fdtv); | ||
| 243 | dvb_unregister_frontend(&fdtv->fe); | ||
| 244 | dvb_net_release(&fdtv->dvbnet); | ||
| 245 | fdtv->demux.dmx.close(&fdtv->demux.dmx); | ||
| 246 | fdtv->demux.dmx.remove_frontend(&fdtv->demux.dmx, &fdtv->frontend); | ||
| 247 | dvb_dmxdev_release(&fdtv->dmxdev); | ||
| 248 | dvb_dmx_release(&fdtv->demux); | ||
| 249 | dvb_unregister_adapter(&fdtv->adapter); | ||
| 250 | } | ||
| 251 | |||
| 252 | const char *fdtv_model_names[] = { | ||
| 253 | [FIREDTV_UNKNOWN] = "unknown type", | ||
| 254 | [FIREDTV_DVB_S] = "FireDTV S/CI", | ||
| 255 | [FIREDTV_DVB_C] = "FireDTV C/CI", | ||
| 256 | [FIREDTV_DVB_T] = "FireDTV T/CI", | ||
| 257 | [FIREDTV_DVB_S2] = "FireDTV S2 ", | ||
| 258 | }; | ||
| 259 | |||
| 260 | struct firedtv *fdtv_alloc(struct device *dev, | ||
| 261 | const struct firedtv_backend *backend, | ||
| 262 | const char *name, size_t name_len) | ||
| 263 | { | ||
| 264 | struct firedtv *fdtv; | ||
| 265 | int i; | ||
| 266 | |||
| 267 | fdtv = kzalloc(sizeof(*fdtv), GFP_KERNEL); | ||
| 268 | if (!fdtv) | ||
| 269 | return NULL; | ||
| 270 | |||
| 271 | dev->driver_data = fdtv; | ||
| 272 | fdtv->device = dev; | ||
| 273 | fdtv->isochannel = -1; | ||
| 274 | fdtv->voltage = 0xff; | ||
| 275 | fdtv->tone = 0xff; | ||
| 276 | fdtv->backend = backend; | ||
| 277 | |||
| 278 | mutex_init(&fdtv->avc_mutex); | ||
| 279 | init_waitqueue_head(&fdtv->avc_wait); | ||
| 280 | fdtv->avc_reply_received = true; | ||
| 281 | mutex_init(&fdtv->demux_mutex); | ||
| 282 | INIT_WORK(&fdtv->remote_ctrl_work, avc_remote_ctrl_work); | ||
| 283 | |||
| 284 | for (i = ARRAY_SIZE(fdtv_model_names); --i; ) | ||
| 285 | if (strlen(fdtv_model_names[i]) <= name_len && | ||
| 286 | strncmp(name, fdtv_model_names[i], name_len) == 0) | ||
| 287 | break; | ||
| 288 | fdtv->type = i; | ||
| 289 | |||
| 290 | return fdtv; | ||
| 291 | } | ||
| 292 | |||
| 293 | #define MATCH_FLAGS (IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID | \ | ||
| 294 | IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION) | ||
| 295 | |||
| 296 | #define DIGITAL_EVERYWHERE_OUI 0x001287 | ||
| 297 | #define AVC_UNIT_SPEC_ID_ENTRY 0x00a02d | ||
| 298 | #define AVC_SW_VERSION_ENTRY 0x010001 | ||
| 299 | |||
| 300 | static struct ieee1394_device_id fdtv_id_table[] = { | ||
| 301 | { | ||
| 302 | /* FloppyDTV S/CI and FloppyDTV S2 */ | ||
| 303 | .match_flags = MATCH_FLAGS, | ||
| 304 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 305 | .model_id = 0x000024, | ||
| 306 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 307 | .version = AVC_SW_VERSION_ENTRY, | ||
| 308 | }, { | ||
| 309 | /* FloppyDTV T/CI */ | ||
| 310 | .match_flags = MATCH_FLAGS, | ||
| 311 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 312 | .model_id = 0x000025, | ||
| 313 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 314 | .version = AVC_SW_VERSION_ENTRY, | ||
| 315 | }, { | ||
| 316 | /* FloppyDTV C/CI */ | ||
| 317 | .match_flags = MATCH_FLAGS, | ||
| 318 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 319 | .model_id = 0x000026, | ||
| 320 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 321 | .version = AVC_SW_VERSION_ENTRY, | ||
| 322 | }, { | ||
| 323 | /* FireDTV S/CI and FloppyDTV S2 */ | ||
| 324 | .match_flags = MATCH_FLAGS, | ||
| 325 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 326 | .model_id = 0x000034, | ||
| 327 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 328 | .version = AVC_SW_VERSION_ENTRY, | ||
| 329 | }, { | ||
| 330 | /* FireDTV T/CI */ | ||
| 331 | .match_flags = MATCH_FLAGS, | ||
| 332 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 333 | .model_id = 0x000035, | ||
| 334 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 335 | .version = AVC_SW_VERSION_ENTRY, | ||
| 336 | }, { | ||
| 337 | /* FireDTV C/CI */ | ||
| 338 | .match_flags = MATCH_FLAGS, | ||
| 339 | .vendor_id = DIGITAL_EVERYWHERE_OUI, | ||
| 340 | .model_id = 0x000036, | ||
| 341 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY, | ||
| 342 | .version = AVC_SW_VERSION_ENTRY, | ||
| 343 | }, {} | ||
| 344 | }; | ||
| 345 | MODULE_DEVICE_TABLE(ieee1394, fdtv_id_table); | ||
| 346 | |||
| 347 | static int __init fdtv_init(void) | ||
| 348 | { | ||
| 349 | return fdtv_1394_init(fdtv_id_table); | ||
| 350 | } | ||
| 351 | |||
| 352 | static void __exit fdtv_exit(void) | ||
| 353 | { | ||
| 354 | fdtv_1394_exit(); | ||
| 355 | } | ||
| 356 | |||
| 357 | module_init(fdtv_init); | ||
| 358 | module_exit(fdtv_exit); | ||
| 359 | |||
| 360 | MODULE_AUTHOR("Andreas Monitzer <andy@monitzer.com>"); | ||
| 361 | MODULE_AUTHOR("Ben Backx <ben@bbackx.com>"); | ||
| 362 | MODULE_DESCRIPTION("FireDTV DVB Driver"); | ||
| 363 | MODULE_LICENSE("GPL"); | ||
| 364 | MODULE_SUPPORTED_DEVICE("FireDTV DVB"); | ||
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c new file mode 100644 index 000000000000..7ba43630a25d --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-fe.c | |||
| @@ -0,0 +1,247 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License as | ||
| 9 | * published by the Free Software Foundation; either version 2 of | ||
| 10 | * the License, or (at your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/device.h> | ||
| 14 | #include <linux/errno.h> | ||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/string.h> | ||
| 17 | #include <linux/types.h> | ||
| 18 | |||
| 19 | #include <dvb_frontend.h> | ||
| 20 | |||
| 21 | #include "firedtv.h" | ||
| 22 | |||
| 23 | static int fdtv_dvb_init(struct dvb_frontend *fe) | ||
| 24 | { | ||
| 25 | struct firedtv *fdtv = fe->sec_priv; | ||
| 26 | int err; | ||
| 27 | |||
| 28 | /* FIXME - allocate free channel at IRM */ | ||
| 29 | fdtv->isochannel = fdtv->adapter.num; | ||
| 30 | |||
| 31 | err = cmp_establish_pp_connection(fdtv, fdtv->subunit, | ||
| 32 | fdtv->isochannel); | ||
| 33 | if (err) { | ||
| 34 | dev_err(fdtv->device, | ||
| 35 | "could not establish point to point connection\n"); | ||
| 36 | return err; | ||
| 37 | } | ||
| 38 | |||
| 39 | return fdtv->backend->start_iso(fdtv); | ||
| 40 | } | ||
| 41 | |||
| 42 | static int fdtv_sleep(struct dvb_frontend *fe) | ||
| 43 | { | ||
| 44 | struct firedtv *fdtv = fe->sec_priv; | ||
| 45 | |||
| 46 | fdtv->backend->stop_iso(fdtv); | ||
| 47 | cmp_break_pp_connection(fdtv, fdtv->subunit, fdtv->isochannel); | ||
| 48 | fdtv->isochannel = -1; | ||
| 49 | return 0; | ||
| 50 | } | ||
| 51 | |||
| 52 | #define LNBCONTROL_DONTCARE 0xff | ||
| 53 | |||
| 54 | static int fdtv_diseqc_send_master_cmd(struct dvb_frontend *fe, | ||
| 55 | struct dvb_diseqc_master_cmd *cmd) | ||
| 56 | { | ||
| 57 | struct firedtv *fdtv = fe->sec_priv; | ||
| 58 | |||
| 59 | return avc_lnb_control(fdtv, LNBCONTROL_DONTCARE, LNBCONTROL_DONTCARE, | ||
| 60 | LNBCONTROL_DONTCARE, 1, cmd); | ||
| 61 | } | ||
| 62 | |||
| 63 | static int fdtv_diseqc_send_burst(struct dvb_frontend *fe, | ||
| 64 | fe_sec_mini_cmd_t minicmd) | ||
| 65 | { | ||
| 66 | return 0; | ||
| 67 | } | ||
| 68 | |||
| 69 | static int fdtv_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone) | ||
| 70 | { | ||
| 71 | struct firedtv *fdtv = fe->sec_priv; | ||
| 72 | |||
| 73 | fdtv->tone = tone; | ||
| 74 | return 0; | ||
| 75 | } | ||
| 76 | |||
| 77 | static int fdtv_set_voltage(struct dvb_frontend *fe, | ||
| 78 | fe_sec_voltage_t voltage) | ||
| 79 | { | ||
| 80 | struct firedtv *fdtv = fe->sec_priv; | ||
| 81 | |||
| 82 | fdtv->voltage = voltage; | ||
| 83 | return 0; | ||
| 84 | } | ||
| 85 | |||
| 86 | static int fdtv_read_status(struct dvb_frontend *fe, fe_status_t *status) | ||
| 87 | { | ||
| 88 | struct firedtv *fdtv = fe->sec_priv; | ||
| 89 | struct firedtv_tuner_status stat; | ||
| 90 | |||
| 91 | if (avc_tuner_status(fdtv, &stat)) | ||
| 92 | return -EINVAL; | ||
| 93 | |||
| 94 | if (stat.no_rf) | ||
| 95 | *status = 0; | ||
| 96 | else | ||
| 97 | *status = FE_HAS_SIGNAL | FE_HAS_VITERBI | FE_HAS_SYNC | | ||
| 98 | FE_HAS_CARRIER | FE_HAS_LOCK; | ||
| 99 | return 0; | ||
| 100 | } | ||
| 101 | |||
| 102 | static int fdtv_read_ber(struct dvb_frontend *fe, u32 *ber) | ||
| 103 | { | ||
| 104 | struct firedtv *fdtv = fe->sec_priv; | ||
| 105 | struct firedtv_tuner_status stat; | ||
| 106 | |||
| 107 | if (avc_tuner_status(fdtv, &stat)) | ||
| 108 | return -EINVAL; | ||
| 109 | |||
| 110 | *ber = stat.ber; | ||
| 111 | return 0; | ||
| 112 | } | ||
| 113 | |||
| 114 | static int fdtv_read_signal_strength(struct dvb_frontend *fe, u16 *strength) | ||
| 115 | { | ||
| 116 | struct firedtv *fdtv = fe->sec_priv; | ||
| 117 | struct firedtv_tuner_status stat; | ||
| 118 | |||
| 119 | if (avc_tuner_status(fdtv, &stat)) | ||
| 120 | return -EINVAL; | ||
| 121 | |||
| 122 | *strength = stat.signal_strength << 8; | ||
| 123 | return 0; | ||
| 124 | } | ||
| 125 | |||
| 126 | static int fdtv_read_snr(struct dvb_frontend *fe, u16 *snr) | ||
| 127 | { | ||
| 128 | struct firedtv *fdtv = fe->sec_priv; | ||
| 129 | struct firedtv_tuner_status stat; | ||
| 130 | |||
| 131 | if (avc_tuner_status(fdtv, &stat)) | ||
| 132 | return -EINVAL; | ||
| 133 | |||
| 134 | /* C/N[dB] = -10 * log10(snr / 65535) */ | ||
| 135 | *snr = stat.carrier_noise_ratio * 257; | ||
| 136 | return 0; | ||
| 137 | } | ||
| 138 | |||
| 139 | static int fdtv_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ucblocks) | ||
| 140 | { | ||
| 141 | return -EOPNOTSUPP; | ||
| 142 | } | ||
| 143 | |||
| 144 | #define ACCEPTED 0x9 | ||
| 145 | |||
| 146 | static int fdtv_set_frontend(struct dvb_frontend *fe, | ||
| 147 | struct dvb_frontend_parameters *params) | ||
| 148 | { | ||
| 149 | struct firedtv *fdtv = fe->sec_priv; | ||
| 150 | |||
| 151 | /* FIXME: avc_tuner_dsd never returns ACCEPTED. Check status? */ | ||
| 152 | if (avc_tuner_dsd(fdtv, params) != ACCEPTED) | ||
| 153 | return -EINVAL; | ||
| 154 | else | ||
| 155 | return 0; /* not sure of this... */ | ||
| 156 | } | ||
| 157 | |||
| 158 | static int fdtv_get_frontend(struct dvb_frontend *fe, | ||
| 159 | struct dvb_frontend_parameters *params) | ||
| 160 | { | ||
| 161 | return -EOPNOTSUPP; | ||
| 162 | } | ||
| 163 | |||
| 164 | void fdtv_frontend_init(struct firedtv *fdtv) | ||
| 165 | { | ||
| 166 | struct dvb_frontend_ops *ops = &fdtv->fe.ops; | ||
| 167 | struct dvb_frontend_info *fi = &ops->info; | ||
| 168 | |||
| 169 | ops->init = fdtv_dvb_init; | ||
| 170 | ops->sleep = fdtv_sleep; | ||
| 171 | |||
| 172 | ops->set_frontend = fdtv_set_frontend; | ||
| 173 | ops->get_frontend = fdtv_get_frontend; | ||
| 174 | |||
| 175 | ops->read_status = fdtv_read_status; | ||
| 176 | ops->read_ber = fdtv_read_ber; | ||
| 177 | ops->read_signal_strength = fdtv_read_signal_strength; | ||
| 178 | ops->read_snr = fdtv_read_snr; | ||
| 179 | ops->read_ucblocks = fdtv_read_uncorrected_blocks; | ||
| 180 | |||
| 181 | ops->diseqc_send_master_cmd = fdtv_diseqc_send_master_cmd; | ||
| 182 | ops->diseqc_send_burst = fdtv_diseqc_send_burst; | ||
| 183 | ops->set_tone = fdtv_set_tone; | ||
| 184 | ops->set_voltage = fdtv_set_voltage; | ||
| 185 | |||
| 186 | switch (fdtv->type) { | ||
| 187 | case FIREDTV_DVB_S: | ||
| 188 | case FIREDTV_DVB_S2: | ||
| 189 | fi->type = FE_QPSK; | ||
| 190 | |||
| 191 | fi->frequency_min = 950000; | ||
| 192 | fi->frequency_max = 2150000; | ||
| 193 | fi->frequency_stepsize = 125; | ||
| 194 | fi->symbol_rate_min = 1000000; | ||
| 195 | fi->symbol_rate_max = 40000000; | ||
| 196 | |||
| 197 | fi->caps = FE_CAN_INVERSION_AUTO | | ||
| 198 | FE_CAN_FEC_1_2 | | ||
| 199 | FE_CAN_FEC_2_3 | | ||
| 200 | FE_CAN_FEC_3_4 | | ||
| 201 | FE_CAN_FEC_5_6 | | ||
| 202 | FE_CAN_FEC_7_8 | | ||
| 203 | FE_CAN_FEC_AUTO | | ||
| 204 | FE_CAN_QPSK; | ||
| 205 | break; | ||
| 206 | |||
| 207 | case FIREDTV_DVB_C: | ||
| 208 | fi->type = FE_QAM; | ||
| 209 | |||
| 210 | fi->frequency_min = 47000000; | ||
| 211 | fi->frequency_max = 866000000; | ||
| 212 | fi->frequency_stepsize = 62500; | ||
| 213 | fi->symbol_rate_min = 870000; | ||
| 214 | fi->symbol_rate_max = 6900000; | ||
| 215 | |||
| 216 | fi->caps = FE_CAN_INVERSION_AUTO | | ||
| 217 | FE_CAN_QAM_16 | | ||
| 218 | FE_CAN_QAM_32 | | ||
| 219 | FE_CAN_QAM_64 | | ||
| 220 | FE_CAN_QAM_128 | | ||
| 221 | FE_CAN_QAM_256 | | ||
| 222 | FE_CAN_QAM_AUTO; | ||
| 223 | break; | ||
| 224 | |||
| 225 | case FIREDTV_DVB_T: | ||
| 226 | fi->type = FE_OFDM; | ||
| 227 | |||
| 228 | fi->frequency_min = 49000000; | ||
| 229 | fi->frequency_max = 861000000; | ||
| 230 | fi->frequency_stepsize = 62500; | ||
| 231 | |||
| 232 | fi->caps = FE_CAN_INVERSION_AUTO | | ||
| 233 | FE_CAN_FEC_2_3 | | ||
| 234 | FE_CAN_TRANSMISSION_MODE_AUTO | | ||
| 235 | FE_CAN_GUARD_INTERVAL_AUTO | | ||
| 236 | FE_CAN_HIERARCHY_AUTO; | ||
| 237 | break; | ||
| 238 | |||
| 239 | default: | ||
| 240 | dev_err(fdtv->device, "no frontend for model type %d\n", | ||
| 241 | fdtv->type); | ||
| 242 | } | ||
| 243 | strcpy(fi->name, fdtv_model_names[fdtv->type]); | ||
| 244 | |||
| 245 | fdtv->fe.dvb = &fdtv->adapter; | ||
| 246 | fdtv->fe.sec_priv = fdtv; | ||
| 247 | } | ||
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/dvb/firewire/firedtv-rc.c new file mode 100644 index 000000000000..46a6324d7b73 --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv-rc.c | |||
| @@ -0,0 +1,190 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public License as | ||
| 8 | * published by the Free Software Foundation; either version 2 of | ||
| 9 | * the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/bitops.h> | ||
| 13 | #include <linux/input.h> | ||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/string.h> | ||
| 16 | #include <linux/types.h> | ||
| 17 | |||
| 18 | #include "firedtv.h" | ||
| 19 | |||
| 20 | /* fixed table with older keycodes, geared towards MythTV */ | ||
| 21 | const static u16 oldtable[] = { | ||
| 22 | |||
| 23 | /* code from device: 0x4501...0x451f */ | ||
| 24 | |||
| 25 | KEY_ESC, | ||
| 26 | KEY_F9, | ||
| 27 | KEY_1, | ||
| 28 | KEY_2, | ||
| 29 | KEY_3, | ||
| 30 | KEY_4, | ||
| 31 | KEY_5, | ||
| 32 | KEY_6, | ||
| 33 | KEY_7, | ||
| 34 | KEY_8, | ||
| 35 | KEY_9, | ||
| 36 | KEY_I, | ||
| 37 | KEY_0, | ||
| 38 | KEY_ENTER, | ||
| 39 | KEY_RED, | ||
| 40 | KEY_UP, | ||
| 41 | KEY_GREEN, | ||
| 42 | KEY_F10, | ||
| 43 | KEY_SPACE, | ||
| 44 | KEY_F11, | ||
| 45 | KEY_YELLOW, | ||
| 46 | KEY_DOWN, | ||
| 47 | KEY_BLUE, | ||
| 48 | KEY_Z, | ||
| 49 | KEY_P, | ||
| 50 | KEY_PAGEDOWN, | ||
| 51 | KEY_LEFT, | ||
| 52 | KEY_W, | ||
| 53 | KEY_RIGHT, | ||
| 54 | KEY_P, | ||
| 55 | KEY_M, | ||
| 56 | |||
| 57 | /* code from device: 0x4540...0x4542 */ | ||
| 58 | |||
| 59 | KEY_R, | ||
| 60 | KEY_V, | ||
| 61 | KEY_C, | ||
| 62 | }; | ||
| 63 | |||
| 64 | /* user-modifiable table for a remote as sold in 2008 */ | ||
| 65 | const static u16 keytable[] = { | ||
| 66 | |||
| 67 | /* code from device: 0x0300...0x031f */ | ||
| 68 | |||
| 69 | [0x00] = KEY_POWER, | ||
| 70 | [0x01] = KEY_SLEEP, | ||
| 71 | [0x02] = KEY_STOP, | ||
| 72 | [0x03] = KEY_OK, | ||
| 73 | [0x04] = KEY_RIGHT, | ||
| 74 | [0x05] = KEY_1, | ||
| 75 | [0x06] = KEY_2, | ||
| 76 | [0x07] = KEY_3, | ||
| 77 | [0x08] = KEY_LEFT, | ||
| 78 | [0x09] = KEY_4, | ||
| 79 | [0x0a] = KEY_5, | ||
| 80 | [0x0b] = KEY_6, | ||
| 81 | [0x0c] = KEY_UP, | ||
| 82 | [0x0d] = KEY_7, | ||
| 83 | [0x0e] = KEY_8, | ||
| 84 | [0x0f] = KEY_9, | ||
| 85 | [0x10] = KEY_DOWN, | ||
| 86 | [0x11] = KEY_TITLE, /* "OSD" - fixme */ | ||
| 87 | [0x12] = KEY_0, | ||
| 88 | [0x13] = KEY_F20, /* "16:9" - fixme */ | ||
| 89 | [0x14] = KEY_SCREEN, /* "FULL" - fixme */ | ||
| 90 | [0x15] = KEY_MUTE, | ||
| 91 | [0x16] = KEY_SUBTITLE, | ||
| 92 | [0x17] = KEY_RECORD, | ||
| 93 | [0x18] = KEY_TEXT, | ||
| 94 | [0x19] = KEY_AUDIO, | ||
| 95 | [0x1a] = KEY_RED, | ||
| 96 | [0x1b] = KEY_PREVIOUS, | ||
| 97 | [0x1c] = KEY_REWIND, | ||
| 98 | [0x1d] = KEY_PLAYPAUSE, | ||
| 99 | [0x1e] = KEY_NEXT, | ||
| 100 | [0x1f] = KEY_VOLUMEUP, | ||
| 101 | |||
| 102 | /* code from device: 0x0340...0x0354 */ | ||
| 103 | |||
| 104 | [0x20] = KEY_CHANNELUP, | ||
| 105 | [0x21] = KEY_F21, /* "4:3" - fixme */ | ||
| 106 | [0x22] = KEY_TV, | ||
| 107 | [0x23] = KEY_DVD, | ||
| 108 | [0x24] = KEY_VCR, | ||
| 109 | [0x25] = KEY_AUX, | ||
| 110 | [0x26] = KEY_GREEN, | ||
| 111 | [0x27] = KEY_YELLOW, | ||
| 112 | [0x28] = KEY_BLUE, | ||
| 113 | [0x29] = KEY_CHANNEL, /* "CH.LIST" */ | ||
| 114 | [0x2a] = KEY_VENDOR, /* "CI" - fixme */ | ||
| 115 | [0x2b] = KEY_VOLUMEDOWN, | ||
| 116 | [0x2c] = KEY_CHANNELDOWN, | ||
| 117 | [0x2d] = KEY_LAST, | ||
| 118 | [0x2e] = KEY_INFO, | ||
| 119 | [0x2f] = KEY_FORWARD, | ||
| 120 | [0x30] = KEY_LIST, | ||
| 121 | [0x31] = KEY_FAVORITES, | ||
| 122 | [0x32] = KEY_MENU, | ||
| 123 | [0x33] = KEY_EPG, | ||
| 124 | [0x34] = KEY_EXIT, | ||
| 125 | }; | ||
| 126 | |||
| 127 | int fdtv_register_rc(struct firedtv *fdtv, struct device *dev) | ||
| 128 | { | ||
| 129 | struct input_dev *idev; | ||
| 130 | int i, err; | ||
| 131 | |||
| 132 | idev = input_allocate_device(); | ||
| 133 | if (!idev) | ||
| 134 | return -ENOMEM; | ||
| 135 | |||
| 136 | fdtv->remote_ctrl_dev = idev; | ||
| 137 | idev->name = "FireDTV remote control"; | ||
| 138 | idev->dev.parent = dev; | ||
| 139 | idev->evbit[0] = BIT_MASK(EV_KEY); | ||
| 140 | idev->keycode = kmemdup(keytable, sizeof(keytable), GFP_KERNEL); | ||
| 141 | if (!idev->keycode) { | ||
| 142 | err = -ENOMEM; | ||
| 143 | goto fail; | ||
| 144 | } | ||
| 145 | idev->keycodesize = sizeof(keytable[0]); | ||
| 146 | idev->keycodemax = ARRAY_SIZE(keytable); | ||
| 147 | |||
| 148 | for (i = 0; i < ARRAY_SIZE(keytable); i++) | ||
| 149 | set_bit(keytable[i], idev->keybit); | ||
| 150 | |||
| 151 | err = input_register_device(idev); | ||
| 152 | if (err) | ||
| 153 | goto fail_free_keymap; | ||
| 154 | |||
| 155 | return 0; | ||
| 156 | |||
| 157 | fail_free_keymap: | ||
| 158 | kfree(idev->keycode); | ||
| 159 | fail: | ||
| 160 | input_free_device(idev); | ||
| 161 | return err; | ||
| 162 | } | ||
| 163 | |||
| 164 | void fdtv_unregister_rc(struct firedtv *fdtv) | ||
| 165 | { | ||
| 166 | kfree(fdtv->remote_ctrl_dev->keycode); | ||
| 167 | input_unregister_device(fdtv->remote_ctrl_dev); | ||
| 168 | } | ||
| 169 | |||
| 170 | void fdtv_handle_rc(struct firedtv *fdtv, unsigned int code) | ||
| 171 | { | ||
| 172 | u16 *keycode = fdtv->remote_ctrl_dev->keycode; | ||
| 173 | |||
| 174 | if (code >= 0x0300 && code <= 0x031f) | ||
| 175 | code = keycode[code - 0x0300]; | ||
| 176 | else if (code >= 0x0340 && code <= 0x0354) | ||
| 177 | code = keycode[code - 0x0320]; | ||
| 178 | else if (code >= 0x4501 && code <= 0x451f) | ||
| 179 | code = oldtable[code - 0x4501]; | ||
| 180 | else if (code >= 0x4540 && code <= 0x4542) | ||
| 181 | code = oldtable[code - 0x4521]; | ||
| 182 | else { | ||
| 183 | printk(KERN_DEBUG "firedtv: invalid key code 0x%04x " | ||
| 184 | "from remote control\n", code); | ||
| 185 | return; | ||
| 186 | } | ||
| 187 | |||
| 188 | input_report_key(fdtv->remote_ctrl_dev, code, 1); | ||
| 189 | input_report_key(fdtv->remote_ctrl_dev, code, 0); | ||
| 190 | } | ||
diff --git a/drivers/media/dvb/firewire/firedtv.h b/drivers/media/dvb/firewire/firedtv.h new file mode 100644 index 000000000000..d48530b81e61 --- /dev/null +++ b/drivers/media/dvb/firewire/firedtv.h | |||
| @@ -0,0 +1,182 @@ | |||
| 1 | /* | ||
| 2 | * FireDTV driver (formerly known as FireSAT) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Andreas Monitzer <andy@monitzer.com> | ||
| 5 | * Copyright (C) 2008 Henrik Kurelid <henrik@kurelid.se> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License as | ||
| 9 | * published by the Free Software Foundation; either version 2 of | ||
| 10 | * the License, or (at your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef _FIREDTV_H | ||
| 14 | #define _FIREDTV_H | ||
| 15 | |||
| 16 | #include <linux/dvb/dmx.h> | ||
| 17 | #include <linux/dvb/frontend.h> | ||
| 18 | #include <linux/list.h> | ||
| 19 | #include <linux/mutex.h> | ||
| 20 | #include <linux/spinlock_types.h> | ||
| 21 | #include <linux/types.h> | ||
| 22 | #include <linux/wait.h> | ||
| 23 | #include <linux/workqueue.h> | ||
| 24 | |||
| 25 | #include <demux.h> | ||
| 26 | #include <dmxdev.h> | ||
| 27 | #include <dvb_demux.h> | ||
| 28 | #include <dvb_frontend.h> | ||
| 29 | #include <dvb_net.h> | ||
| 30 | #include <dvbdev.h> | ||
| 31 | |||
| 32 | struct firedtv_tuner_status { | ||
| 33 | unsigned active_system:8; | ||
| 34 | unsigned searching:1; | ||
| 35 | unsigned moving:1; | ||
| 36 | unsigned no_rf:1; | ||
| 37 | unsigned input:1; | ||
| 38 | unsigned selected_antenna:7; | ||
| 39 | unsigned ber:32; | ||
| 40 | unsigned signal_strength:8; | ||
| 41 | unsigned raster_frequency:2; | ||
| 42 | unsigned rf_frequency:22; | ||
| 43 | unsigned man_dep_info_length:8; | ||
| 44 | unsigned front_end_error:1; | ||
| 45 | unsigned antenna_error:1; | ||
| 46 | unsigned front_end_power_status:1; | ||
| 47 | unsigned power_supply:1; | ||
| 48 | unsigned carrier_noise_ratio:16; | ||
| 49 | unsigned power_supply_voltage:8; | ||
| 50 | unsigned antenna_voltage:8; | ||
| 51 | unsigned firewire_bus_voltage:8; | ||
| 52 | unsigned ca_mmi:1; | ||
| 53 | unsigned ca_pmt_reply:1; | ||
| 54 | unsigned ca_date_time_request:1; | ||
| 55 | unsigned ca_application_info:1; | ||
| 56 | unsigned ca_module_present_status:1; | ||
| 57 | unsigned ca_dvb_flag:1; | ||
| 58 | unsigned ca_error_flag:1; | ||
| 59 | unsigned ca_initialization_status:1; | ||
| 60 | }; | ||
| 61 | |||
| 62 | enum model_type { | ||
| 63 | FIREDTV_UNKNOWN = 0, | ||
| 64 | FIREDTV_DVB_S = 1, | ||
| 65 | FIREDTV_DVB_C = 2, | ||
| 66 | FIREDTV_DVB_T = 3, | ||
| 67 | FIREDTV_DVB_S2 = 4, | ||
| 68 | }; | ||
| 69 | |||
| 70 | struct device; | ||
| 71 | struct input_dev; | ||
| 72 | struct firedtv; | ||
| 73 | |||
| 74 | struct firedtv_backend { | ||
| 75 | int (*lock)(struct firedtv *fdtv, u64 addr, void *data, __be32 arg); | ||
| 76 | int (*read)(struct firedtv *fdtv, u64 addr, void *data, size_t len); | ||
| 77 | int (*write)(struct firedtv *fdtv, u64 addr, void *data, size_t len); | ||
| 78 | int (*start_iso)(struct firedtv *fdtv); | ||
| 79 | void (*stop_iso)(struct firedtv *fdtv); | ||
| 80 | }; | ||
| 81 | |||
| 82 | struct firedtv { | ||
| 83 | struct device *device; | ||
| 84 | struct list_head list; | ||
| 85 | |||
| 86 | struct dvb_adapter adapter; | ||
| 87 | struct dmxdev dmxdev; | ||
| 88 | struct dvb_demux demux; | ||
| 89 | struct dmx_frontend frontend; | ||
| 90 | struct dvb_net dvbnet; | ||
| 91 | struct dvb_frontend fe; | ||
| 92 | |||
| 93 | struct dvb_device *cadev; | ||
| 94 | int ca_last_command; | ||
| 95 | int ca_time_interval; | ||
| 96 | |||
| 97 | struct mutex avc_mutex; | ||
| 98 | wait_queue_head_t avc_wait; | ||
| 99 | bool avc_reply_received; | ||
| 100 | struct work_struct remote_ctrl_work; | ||
| 101 | struct input_dev *remote_ctrl_dev; | ||
| 102 | |||
| 103 | enum model_type type; | ||
| 104 | char subunit; | ||
| 105 | char isochannel; | ||
| 106 | fe_sec_voltage_t voltage; | ||
| 107 | fe_sec_tone_mode_t tone; | ||
| 108 | |||
| 109 | const struct firedtv_backend *backend; | ||
| 110 | void *backend_data; | ||
| 111 | |||
| 112 | struct mutex demux_mutex; | ||
| 113 | unsigned long channel_active; | ||
| 114 | u16 channel_pid[16]; | ||
| 115 | |||
| 116 | size_t response_length; | ||
| 117 | u8 response[512]; | ||
| 118 | }; | ||
| 119 | |||
| 120 | /* firedtv-1394.c */ | ||
| 121 | #ifdef CONFIG_DVB_FIREDTV_IEEE1394 | ||
| 122 | int fdtv_1394_init(struct ieee1394_device_id id_table[]); | ||
| 123 | void fdtv_1394_exit(void); | ||
| 124 | #else | ||
| 125 | static inline int fdtv_1394_init(struct ieee1394_device_id it[]) { return 0; } | ||
| 126 | static inline void fdtv_1394_exit(void) {} | ||
| 127 | #endif | ||
| 128 | |||
| 129 | /* firedtv-avc.c */ | ||
| 130 | int avc_recv(struct firedtv *fdtv, void *data, size_t length); | ||
| 131 | int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat); | ||
| 132 | struct dvb_frontend_parameters; | ||
| 133 | int avc_tuner_dsd(struct firedtv *fdtv, struct dvb_frontend_parameters *params); | ||
| 134 | int avc_tuner_set_pids(struct firedtv *fdtv, unsigned char pidc, u16 pid[]); | ||
| 135 | int avc_tuner_get_ts(struct firedtv *fdtv); | ||
| 136 | int avc_identify_subunit(struct firedtv *fdtv); | ||
| 137 | struct dvb_diseqc_master_cmd; | ||
| 138 | int avc_lnb_control(struct firedtv *fdtv, char voltage, char burst, | ||
| 139 | char conttone, char nrdiseq, | ||
| 140 | struct dvb_diseqc_master_cmd *diseqcmd); | ||
| 141 | void avc_remote_ctrl_work(struct work_struct *work); | ||
| 142 | int avc_register_remote_control(struct firedtv *fdtv); | ||
| 143 | int avc_ca_app_info(struct firedtv *fdtv, char *app_info, unsigned int *len); | ||
| 144 | int avc_ca_info(struct firedtv *fdtv, char *app_info, unsigned int *len); | ||
| 145 | int avc_ca_reset(struct firedtv *fdtv); | ||
| 146 | int avc_ca_pmt(struct firedtv *fdtv, char *app_info, int length); | ||
| 147 | int avc_ca_get_time_date(struct firedtv *fdtv, int *interval); | ||
| 148 | int avc_ca_enter_menu(struct firedtv *fdtv); | ||
| 149 | int avc_ca_get_mmi(struct firedtv *fdtv, char *mmi_object, unsigned int *len); | ||
| 150 | int cmp_establish_pp_connection(struct firedtv *fdtv, int plug, int channel); | ||
| 151 | void cmp_break_pp_connection(struct firedtv *fdtv, int plug, int channel); | ||
| 152 | |||
| 153 | /* firedtv-ci.c */ | ||
| 154 | int fdtv_ca_register(struct firedtv *fdtv); | ||
| 155 | void fdtv_ca_release(struct firedtv *fdtv); | ||
| 156 | |||
| 157 | /* firedtv-dvb.c */ | ||
| 158 | int fdtv_start_feed(struct dvb_demux_feed *dvbdmxfeed); | ||
| 159 | int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed); | ||
| 160 | int fdtv_dvb_register(struct firedtv *fdtv); | ||
| 161 | void fdtv_dvb_unregister(struct firedtv *fdtv); | ||
| 162 | struct firedtv *fdtv_alloc(struct device *dev, | ||
| 163 | const struct firedtv_backend *backend, | ||
| 164 | const char *name, size_t name_len); | ||
| 165 | extern const char *fdtv_model_names[]; | ||
| 166 | |||
| 167 | /* firedtv-fe.c */ | ||
| 168 | void fdtv_frontend_init(struct firedtv *fdtv); | ||
| 169 | |||
| 170 | /* firedtv-rc.c */ | ||
| 171 | #ifdef CONFIG_DVB_FIREDTV_INPUT | ||
| 172 | int fdtv_register_rc(struct firedtv *fdtv, struct device *dev); | ||
| 173 | void fdtv_unregister_rc(struct firedtv *fdtv); | ||
| 174 | void fdtv_handle_rc(struct firedtv *fdtv, unsigned int code); | ||
| 175 | #else | ||
| 176 | static inline int fdtv_register_rc(struct firedtv *fdtv, | ||
| 177 | struct device *dev) { return 0; } | ||
| 178 | static inline void fdtv_unregister_rc(struct firedtv *fdtv) {} | ||
| 179 | static inline void fdtv_handle_rc(struct firedtv *fdtv, unsigned int code) {} | ||
| 180 | #endif | ||
| 181 | |||
| 182 | #endif /* _FIREDTV_H */ | ||
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 4fb86a0061d0..f18a919be70b 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
| @@ -715,6 +715,13 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode) | |||
| 715 | 715 | ||
| 716 | if (sbi->s_log_groups_per_flex) { | 716 | if (sbi->s_log_groups_per_flex) { |
| 717 | ret2 = find_group_flex(sb, dir, &group); | 717 | ret2 = find_group_flex(sb, dir, &group); |
| 718 | if (ret2 == -1) { | ||
| 719 | ret2 = find_group_other(sb, dir, &group); | ||
| 720 | if (ret2 == 0 && printk_ratelimit()) | ||
| 721 | printk(KERN_NOTICE "ext4: find_group_flex " | ||
| 722 | "failed, fallback succeeded dir %lu\n", | ||
| 723 | dir->i_ino); | ||
| 724 | } | ||
| 718 | goto got_group; | 725 | goto got_group; |
| 719 | } | 726 | } |
| 720 | 727 | ||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cbd2ca99d113..51cdd13e1c31 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -1368,6 +1368,10 @@ retry: | |||
| 1368 | goto out; | 1368 | goto out; |
| 1369 | } | 1369 | } |
| 1370 | 1370 | ||
| 1371 | /* We cannot recurse into the filesystem as the transaction is already | ||
| 1372 | * started */ | ||
| 1373 | flags |= AOP_FLAG_NOFS; | ||
| 1374 | |||
| 1371 | page = grab_cache_page_write_begin(mapping, index, flags); | 1375 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 1372 | if (!page) { | 1376 | if (!page) { |
| 1373 | ext4_journal_stop(handle); | 1377 | ext4_journal_stop(handle); |
| @@ -1377,7 +1381,7 @@ retry: | |||
| 1377 | *pagep = page; | 1381 | *pagep = page; |
| 1378 | 1382 | ||
| 1379 | ret = block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, | 1383 | ret = block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, |
| 1380 | ext4_get_block); | 1384 | ext4_get_block); |
| 1381 | 1385 | ||
| 1382 | if (!ret && ext4_should_journal_data(inode)) { | 1386 | if (!ret && ext4_should_journal_data(inode)) { |
| 1383 | ret = walk_page_buffers(handle, page_buffers(page), | 1387 | ret = walk_page_buffers(handle, page_buffers(page), |
| @@ -2667,6 +2671,9 @@ retry: | |||
| 2667 | ret = PTR_ERR(handle); | 2671 | ret = PTR_ERR(handle); |
| 2668 | goto out; | 2672 | goto out; |
| 2669 | } | 2673 | } |
| 2674 | /* We cannot recurse into the filesystem as the transaction is already | ||
| 2675 | * started */ | ||
| 2676 | flags |= AOP_FLAG_NOFS; | ||
| 2670 | 2677 | ||
| 2671 | page = grab_cache_page_write_begin(mapping, index, flags); | 2678 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 2672 | if (!page) { | 2679 | if (!page) { |
