[PCMCIA 2.6] Add missing ZV parts

[Daniel Ritz]

the following patch adds the parts missing in 2.6 for ZV support (from 2.4)
against 2.6.0-t5-bk.


--- 1.62/drivers/pcmcia/cs.c	Tue Sep  9 00:15:21 2003
+++ edited/drivers/pcmcia/cs.c	Thu Sep 18 18:15:45 2003
@@ -1345,7 +1345,7 @@
     } else
 	c = CONFIG(handle);
     if ((c != NULL) && (c->state & CONFIG_LOCKED) &&
-	(c->IntType & INT_MEMORY_AND_IO)) {
+	(c->IntType & (INT_MEMORY_AND_IO | INT_ZOOMED_VIDEO))) {
 	u_char reg;
 	if (c->Present & PRESENT_PIN_REPLACE) {
 	    read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg);
@@ -1756,6 +1756,8 @@
     c->Attributes = req->Attributes;
     if (req->IntType & INT_MEMORY_AND_IO)
 	s->socket.flags |= SS_IOCARD;
+    if (req->IntType & INT_ZOOMED_VIDEO)
+	s->socket.flags |= SS_ZVCARD | SS_IOCARD;
     if (req->Attributes & CONF_ENABLE_DMA)
 	s->socket.flags |= SS_DMA_MODE;
     if (req->Attributes & CONF_ENABLE_SPKR)
--- 1.4/include/pcmcia/cs.h	Wed Jun 11 22:57:18 2003
+++ edited/include/pcmcia/cs.h	Thu Sep 18 18:15:14 2003
@@ -180,6 +180,7 @@
 #define INT_MEMORY		0x01
 #define INT_MEMORY_AND_IO	0x02
 #define INT_CARDBUS		0x04
+#define INT_ZOOMED_VIDEO	0x08
 
 /* For RequestIO and ReleaseIO */
 typedef struct io_req_t {