#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__)
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;
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,5,50))
+ #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
}
}
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
#include "../include/setup.h"
#include "../include/finish.h"
-#ifdef CAN_ENABLE_VME_SUPPORT
-#include "ca91c042.h"
-/* Modified version of ca91c042 driver can be found in
- * components/comm/contrib directory. */
-#endif
-
int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);
int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate);
int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
-/**
- * can_checked_malloc - memory allocation with registering of requested blocks
- * @size: size of the requested block
- *
- * The function is used in the driver initialization phase to catch possible memory
- * leaks for future driver finalization or case, that driver initialization fail.
- *
- * Return Value: pointer to the allocated memory or NULL in the case of fail
- */
-void *can_checked_malloc(size_t size)
-{
- struct mem_addr *mem_new;
- void *address_p;
-
- address_p=kmalloc(size,GFP_KERNEL);
- if(address_p == NULL) {
- CANMSG("can_checked_malloc: out of the memory\n");
- return NULL;
- }
-
-#ifdef DEBUG_MEM
- DEBUGMSG("can_checked_malloc: allocated %d bytes at %p, mem_head=%p\n",
- (int)size, address_p, mem_head);
-#endif
-
- mem_new=(struct mem_addr *)kmalloc(sizeof(struct mem_addr),GFP_KERNEL);
- if (mem_new == NULL) {
- CANMSG("can_checked_malloc: memory list allocation error.\n");
- kfree(address_p);
- return NULL;
- }
- mem_new->next=mem_head;
- mem_new->address=address_p;
- mem_new->size=size;
- mem_head=mem_new;
-
- return address_p;
-}
-
-/**
- * can_checked_free - free memory allocated by can_checked_malloc()
- * @address_p: pointer to the memory block
- */
-int can_checked_free(void *address_p)
-{
- struct mem_addr **mem_pptr;
- struct mem_addr *mem_del=NULL;
-
-#ifdef DEBUG_MEM
- DEBUGMSG("can_checked_free %p, mem_head=%p\n", address_p, mem_head);
-#endif
-
- for(mem_pptr = &mem_head; (mem_del = *mem_pptr); mem_pptr = &mem_del->next) {
- if (mem_del->address != address_p)
- continue;
- *mem_pptr=mem_del->next;
- kfree(mem_del);
- kfree(address_p);
- return 0;
- }
-
- CANMSG("can_checked_free: address %p not found on the mem list\n", address_p);
-
- kfree(address_p);
- return -1;
-}
-
-
-/**
- * can_del_mem_list - check for stale memory allocations at driver finalization
- *
- * Checks, if there are still some memory blocks allocated and releases memory
- * occupied by such blocks back to the system
- */
-int can_del_mem_list(void)
-{
- struct mem_addr *mem;
-
-#ifdef DEBUG_MEM
- DEBUGMSG("can_del_mem_list, mem_head=%p\n", mem_head);
-#endif
- if(mem_head == NULL) {
- CANMSG("can_del_mem_list: no entries on the list - OK\n");
- return 0;
- }
-
- while((mem=mem_head) != NULL) {
- mem_head=mem->next;
- CANMSG("can_del_mem_list: deleting %p with size %d\n",
- mem->address, (int)mem->size);
- kfree(mem->address);
- kfree(mem);
- }
-
- return 0;
-}
-
-/**
- * can_request_io_region - request IO space region
- * @start: the first IO port address
- * @n: number of the consecutive IO port addresses
- * @name: name/label for the requested region
- *
- * The function hides system specific implementation of the feature.
- *
- * Return Value: returns positive value (1) in the case, that region could
- * be reserved for the driver. Returns zero (0) if there is collision with
- * other driver or region cannot be taken for some other reason.
- */
-int can_request_io_region(unsigned long start, unsigned long n, const char *name)
-{
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
- if(check_region(start,n)) return 0;
- request_region(start,n,name);
- return 1;
- #else
- return (request_region(start,n,name))?1:0;
- #endif
-}
-
-/**
- * can_release_io_region - release IO space region
- * @start: the first IO port address
- * @n: number of the consecutive IO port addresses
- */
-void can_release_io_region(unsigned long start, unsigned long n)
-{
- release_region(start,n);
-}
-
-/**
- * can_request_mem_region - request memory space region
- * @start: the first memory port physical address
- * @n: number of the consecutive memory port addresses
- * @name: name/label for the requested region
- *
- * The function hides system specific implementation of the feature.
- *
- * Return Value: returns positive value (1) in the case, that region could
- * be reserved for the driver. Returns zero (0) if there is collision with
- * other driver or region cannot be taken for some other reason.
- */
-int can_request_mem_region(unsigned long start, unsigned long n, const char *name)
-{
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
- return 1;
- #else
- return (request_mem_region(start,n,name))?1:0;
- #endif
-}
-
-/**
- * can_release_mem_region - release memory space region
- * @start: the first memory port physical address
- * @n: number of the consecutive memory port addresses
- */
-void can_release_mem_region(unsigned long start, unsigned long n)
-{
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
- return;
- #else
- release_mem_region(start,n);
- #endif
-}
-
/**
* can_base_addr_fixup - relocates board physical memory addresses to the CPU accessible ones
* @candev: pointer to the previously filled device/board, chips and message objects structures
return 0;
}
-
-
-#ifndef CAN_WITH_RTL
-
-/**
- * can_default_irq_dispatch - the first level interrupt dispatch handler
- * @irq: interrupt vector number, this value is system specific
- * @dev_id: driver private pointer registered at time of request_irq() call.
- * The CAN driver uses this pointer to store relationship of interrupt
- * to chip state structure - @struct canchip_t
- * @regs: system dependent value pointing to registers stored in exception frame
- *
- * File: src/setup.c
- */
-can_irqreturn_t can_default_irq_dispatch(int irq, void *dev_id, struct pt_regs *regs)
-{
- int retval;
- struct canchip_t *chip=(struct canchip_t *)dev_id;
-
- retval=chip->chipspecops->irq_handler(irq, chip);
- return CAN_IRQ_RETVAL(retval);
-}
-
-/**
- * can_chip_setup_irq - attaches chip to the system interrupt processing
- * @chip: pointer to CAN chip structure
- *
- * Return Value: returns negative number in the case of fail
- */
-int can_chip_setup_irq(struct canchip_t *chip)
-{
- if(chip==NULL)
- return -1;
- if(!chip->chipspecops->irq_handler)
- return 0;
- if(chip->flags & CHIP_IRQ_CUSTOM)
- return 1;
-
- if ((chip->flags & CHIP_IRQ_VME) == 0) {
- if (request_irq(chip->chip_irq,can_default_irq_dispatch,SA_SHIRQ,DEVICE_NAME,chip))
- return -1;
- else {
- DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);
- chip->flags |= CHIP_IRQ_SETUP;
- }
- } else {
-#ifdef CAN_ENABLE_VME_SUPPORT
- if (chip->chip_irq < 1 || chip->chip_irq > 255) {
- CANMSG("Bad irq parameter. (1 <= irq <= 255).\n");
- return -EINVAL;
- }
-
- request_vmeirq(chip->chip_irq, can_default_irq_dispatch, chip);
- DEBUGMSG("Registered VME interrupt vector %d\n",chip->chip_irq);
- chip->flags |= CHIP_IRQ_SETUP;
-#endif
- }
- return 1;
-}
-
-
-/**
- * can_chip_free_irq - unregisters chip interrupt handler from the system
- * @chip: pointer to CAN chip structure
- */
-void can_chip_free_irq(struct canchip_t *chip)
-{
- if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
- if(chip->flags & CHIP_IRQ_CUSTOM)
- return;
-
- if ((chip->flags & CHIP_IRQ_VME) == 0)
- free_irq(chip->chip_irq, chip);
- else {
-#ifdef CAN_ENABLE_VME_SUPPORT
- free_vmeirq(chip->chip_irq);
-#endif
- }
- chip->flags &= ~CHIP_IRQ_SETUP;
- }
-}
-
-#endif /*CAN_WITH_RTL*/
projects / lincan.git / commitdiff