diff options
-rw-r--r-- | drivers/media/dvb/mantis/Makefile | 17 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_common.h | 4 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_link.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_pcmcia.c | 34 |
4 files changed, 48 insertions, 9 deletions
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile index bdf3e3629ab3..fa9e806400e0 100644 --- a/drivers/media/dvb/mantis/Makefile +++ b/drivers/media/dvb/mantis/Makefile | |||
@@ -1,11 +1,12 @@ | |||
1 | mantis-objs = mantis_core.o \ | 1 | mantis-objs = mantis_core.o \ |
2 | mantis_dma.o \ | 2 | mantis_dma.o \ |
3 | mantis_pci.o \ | 3 | mantis_pci.o \ |
4 | mantis_i2c.o \ | 4 | mantis_i2c.o \ |
5 | mantis_dvb.o \ | 5 | mantis_dvb.o \ |
6 | mantis_vp1033.o \ | 6 | mantis_pcmcia.o \ |
7 | mantis_vp1034.o \ | 7 | mantis_vp1033.o \ |
8 | mantis_vp1041.o \ | 8 | mantis_vp1034.o \ |
9 | mantis_vp1041.o \ | ||
9 | mantis_vp2033.o \ | 10 | mantis_vp2033.o \ |
10 | mantis_vp2040.o \ | 11 | mantis_vp2040.o \ |
11 | mantis_vp3030.o | 12 | mantis_vp3030.o |
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h index 34d2389f312b..24fc6da07fe2 100644 --- a/drivers/media/dvb/mantis/mantis_common.h +++ b/drivers/media/dvb/mantis/mantis_common.h | |||
@@ -35,6 +35,8 @@ | |||
35 | #include <linux/i2c.h> | 35 | #include <linux/i2c.h> |
36 | #include "mantis_reg.h" | 36 | #include "mantis_reg.h" |
37 | 37 | ||
38 | #include "mantis_link.h" | ||
39 | |||
38 | #define MANTIS_ERROR 0 | 40 | #define MANTIS_ERROR 0 |
39 | #define MANTIS_NOTICE 1 | 41 | #define MANTIS_NOTICE 1 |
40 | #define MANTIS_INFO 2 | 42 | #define MANTIS_INFO 2 |
@@ -134,6 +136,8 @@ struct mantis_pci { | |||
134 | 136 | ||
135 | /* A12 A13 A14 */ | 137 | /* A12 A13 A14 */ |
136 | int gpio_status; | 138 | int gpio_status; |
139 | |||
140 | struct mantis_ca *mantis_ca; | ||
137 | }; | 141 | }; |
138 | 142 | ||
139 | extern unsigned int verbose; | 143 | extern unsigned int verbose; |
diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h index 2849457c4270..2d9b64f6937a 100644 --- a/drivers/media/dvb/mantis/mantis_link.h +++ b/drivers/media/dvb/mantis/mantis_link.h | |||
@@ -40,7 +40,7 @@ struct mantis_ca { | |||
40 | wait_queue_head_t hif_opdone_wq; | 40 | wait_queue_head_t hif_opdone_wq; |
41 | wait_queue_head_t hif_brrdyw_wq; | 41 | wait_queue_head_t hif_brrdyw_wq; |
42 | wait_queue_head_t hif_data_wq; | 42 | wait_queue_head_t hif_data_wq; |
43 | u32 hif_job_queue | 43 | u32 hif_job_queue; |
44 | 44 | ||
45 | enum mantis_sbuf_status sbuf_status; | 45 | enum mantis_sbuf_status sbuf_status; |
46 | 46 | ||
diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/dvb/mantis/mantis_pcmcia.c new file mode 100644 index 000000000000..63f9621a90b7 --- /dev/null +++ b/drivers/media/dvb/mantis/mantis_pcmcia.c | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | Mantis PCI bridge driver | ||
3 | |||
4 | Copyright (C) 2005, 2006 Manu Abraham (abraham.manu@gmail.com) | ||
5 | |||
6 | This program is free software; you can redistribute it and/or modify | ||
7 | it under the terms of the GNU General Public License as published by | ||
8 | the Free Software Foundation; either version 2 of the License, or | ||
9 | (at your option) any later version. | ||
10 | |||
11 | This program is distributed in the hope that it will be useful, | ||
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | GNU General Public License for more details. | ||
15 | |||
16 | You should have received a copy of the GNU General Public License | ||
17 | along with this program; if not, write to the Free Software | ||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
19 | */ | ||
20 | |||
21 | #include "mantis_common.h" | ||
22 | |||
23 | int mantis_pcmcia_init(struct mantis_ca *ca) | ||
24 | { | ||
25 | struct mantis_pci *mantis = ca->ca_priv; | ||
26 | |||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | void mantis_pcmcia_exit(struct mantis_ca *ca) | ||
31 | { | ||
32 | struct mantis_pci *mantis = ca->ca_priv; | ||
33 | |||
34 | } | ||