X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ca0986f8db14d448065898cec6d9dac67075488f..258e4a224adc90317b3d11622a3076ba6d61b0d2:/lincan/src/unican.c

diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index 488d8e1..957d5af 100644
--- a/lincan/src/unican.c
+++ b/lincan/src/unican.c
@@ -3,7 +3,7 @@
  * Written for new CAN driver version 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
  */ 
 
 #include "../include/can.h"
@@ -570,9 +570,8 @@ void unican_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
  * message queues.
  * File: src/unican.c
  */
-can_irqreturn_t unican_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+int unican_irq_handler(int irq, struct chip_t *chip)
 {
-	struct chip_t *chip=(struct chip_t *)dev_id;
 	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
 	struct msgobj_t *obj=chip->msgobj[0];
 	__u16 status;
@@ -580,11 +579,11 @@ can_irqreturn_t unican_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 
 	if(!(chip->flags&CHIP_CONFIGURED)) {
 		CANMSG("unican_irq_handler: called for non-configured device\n");
-		return CAN_IRQ_NONE;
+		return CANCHIP_IRQ_NONE;
 	}
 
 	if (cl2_get_status(chipext, &status) == CL2_NO_REQUEST)
-		return CAN_IRQ_NONE;
+		return CANCHIP_IRQ_NONE;
 
 	cl2_clear_interrupt(chipext);
 
@@ -609,7 +608,7 @@ can_irqreturn_t unican_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 
 	cl2_gen_interrupt(chipext);
 
-	return CAN_IRQ_HANDLED;
+	return CANCHIP_IRQ_HANDLED;
 }
 
 
@@ -759,8 +758,6 @@ int unican_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "unican"
-
 /**
  * unican_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -772,7 +769,7 @@ int unican_init_hw_data(struct candevice_t *candev)
 int unican_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	struct chip_t *chip = candev->chip[chipnr];
-	chip->chip_type = CHIP_TYPE;
+	chip->chip_type = "unican";
 	chip->chip_base_addr = 0;
 	chip->clock = 10000000;
 	chip->int_clk_reg = 0x0;
@@ -854,6 +851,8 @@ int unican_register(struct hwspecops_t *hwspecops)
 
 int unican_pci_request_io(struct candevice_t *candev)
 {
+        unsigned long remap_addr;
+
     #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))
 	if(pci_request_region(candev->sysdevptr.pcidev, 0, "unican_pci") != 0){
 		CANMSG("Request of Unican PCI range failed\n");
@@ -866,12 +865,32 @@ int unican_pci_request_io(struct candevice_t *candev)
 	}
     #endif /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/
 
+	candev->dev_base_addr=pci_resource_start(candev->sysdevptr.pcidev,0);
+	candev->io_addr=candev->dev_base_addr;
+	candev->res_addr=candev->dev_base_addr;
+
+	if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
+		CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr);
+	    #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))
+		pci_release_region(candev->sysdevptr.pcidev, 0);
+	    #else /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/
+		pci_release_regions(candev->sysdevptr.pcidev);
+	    #endif /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/
+		return -ENODEV;
+	
+	}
+	can_base_addr_fixup(candev, remap_addr);
+	DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + IO_RANGE - 1);
+	DEBUGMSG("VMA: dev_base_addr: 0x%lx chip_base_addr: 0x%lx\n", 
+		candev->dev_base_addr, candev->chip[0]->chip_base_addr);
+
 	return 0;
 }
 
 
 int unican_pci_release_io(struct candevice_t *candev)
 {
+	iounmap((void*)candev->dev_base_addr);
     #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))
 	pci_release_region(candev->sysdevptr.pcidev, 0);
     #else /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/
@@ -900,7 +919,7 @@ int unican_pci_init_hw_data(struct candevice_t *candev)
 		printk(KERN_CRIT "Unican PCI region 0 is not MEM\n");
 		return -EIO;
 	}
-	candev->dev_base_addr=pci_resource_start(pcidev,0); /*S5920*/
+	candev->dev_base_addr=pci_resource_start(pcidev,0);
 	candev->io_addr=candev->dev_base_addr;
 	candev->res_addr=candev->dev_base_addr;
 	
@@ -918,7 +937,7 @@ int unican_pci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	int ret;
 	candev->chip[chipnr]->chip_irq=candev->sysdevptr.pcidev->irq;
-	ret = unican_pci_init_chip_data(candev, chipnr);
+	ret = unican_init_chip_data(candev, chipnr);
 	candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;
 	return ret;
 }