X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/d8365e7fd56ca15c05502848338017013e628a9d..cb5e6d2ab11223f43f89f7d671792ee42acf6227:/lincan/src/main.c

diff --git a/lincan/src/main.c b/lincan/src/main.c
index f4edb79..dac9620 100644
--- 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;
@@ -195,10 +195,11 @@ int init_module(void)
 	res=register_chrdev(major,DEVICE_NAME, &can_fops);
 	if (res<0) {
 		CANMSG("Error registering driver.\n");
-		return -ENODEV;
+		goto register_error;
 	}
 
 	#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) {
@@ -210,7 +211,7 @@ int init_module(void)
 	for (i=0; i<hardware_p->nr_boards; i++) {
 		candev=hardware_p->candevice[i];
 		if (candev->hwspecops->request_io(candev)) 
-			goto memory_error;
+			goto request_io_error;
 		candev->flags|=CANDEV_IO_RESERVED;
 	}
 
@@ -228,15 +229,25 @@ int init_module(void)
 		for(j=0; j<candev->nr_all_chips; j++) {
 			if((chip=candev->chip[j])==NULL)
 				continue;
+
+			if(chip->chipspecops->attach_to_chip(chip)<0) {
+				CANMSG("Initial attach to the chip HW failed\n");
+				goto interrupt_error;
+			}
+
+			chip->flags |= CHIP_ATTACHED;
+	
 			if(can_chip_setup_irq(chip)<0) {
-				CANMSG("IRQ setup failed\n");
+				CANMSG("Error to setup chip IRQ\n");
 				goto interrupt_error;
 			}
 		}
-		
+
 		if (candev->flags & CANDEV_PROGRAMMABLE_IRQ)
-			if (candev->hwspecops->program_irq(candev))
+			if (candev->hwspecops->program_irq(candev)){
+				CANMSG("Error to program board interrupt\n");
 				goto interrupt_error;
+			}
 	}
 
 #ifdef CONFIG_PROC_FS
@@ -246,7 +257,9 @@ int init_module(void)
 
 #ifdef CONFIG_DEVFS_FS
         {
+	    #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
 		char dev_name[32];
+	    #endif
 		int dev_minor;
         	for(i=0;i<MAX_TOT_MSGOBJS;i++) {
         		if(!objects_p[i]) continue;
@@ -272,10 +285,14 @@ int init_module(void)
 #endif
 
 	interrupt_error: ;
-		CANMSG("Error registering interrupt line.\n");
 		goto memory_error;
 
 	reset_error: ;
+		CANMSG("Error resetting device.\n");
+		goto memory_error;
+
+	request_io_error: ;
+		CANMSG("Error to request IO resources for device.\n");
 		goto memory_error;
 
 	memory_error: ;
@@ -292,8 +309,12 @@ int init_module(void)
 			CANMSG("Error unloading CAN driver, error: %d\n",res);
 		else
 			CANMSG("No CAN devices or driver setup error.\n");
-		return -ENODEV;
 
+	register_error:
+		if ( can_del_mem_list() ) 
+			CANMSG("Error deallocating memory\n");
+
+		return -ENODEV;
 }
 
 void cleanup_module(void)