Update of /cvsroot/linux-mips/linux/include/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv23623/include/pcmcia
Modified Files:
cs_types.h ss.h
Log Message:
* Make ioaddr_t 32 bit or 64 bit depending on whether 64 BIT
support is enabled.
* Added a new type, memaddr_t which is the same as ioaddr_t but reflects
the fact that that variable holds the physical address of the pcmcia
* attribute or common memory (vs pcmcia io address).
Index: cs_types.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/cs_types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs_types.h 30 Nov 2001 00:14:45 -0000 1.1
+++ cs_types.h 13 Mar 2002 17:57:49 -0000 1.2
@@ -36,10 +36,20 @@
#include <sys/types.h>
#endif
-#if defined(__arm__) || defined(__mips__)
-typedef u_int ioaddr_t;
+#if defined(__arm__)
+typedef u_int ioaddr_t;
+typedef u_int memaddr_t;
+#elif defined(__mips__)
+ #ifdef CONFIG_64BIT_PHYS_ADDR
+ typedef unsigned long long ioaddr_t;
+ typedef unsigned long long memaddr_t;
+ #else
+ typedef unsigned long ioaddr_t;
+ typedef unsigned long memaddr_t;
+ #endif
#else
typedef u_short ioaddr_t;
+typedef u_int memaddr_t;
#endif
typedef u_short socket_t;
Index: ss.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/ss.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ss.h 27 Nov 2001 00:15:13 -0000 1.4
+++ ss.h 13 Mar 2002 17:57:50 -0000 1.5
@@ -111,7 +111,7 @@
u_char map;
u_char flags;
u_short speed;
- u_long sys_start, sys_stop;
+ memaddr_t sys_start, sys_stop;
u_int card_start;
} pccard_mem_map;
|
