Use "lincan" as syslog messages identification instead of "can.o".

[lincan.git] / lincan / include / main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index f7afa85a46fc0eab7f04204115207f68288f8322..fa98bb235aeaf71f7159e89c481f62aaf16f70b0 100644 (file)
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -13,13 +13,13 @@
 #include "./can_queue.h"
 
 #ifdef CAN_DEBUG
-       #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "can.o (debug): " fmt,\
+       #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "lincan (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 "lincan: " fmt,##args)
 
 
 extern can_spinlock_t canuser_manipulation_lock;
@@ -80,6 +80,7 @@ struct candevice_t {
        int nr_all_chips;
        int nr_82527_chips;
        int nr_sja1000_chips;
+       can_spinlock_t device_lock;
        struct canchip_t *chip[MAX_HW_CHIPS];
 
        struct hwspecops_t *hwspecops;
@@ -378,9 +379,10 @@ extern int major;
 extern int minor[MAX_TOT_CHIPS];
 extern int extended;
 extern int baudrate[MAX_TOT_CHIPS];
-extern char *hw[MAX_HW_CARDS];
 extern int irq[MAX_IRQ];
+extern char *hw[MAX_HW_CARDS];
 extern unsigned long io[MAX_HW_CARDS];
+extern long clockfreq[MAX_HW_CARDS];
 extern int processlocal;
 
 extern struct canhardware_t *hardware_p;