V4L/DVB (13733): [Mantis] Start with the PCMCIA interface

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
index bdf3e3629ab35bc9ddf09dc5d2011a628a3fd111..fa9e806400e0ccbf03e579e2e8ac87d8c7102a01 100644 (file)
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -1,11 +1,12 @@
-mantis-objs =  mantis_core.o \
-               mantis_dma.o \
-               mantis_pci.o \
-               mantis_i2c.o \
-               mantis_dvb.o \
-               mantis_vp1033.o \
-               mantis_vp1034.o \
-               mantis_vp1041.o \
+mantis-objs =  mantis_core.o   \
+               mantis_dma.o    \
+               mantis_pci.o    \
+               mantis_i2c.o    \
+               mantis_dvb.o    \
+               mantis_pcmcia.o \
+               mantis_vp1033.o \
+               mantis_vp1034.o \
+               mantis_vp1041.o \
                mantis_vp2033.o \
                mantis_vp2040.o \
                mantis_vp3030.o

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index 34d2389f312b36be973fa767510ffb4e67967b62..24fc6da07fe2f37fe51bde0646c6435c92b439be 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -35,6 +35,8 @@
 #include <linux/i2c.h>
 #include "mantis_reg.h"
 
+#include "mantis_link.h"
+
 #define MANTIS_ERROR           0
 #define MANTIS_NOTICE          1
 #define MANTIS_INFO            2
@@ -134,6 +136,8 @@ struct mantis_pci {
 
         /*     A12 A13 A14             */
        int                     gpio_status;
+
+       struct mantis_ca        *mantis_ca;
 };
 
 extern unsigned int verbose;

diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/dvb/mantis/mantis_link.h
index 2849457c4270ac8c956ad818c85928230c6fae00..2d9b64f6937aa131f1626f38962aa52eff961388 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_link.h
+++ b/drivers/media/dvb/mantis/mantis_link.h
@@ -40,7 +40,7 @@ struct mantis_ca {
        wait_queue_head_t               hif_opdone_wq;
        wait_queue_head_t               hif_brrdyw_wq;
        wait_queue_head_t               hif_data_wq;
-       u32                             hif_job_queue
+       u32                             hif_job_queue;
 
        enum mantis_sbuf_status         sbuf_status;
 

diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/dvb/mantis/mantis_pcmcia.c
new file mode 100644 (file)
index 0000000..63f9621
--- /dev/null
+++ b/drivers/media/dvb/mantis/mantis_pcmcia.c
@@ -0,0 +1,34 @@
+/*
+       Mantis PCI bridge driver
+
+       Copyright (C) 2005, 2006 Manu Abraham (abraham.manu@gmail.com)
+
+       This program is free software; you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation; either version 2 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program; if not, write to the Free Software
+       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "mantis_common.h"
+
+int mantis_pcmcia_init(struct mantis_ca *ca)
+{
+       struct mantis_pci *mantis = ca->ca_priv;
+
+       return 0;
+}
+
+void mantis_pcmcia_exit(struct mantis_ca *ca)
+{
+       struct mantis_pci *mantis = ca->ca_priv;
+
+}