linux-mips-commits

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv5739/drivers/pcmcia

Modified Files:
	au1000_generic.c cs.c 
Log Message:
Sync with OSS 2.4.9.



Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- au1000_generic.c	2001/09/05 19:51:47	1.2
+++ au1000_generic.c	2001/09/25 03:36:35	1.3
@@ -681,13 +681,15 @@
 		     pcmcia_socket[sock].k_state.vs_Xv ? "vs_Xv " : "");
 
 	p += sprintf(p, "status   : %s%s%s%s%s%s%s%s%s\n",
-		     pcmcia_socket[sock].k_state.detect ? "SS_DETECT " : "",
+		     pcmcia_socket[sock].
+		     k_state.detect ? "SS_DETECT " : "",
 		     pcmcia_socket[sock].k_state.ready ? "SS_READY " : "",
 		     pcmcia_socket[sock].cs_state.Vcc ? "SS_POWERON " : "",
-		     pcmcia_socket[sock].cs_state.flags & SS_IOCARD ? 
-		     "SS_IOCARD " : "",
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_IOCARD ? \"SS_IOCARD " : "",
 		     (pcmcia_socket[sock].cs_state.flags & SS_IOCARD
-		      && pcmcia_socket[sock].k_state.bvd1) ? "SS_STSCHG " : "",
+		      && pcmcia_socket[sock].
+		      k_state.bvd1) ? "SS_STSCHG " : "",
 		     ((pcmcia_socket[sock].cs_state.flags & SS_IOCARD) == 0
 		      && (pcmcia_socket[sock].k_state.bvd1 ==
 			  0)) ? "SS_BATDEAD " : "",
@@ -695,40 +697,44 @@
 		      && (pcmcia_socket[sock].k_state.bvd2 ==
 			  0)) ? "SS_BATWARN " : "",
 		     pcmcia_socket[sock].k_state.vs_3v ? "SS_3VCARD " : "",
-		     pcmcia_socket[sock].k_state.vs_Xv ? "SS_XVCARD " : "");
+		     pcmcia_socket[sock].
+		     k_state.vs_Xv ? "SS_XVCARD " : "");
 
 	p += sprintf(p, "mask     : %s%s%s%s%s\n",
-		     pcmcia_socket[sock].cs_state.csc_mask & SS_DETECT ? \
-		     "SS_DETECT " : "",
-		     pcmcia_socket[sock].cs_state.csc_mask & SS_READY ? \
-		     "SS_READY " : "",
-		     pcmcia_socket[sock].cs_state.csc_mask & SS_BATDEAD ? \
-		     "SS_BATDEAD " : "",
-		     pcmcia_socket[sock].cs_state.csc_mask & SS_BATWARN ? \
-		     "SS_BATWARN " : "",
-		     pcmcia_socket[sock].cs_state.csc_mask & SS_STSCHG ? \
-		     "SS_STSCHG " : "");
+		     pcmcia_socket[sock].
+		     cs_state.csc_mask & SS_DETECT ? \"SS_DETECT " : "",
+		     pcmcia_socket[sock].
+		     cs_state.csc_mask & SS_READY ? \"SS_READY " : "",
+		     pcmcia_socket[sock].
+		     cs_state.csc_mask & SS_BATDEAD ? \"SS_BATDEAD " : "",
+		     pcmcia_socket[sock].
+		     cs_state.csc_mask & SS_BATWARN ? \"SS_BATWARN " : "",
+		     pcmcia_socket[sock].
+		     cs_state.csc_mask & SS_STSCHG ? \"SS_STSCHG " : "");
 
 	p += sprintf(p, "cs_flags : %s%s%s%s%s\n",
-		     pcmcia_socket[sock].cs_state.flags & SS_PWR_AUTO ? \
-		     "SS_PWR_AUTO " : "",
-		     pcmcia_socket[sock].cs_state.flags & SS_IOCARD ? \
-		     "SS_IOCARD " : "",
-		     pcmcia_socket[sock].cs_state.flags & SS_RESET ? \
-		     "SS_RESET " : "",
-		     pcmcia_socket[sock].cs_state.flags & SS_SPKR_ENA ? \
-		     "SS_SPKR_ENA " : "",
-		     pcmcia_socket[sock].cs_state.flags & SS_OUTPUT_ENA ? \
-		     "SS_OUTPUT_ENA " :
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_PWR_AUTO ? \"SS_PWR_AUTO " : "",
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_IOCARD ? \"SS_IOCARD " : "",
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_RESET ? \"SS_RESET " : "",
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_SPKR_ENA ? \"SS_SPKR_ENA " : "",
+		     pcmcia_socket[sock].
+		     cs_state.flags & SS_OUTPUT_ENA ? \"SS_OUTPUT_ENA " :
 		     "");
 
-	p += sprintf(p, "Vcc      : %d\n", 
+	p +=
+	    sprintf(p, "Vcc      : %d\n",
 			pcmcia_socket[sock].cs_state.Vcc);
 
-	p += sprintf(p, "Vpp      : %d\n", 
+	p +=
+	    sprintf(p, "Vpp      : %d\n",
 			pcmcia_socket[sock].cs_state.Vpp);
 
-	p += sprintf(p, "irq      : %d\n", 
+	p +=
+	    sprintf(p, "irq      : %d\n",
 			pcmcia_socket[sock].cs_state.io_irq);
 
 	p += sprintf(p, "I/O      : %u\n", pcmcia_socket[sock].speed_io);

Index: cs.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/cs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs.c	2001/09/06 00:00:00	1.1
+++ cs.c	2001/09/25 03:36:35	1.2
@@ -788,10 +788,6 @@
 	      *base, align);
 	align = 0;
     }
-    if ((s->cap.features & SS_CAP_STATIC_MAP) && s->cap.io_offset) {
-	*base = s->cap.io_offset | (*base & 0x0fff);
-	return 0;
-    }
     /* Check for an already-allocated window that must conflict with
        what was asked for.  It is a hack because it does not catch all
        potential conflicts, just the most obvious ones. */