Separated normal read and RTR assisted read transfer.

[lincan.git] / lincan / src / unican_cl2.c

diff --git a/lincan/src/unican_cl2.c b/lincan/src/unican_cl2.c
index 18a78e95f7834c9468a44ca1c8f31aaeb48bd65f..e0d30e18932dafd321869b903f6b4a94eb9f8986 100644 (file)
--- a/lincan/src/unican_cl2.c
+++ b/lincan/src/unican_cl2.c
@@ -11,10 +11,7 @@ FIRMA              :    CVUT FEL, Dept. of Measurement
 DULEZITE UPOZORNENI:\r
 \r
 ARCHIVACNI INFORMACE:\r
-$Log$
-Revision 1.1  2004/03/13 23:13:33  ppisa
-Interconnected OCERA configuration options with LinCAN boardlist.c compilation.
-\r
+Log: unican_cl2.c,v\r
 \r
 12.12.2000, J.B., cl2_receive_data - time stamp for even number of bytes corr.\r
 26.8.1998 - cl2_buf_size - corrected, new function return code CL2_BAD_PARAM\r
@@ -34,8 +31,10 @@ UCEL A FUNKCE:
 \r
 \r
 /* includes */\r
-#include "anctypes.h"\r
-#include "cl2.h"\r
+#include "../include/canmsg.h"\r
+#include "../include/unican_types.h"\r
+#include "../include/unican_cl2.h"\r
+#include "linux/delay.h"\r
 \r
 \r
 /*******************************************************************************\r
@@ -105,7 +104,9 @@ eCL2_RESULT cl2_test_card
    for ( i = 0; i < 10000; i++ )\r
    {\r
      if ( isAA && is55 ) return CL2_OK;\r
-     tmpWord = *((U16*)(card->baseAddressPtr));\r
+     tmpWord = *((volatile U16*)(card->baseAddressPtr));\r
+     /*printk("cl2_test_card: %08lx %04x\n", (long)card->baseAddressPtr, tmpWord);*/\r
+     udelay(100);\r
      if ( (tmpWord & 0x00FF) == 0x00AA ) isAA = TRUE;\r
      if ( (tmpWord & 0x00FF) == 0x0055 ) is55 = TRUE;\r
    }\r