From d7ddedc8887763612f9b9f2fd79481fadeb87cbf Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 10 Mar 2002 20:28:14 +0000
Subject: [PATCH] Disable windowed register access, since it's still causing
 problems on 611x.

---
 comedi/drivers/ni_pcimio.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 51c59470..78c96734 100644
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -596,7 +596,10 @@ COMEDI_INITCLEANUP(driver_pcimio);
  * PCIMIO devices map the low 8 STC registers to iobase+addr*2.
  * The 611x devices map the write registers to iobase+addr*2, and
  * the read registers to iobase+(addr-1)*2. */
+/* However, the 611x boards still aren't working, so I'm disabling
+ * non-windowed STC access temporarily */
 
+#if 0
 #define win_out(data,addr) do{ \
 	if((addr)<8){ \
 		ni_writew((data),(addr)*2); \
@@ -605,16 +608,26 @@ COMEDI_INITCLEANUP(driver_pcimio);
 		ni_writew((data),Window_Data); \
 	} \
 }while(0)
+#else
+#define win_out(data,addr) do{ \
+	ni_writew((addr),Window_Address); \
+	ni_writew((data),Window_Data); \
+}while(0)
+#endif
 
 #define win_out2(data,addr) do{ \
 	win_out((data)>>16, (addr)); \
 	win_out((data)&0xffff, (addr)+1); \
 }while(0)
 
+#if 0
 #define win_in(addr) ( \
 	((addr)<7) \
 	? (ni_readw(((addr) - boardtype.reg_611x)*2)) \
 	: (ni_writew((addr),Window_Address),ni_readw(Window_Data)))
+#else
+#define win_in(addr) (ni_writew((addr),Window_Address),ni_readw(Window_Data))
+#endif
 
 #define win_save() (ni_readw(Window_Address))
 #define win_restore(a) (ni_writew((a),Window_Address))
-- 
2.26.2