* 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>
#include <linux/autoconf.h>
#include <linux/interrupt.h>
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
-#include <linux/wrapper.h>
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
+ #include <linux/wrapper.h>
+#else
+ #include <linux/device.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+ static struct class *can_class;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ static struct class_simple *can_class;
+ #define class_create class_simple_create
+ #define class_device_create class_simple_device_add
+ #define class_device_destroy(a,b) class_simple_device_remove(b)
+ #define class_destroy class_simple_destroy
+ #endif
#endif
#if !defined (__GENKSYMS__)
#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 */
/* 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))
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
devfs_handle_t devfs_handles[MAX_TOT_MSGOBJS];
#endif
#endif
#endif /*CAN_WITH_RTL*/
+/*
+ 2.6 kernel attributes for sysfs
+
+static ssize_t show_xxx(struct class_device *cdev, char *buf)
+{
+ return sprintf(buf, "xxxx\n");
+}
+
+static ssize_t store_xxx(struct class_device *cdev, const char * buf, size_t count)
+{
+}
+
+static CLASS_DEVICE_ATTR(xxx, S_IRUGO, show_xxx, store_xxx/NULL);
+
+ret = class_device_create_file(class_dev, class_device_attr_xxx);
+if (ret)
+ goto err_unregister;
+
+*/
+
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;
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
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;
}
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
goto proc_error;
#endif
-#ifdef CONFIG_DEVFS_FS
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+ can_class=class_create(THIS_MODULE, "can");
+#endif
+
+#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
{
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
char dev_name[32];
+ #else
+ struct class_device *this_dev;
+ #endif
int dev_minor;
for(i=0;i<MAX_TOT_MSGOBJS;i++) {
if(!objects_p[i]) continue;
dev_minor=objects_p[i]->minor;
- #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
sprintf (dev_name, "can%d", dev_minor);
devfs_handles[i]=devfs_register(NULL, dev_name,
DEVFS_FL_DEFAULT, major, dev_minor,
S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
&can_fops, (void*)objects_p[i]);
#else
+ this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL, "can%d", dev_minor);
+ if(!this_dev){
+ CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
+ }else{
+ this_dev->class_data=objects_p[i];
+ }
+ #ifdef CONFIG_DEVFS_FS
devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor);
+ #endif
#endif
}
}
#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: ;
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)
CANMSG("Error unregistering /proc/can entry.\n");
#endif
-#ifdef CONFIG_DEVFS_FS
+#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
for(i=0;i<MAX_TOT_MSGOBJS;i++) {
- #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
if(devfs_handles[i])
devfs_unregister(devfs_handles[i]);
#else
int dev_minor;
if(!objects_p[i]) continue;
dev_minor=objects_p[i]->minor;
- if(minor>=0)
+ if(minor>=0){
+ #ifdef CONFIG_DEVFS_FS
devfs_remove("can%d", dev_minor);
+ #endif
+ class_device_destroy(can_class, MKDEV(major, dev_minor));
+ }
#endif
}
#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+ class_destroy(can_class);
+#endif
+
canhardware_done(hardware_p);
#ifdef CAN_WITH_RTL
projects / lincan.git / blobdiff