Merge with Linux 2.3.40.

5 files changed, 36 insertions, 8 deletions

diff --git a/include/pcmcia/cisreg.h b/include/pcmcia/cisreg.h
index 20373545c..803660503 100644
--- a/include/pcmcia/cisreg.h
+++ b/include/pcmcia/cisreg.h
@@ -1,5 +1,5 @@
 /*
- * cisreg.h 1.14 1999/10/25 20:23:17
+ * cisreg.h 1.16 2000/01/16 19:19:14
  *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
@@ -30,7 +30,9 @@
 #ifndef _LINUX_CISREG_H
 #define _LINUX_CISREG_H
 
-/* Offsets from ConfigBase for CIS registers */
+/*
+ * Offsets from ConfigBase for CIS registers
+ */
 #define CISREG_COR		0x00
 #define CISREG_CCSR		0x02
 #define CISREG_PRR		0x04
@@ -113,4 +115,21 @@
 #define FEMR_PWM_ENA		0x0040
 #define FEMR_WKUP_MASK		0x4000
 
+/*
+ * Indirect Addressing Registers for Zoomed Video: these are addresses
+ * in common memory space
+ */
+#define CISREG_ICTRL0		0x02	/* control registers */
+#define CISREG_ICTRL1		0x03
+#define CISREG_IADDR0		0x04	/* address registers */
+#define CISREG_IADDR1		0x05
+#define CISREG_IADDR2		0x06
+#define CISREG_IADDR3		0x07
+#define CISREG_IDATA0		0x08	/* data registers */
+#define CISREG_IDATA1		0x09
+
+#define ICTRL0_COMMON		0x01
+#define ICTRL0_AUTOINC		0x02
+#define ICTRL0_BYTEGRAN		0x04
+
 #endif /* _LINUX_CISREG_H */
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index 00412858e..d53e44646 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -1,5 +1,5 @@
 /*
- * cistpl.h 1.31 1999/10/25 20:23:17
+ * cistpl.h 1.32 2000/01/11 19:06:50
  *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
@@ -33,10 +33,13 @@
 #define CISTPL_NULL		0x00
 #define CISTPL_DEVICE		0x01
 #define CISTPL_LONGLINK_CB	0x02
+#define CISTPL_INDIRECT		0x03
 #define CISTPL_CONFIG_CB	0x04
 #define CISTPL_CFTABLE_ENTRY_CB	0x05
 #define CISTPL_LONGLINK_MFC	0x06
 #define CISTPL_BAR		0x07
+#define CISTPL_PWR_MGMNT	0x08
+#define CISTPL_EXTDEVICE	0x09
 #define CISTPL_CHECKSUM		0x10
 #define CISTPL_LONGLINK_A	0x11
 #define CISTPL_LONGLINK_C	0x12
@@ -67,6 +70,7 @@
 #define CISTPL_BATTERY		0x45
 /* Layer 3 tuples */
 #define CISTPL_ORG		0x46
+#define CISTPL_SPCL		0x90
 
 typedef struct cistpl_longlink_t {
     u_int	addr;
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 7a27cb2eb..669de1eac 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -441,7 +441,7 @@ int pcmcia_get_card_services_info(servinfo_t *info);
 int pcmcia_get_first_client(client_handle_t *handle, client_req_t *req);
 int pcmcia_get_next_client(client_handle_t *handle, client_req_t *req);
 int pcmcia_get_window(window_handle_t *handle, int idx, win_req_t *req);
-int pcmcia_get_first_window(client_handle_t *handle, win_req_t *req);
+int pcmcia_get_first_window(window_handle_t *win, win_req_t *req);
 int pcmcia_get_next_window(window_handle_t *win, win_req_t *req);
 int pcmcia_get_status(client_handle_t handle, cs_status_t *status);
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
@@ -464,6 +464,7 @@ int pcmcia_eject_card(client_handle_t handle, client_req_t *req);
 int pcmcia_insert_card(client_handle_t handle, client_req_t *req);
 int pcmcia_set_event_mask(client_handle_t handle, eventmask_t *mask);
 int pcmcia_report_error(client_handle_t handle, error_info_t *err);
+struct pci_bus *pcmcia_lookup_bus(client_handle_t handle);
 
 /* rsrc_mgr.c */
 int pcmcia_adjust_resource_info(client_handle_t handle, adjust_t *adj);
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index 63f56430e..92feb6322 100644
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -1,5 +1,5 @@
 /*
- * cs_types.h 1.16 1999/10/25 20:23:17
+ * cs_types.h 1.17 2000/01/18 01:14:36
  *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
@@ -30,7 +30,11 @@
 #ifndef _LINUX_CS_TYPES_H
 #define _LINUX_CS_TYPES_H
 
+#ifdef __KERNEL__
 #include <linux/types.h>
+#else
+#include <sys/types.h>
+#endif
 
 typedef u_short	socket_t;
 typedef u_short	ioaddr_t;
diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h
index 2a3cd2523..4606b40b3 100644
--- a/include/pcmcia/version.h
+++ b/include/pcmcia/version.h
@@ -1,4 +1,4 @@
-/* version.h 1.76 1999/10/26 18:55:56 (David Hinds) */
+/* version.h 1.81 1999/12/23 21:37:32 (David Hinds) */
 
-#define CS_RELEASE "3.1.4"
-#define CS_RELEASE_CODE 0x3104
+#define CS_RELEASE "3.1.9"
+#define CS_RELEASE_CODE 0x3109