X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/cd956e65f376d8ab9734cdd3904745a56fccfb20..1d20caee804d28a792dcacbf8424dc23b80c6370:/lincan/src/main.c

diff --git a/lincan/src/main.c b/lincan/src/main.c
index c4fb22a..e114082 100644
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -76,46 +76,76 @@
 
 can_spinlock_t canuser_manipulation_lock;
 
-/* Module parameters, some must be supplied at module loading time */
 int major=CAN_MAJOR;
-MODULE_PARM(major,"1i");
-MODULE_PARM_DESC(major,"can be used to change default major [" __MODULE_STRING(CAN_MAJOR) "]");
 int minor[MAX_TOT_CHIPS]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
+int extended=0;
+int pelican=0;
+int baudrate[MAX_TOT_CHIPS];
+char *hw[MAX_HW_CARDS]={NULL,};
+int irq[MAX_IRQ]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
+unsigned long io[MAX_HW_CARDS]={-1,-1,-1,-1,-1,-1,-1,-1};
+long clockfreq[MAX_HW_CARDS];
+int stdmask=0;
+int extmask=0;
+int mo15mask=0;
+int processlocal=0;
+
+unsigned int minor_specified;
+unsigned int baudrate_specified;
+unsigned int hw_specified;
+unsigned int irq_specified;
+unsigned int io_specified;
+unsigned int clockfreq_specified;
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12))
+/* Module parameters, some must be supplied at module loading time */
+MODULE_PARM(major,"1i");
 /*MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS)"i");*/
 MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i");
-MODULE_PARM_DESC(minor,"can be used to change default starting minor for each channel");
-int extended=0;
 MODULE_PARM(extended,"1i");
+MODULE_PARM(pelican,"1i");
+MODULE_PARM(baudrate, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i");
+MODULE_PARM(hw, "1-" __MODULE_STRING(MAX_HW_CARDS)"s");
+MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_IRQ)"i");
+MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HW_CARDS)"i");
+MODULE_PARM(clockfreq, "1-" __MODULE_STRING(MAX_HW_CARDS)"i");
+MODULE_PARM(stdmask, "1i");
+MODULE_PARM(extmask, "1i");
+MODULE_PARM(mo15mask, "1i");
+MODULE_PARM(processlocal, "1i");
+
+#else /* LINUX_VERSION_CODE >= 2,6,12 */
+module_param(major, int, 0);
+module_param_array(minor, int, &minor_specified, 0);
+module_param(extended, int, 0);
+module_param(pelican, int, 0);
+module_param_array(baudrate, int, &baudrate_specified, 0);
+module_param_array(hw, charp, &hw_specified, 0);
+module_param_array(irq, int, &irq_specified, 0);
+module_param_array(io, ulong, &io_specified, 0);
+module_param_array(clockfreq, long, &clockfreq_specified, 0);
+module_param(stdmask, int, 0);
+module_param(extmask, int, 0);
+module_param(mo15mask, int, 0);
+module_param(processlocal, int, 0);
+#endif /* LINUX_VERSION_CODE >= 2,6,12 */
+
+MODULE_PARM_DESC(major,"can be used to change default major [" __MODULE_STRING(CAN_MAJOR) "]");
+MODULE_PARM_DESC(minor,"can be used to change default starting minor for each channel");
 MODULE_PARM_DESC(extended,"enables automatic switching to extended format if ID>2047,"
 			" selects extended frames reception for i82527");
-int pelican=0;
-MODULE_PARM(pelican,"1i");
 MODULE_PARM_DESC(pelican,"unused parameter, PeliCAN used by default for sja1000p chips");
-int baudrate[MAX_TOT_CHIPS];
-MODULE_PARM(baudrate, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i");
 MODULE_PARM_DESC(baudrate,"baudrate for each channel in step of 1kHz");
-char *hw[MAX_HW_CARDS]={NULL,};
-MODULE_PARM(hw, "1-" __MODULE_STRING(MAX_HW_CARDS)"s");
 MODULE_PARM_DESC(hw,"list of boards types to initialize - virtual,pip5,...");
-int irq[MAX_IRQ]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_IRQ)"i");
 MODULE_PARM_DESC(irq,"list of iterrupt signal numbers, most ISA has one per chip, no value for PCI or virtual");
-unsigned long io[MAX_HW_CARDS]={-1,-1,-1,-1,-1,-1,-1,-1};
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HW_CARDS)"i");
 MODULE_PARM_DESC(io,"IO address for each board, use 0 for PCI or virtual");
-int stdmask=0;
-MODULE_PARM(stdmask, "1i");
+MODULE_PARM_DESC(clockfreq,"base board clock source frequency in step of 1kHz");
 MODULE_PARM_DESC(stdmask,"default standard mask for i82527 chips");
-int extmask=0;
-MODULE_PARM(extmask, "1i");
 MODULE_PARM_DESC(extmask,"default extended mask for i82527 chips");
-int mo15mask=0;
-MODULE_PARM(mo15mask, "1i");
 MODULE_PARM_DESC(mo15mask,"mask for communication object 15 of i82527 chips");
-int processlocal=0;
-MODULE_PARM(processlocal, "1i");
 MODULE_PARM_DESC(processlocal,"select postprocessing/loopback of transmitted messages - "
 		"0 .. disabled, 1 .. can be enabled by FIFO filter, 2 .. enabled by default");
+
 #ifdef CAN_WITH_RTL
 int can_rtl_priority=-1;
 MODULE_PARM(can_rtl_priority, "1i");
@@ -313,10 +343,11 @@ int init_module(void)
 		      #else /* >= 2.6.15 */
 			this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
 		      #endif /* >= 2.6.15 */
-			if(!this_dev){
+			if(IS_ERR(this_dev)){
 				CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
 			}else{
-				this_dev->class_data=objects_p[i];
+				/*this_dev->class_data=objects_p[i];*/
+				class_set_devdata(this_dev,objects_p[i]);
 			}
 		      #ifdef CONFIG_DEVFS_FS
 			devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor);
@@ -353,11 +384,8 @@ int init_module(void)
 		canqueue_rtl_done();
 		#endif /*CAN_WITH_RTL*/
 
-		res=unregister_chrdev(major,DEVICE_NAME);
-		if (res<0)
-			CANMSG("Error unloading CAN driver, error: %d\n",res);
-		else
-			CANMSG("No CAN devices or driver setup error.\n");
+		unregister_chrdev(major,DEVICE_NAME);
+		CANMSG("No CAN devices or driver setup error.\n");
 
 	register_error:
 		if ( can_del_mem_list() ) 
@@ -368,7 +396,7 @@ int init_module(void)
 
 void cleanup_module(void)
 {
-	int res=0,i=0;
+	int i=0;
 
 #ifdef CONFIG_PROC_FS
 	if (can_delete_procdir())
@@ -408,7 +436,5 @@ void cleanup_module(void)
 	if ( can_del_mem_list() ) 
 		CANMSG("Error deallocating memory\n");
 
-	res=unregister_chrdev(major,DEVICE_NAME);
-	if (res<0)
-		CANMSG("Error unregistering CAN driver, error: %d\n",res);
+	unregister_chrdev(major,DEVICE_NAME);
 }