To prevent future name collisions "chip_t" changed to "canchip_t"

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index f4edb7964134061d6e2470983dbb5071e2deac93..9928c15c51e6e2bd83287aaa72b00eb10ed55a72 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -4,10 +4,12 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
+#ifndef EXPORT_SYMTAB
 #define EXPORT_SYMTAB
+#endif
 
 #include <linux/autoconf.h>
 
@@ -61,8 +63,6 @@
 #include "../include/can_iortl.h"
 #endif /*CAN_WITH_RTL*/
 
-#define EXPORT_SYMTAB
-
 can_spinlock_t canuser_manipulation_lock;
 
 /* Module parameters, some must be supplied at module loading time */
@@ -128,7 +128,7 @@ MODULE_AUTHOR("Pavel Pisa <pisa@cmp.felk.cvut.cz>, Arnaud Westenberg");
 /* Global structures, used to describe the installed hardware. */
 struct canhardware_t canhardware;
 struct canhardware_t *hardware_p=&canhardware;
-struct chip_t *chips_p[MAX_TOT_CHIPS];
+struct canchip_t *chips_p[MAX_TOT_CHIPS];
 struct msgobj_t *objects_p[MAX_TOT_MSGOBJS];
 #ifdef CONFIG_DEVFS_FS
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,60))
@@ -177,7 +177,7 @@ int init_module(void)
 {
        int res=0,i=0, j;
        struct candevice_t *candev;
-       struct chip_t *chip;
+       struct canchip_t *chip;
 
        if (parse_mod_parms())
                return -EINVAL;
@@ -199,6 +199,7 @@ int init_module(void)
        }
 
        #ifdef CAN_WITH_RTL
+       can_spin_lock_init(&can_irq_manipulation_lock);
        canqueue_rtl_initialize();
        res=rtl_register_rtldev(major,DEVICE_NAME,&can_fops_rtl);
        if (res<0) {