Embedded code and LinCAN driver now working

[lincan.git] / embedded / app / usbcan / can / main.h

diff --git a/embedded/app/usbcan/can/main.h b/embedded/app/usbcan/can/main.h
index 9a1d65ba327d216931377503e79441fd7d983f46..23c8ab3135c7835c2f757dde40b8f570e5c926e4 100644 (file)
--- a/embedded/app/usbcan/can/main.h
+++ b/embedded/app/usbcan/can/main.h
@@ -7,6 +7,9 @@
  * Version lincan-0.3  17 Jun 2004
  */
 
+#ifndef MAIN_H
+#define MAIN_H
+
 #include <malloc.h>
 
 #include "./can.h"
@@ -14,15 +17,16 @@
 #include "./ul_listbase.h"
 #include "./can_sysless.h"
 #include "./can_queue.h"
+#include "./errno.h"
 
 #ifdef CAN_DEBUG
-       #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "can.o (debug): " fmt,\
+       #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "USBCAN(debug): " fmt,\
        ##args)
 #else
        #define DEBUGMSG(fmt,args...)
 #endif
 
-#define CANMSG(fmt,args...) can_printk(KERN_ERR "can.o: " fmt,##args)
+#define CANMSG(fmt,args...) can_printk(KERN_ERR "USBCAN: " fmt,##args)
 
 
 extern can_spinlock_t canuser_manipulation_lock;
@@ -388,7 +392,8 @@ extern unsigned long io[MAX_HW_CARDS];
 extern int processlocal;
 
 extern struct canhardware_t *hardware_p;
-extern struct canchip_t *chips_p[MAX_TOT_CHIPS];
+//extern struct canchip_t *chips_p[MAX_TOT_CHIPS];
+struct canchip_t *chips_p[MAX_TOT_CHIPS];
 extern struct msgobj_t *objects_p[MAX_TOT_MSGOBJS];
 
 extern struct mem_addr *mem_head;
@@ -513,3 +518,6 @@ void can_filltimestamp(canmsg_tstamp_t *ptimestamp)
 #ifdef CAN_WITH_RTL
 extern int can_rtl_priority;
 #endif /*CAN_WITH_RTL*/
+
+#endif /* MAIN_H */
+