X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/unican.c

diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index fde7c00..7b27ade 100644
--- a/lincan/src/unican.c
+++ b/lincan/src/unican.c
@@ -29,26 +29,14 @@ static void unican_delay(long msdelay)
 
 }
 
-
-long unican_bus_latency(struct msgobj_t *obj)
-{
-	long latency;
-	latency=obj->hostchip->baudrate;
-	if(latency){
-		latency=(long)HZ*1000/latency;
-	}
-	return latency;
-}
-
-
 /* * * unican Chip Functionality * * */
 
-int unican_enable_configuration(struct chip_t *chip)
+int unican_enable_configuration(struct canchip_t *chip)
 {
 	return 0;
 }
 
-int unican_disable_configuration(struct chip_t *chip)
+int unican_disable_configuration(struct canchip_t *chip)
 {
 	return 0;
 }
@@ -60,7 +48,7 @@ int unican_disable_configuration(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_chip_config(struct chip_t *chip)
+int unican_chip_config(struct canchip_t *chip)
 {
 	int ret;
 	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
@@ -125,7 +113,7 @@ int unican_chip_config(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_extended_mask(struct chip_t *chip, unsigned long code, unsigned  long mask)
+int unican_extended_mask(struct canchip_t *chip, unsigned long code, unsigned  long mask)
 {
 	return 0;
 }
@@ -142,7 +130,7 @@ int unican_extended_mask(struct chip_t *chip, unsigned long code, unsigned  long
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int unican_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
 							int sampl_pt, int flags)
 {
 	int ret;
@@ -184,7 +172,7 @@ int unican_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
  *
  * File: src/unican.c
  */
-void unican_read(struct chip_t *chip, struct msgobj_t *obj) {
+void unican_read(struct canchip_t *chip, struct msgobj_t *obj) {
 	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
 	__u16 *ptr16;
 	__u16 u;
@@ -259,7 +247,7 @@ void unican_read(struct chip_t *chip, struct msgobj_t *obj) {
  *	Positive value indicates immediate reception of message.
  * File: src/unican.c
  */
-int unican_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
+int unican_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	return 0;
 }
@@ -274,7 +262,7 @@ int unican_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_pre_write_config(struct chip_t *chip, struct msgobj_t *obj, 
+int unican_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, 
 							struct canmsg_t *msg)
 {
 	return 0;
@@ -291,7 +279,7 @@ int unican_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_send_msg(struct chip_t *chip, struct msgobj_t *obj, 
+int unican_send_msg(struct canchip_t *chip, struct msgobj_t *obj, 
 							struct canmsg_t *msg)
 {
 	return 0;
@@ -306,7 +294,7 @@ int unican_send_msg(struct chip_t *chip, struct msgobj_t *obj,
  *	Zero value indicates finishing of all issued transmission requests.
  * File: src/unican.c
  */
-int unican_check_tx_stat(struct chip_t *chip)
+int unican_check_tx_stat(struct canchip_t *chip)
 {
 	return 0;
 }
@@ -320,7 +308,7 @@ int unican_check_tx_stat(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_set_btregs(struct chip_t *chip, unsigned short btr0, 
+int unican_set_btregs(struct canchip_t *chip, unsigned short btr0, 
 							unsigned short btr1)
 {
 	int ret;
@@ -342,7 +330,7 @@ int unican_set_btregs(struct chip_t *chip, unsigned short btr0,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_start_chip(struct chip_t *chip)
+int unican_start_chip(struct canchip_t *chip)
 {
 	return 0;
 }
@@ -354,11 +342,39 @@ int unican_start_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_stop_chip(struct chip_t *chip)
+int unican_stop_chip(struct canchip_t *chip)
 {
 	return 0;
 }
 
+/**
+ * unican_attach_to_chip: - attaches to the chip, setups registers and state
+ * @chip: pointer to chip state structure
+ *
+ * Return Value: negative value reports error.
+ * File: src/sja1000p.c
+ */
+int unican_attach_to_chip(struct canchip_t *chip)
+{
+	return 0;
+}
+
+/**
+ * unican_release_chip: - called before chip structure removal if %CHIP_ATTACHED is set
+ * @chip: pointer to chip state structure
+ *
+ * Return Value: negative value reports error.
+ * File: src/sja1000p.c
+ */
+int unican_release_chip(struct canchip_t *chip)
+{
+	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
+
+	unican_stop_chip(chip);
+	cl2_clear_interrupt(chipext);
+
+	return 0;
+}
 
 /**
  * unican_remote_request: - configures message object and asks for RTR message
@@ -368,7 +384,7 @@ int unican_stop_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_remote_request(struct chip_t *chip, struct msgobj_t *obj)
+int unican_remote_request(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	CANMSG("unican_remote_request not implemented\n");
 	return -ENOSYS;
@@ -383,7 +399,7 @@ int unican_remote_request(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_standard_mask(struct chip_t *chip, unsigned short code,
+int unican_standard_mask(struct canchip_t *chip, unsigned short code,
 		unsigned short mask)
 {
 	CANMSG("unican_standard_mask not implemented\n");
@@ -397,7 +413,7 @@ int unican_standard_mask(struct chip_t *chip, unsigned short code,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_clear_objects(struct chip_t *chip)
+int unican_clear_objects(struct canchip_t *chip)
 {
 	CANMSG("unican_clear_objects not implemented\n");
 	return -ENOSYS;
@@ -411,7 +427,7 @@ int unican_clear_objects(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_config_irqs(struct chip_t *chip, short irqs)
+int unican_config_irqs(struct canchip_t *chip, short irqs)
 {
 
 	CANMSG("unican_config_irqs not implemented\n");
@@ -429,7 +445,7 @@ int unican_config_irqs(struct chip_t *chip, short irqs)
  * unican_irq_write_handler() for transmit events.
  * File: src/unican.c
  */
-void unican_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
+void unican_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	int cmd;
 	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
@@ -531,7 +547,7 @@ void unican_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
 
 }
 
-void unican_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
+void unican_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 
@@ -558,10 +574,7 @@ void unican_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
 /**
  * unican_irq_handler: - interrupt service routine
  * @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 chip_t
- * @regs: system dependent value pointing to registers stored in exception frame
+ * @chip: pointer to chip state structure
  * 
  * Interrupt handler is activated when state of CAN controller chip changes,
  * there is message to be read or there is more space for new messages or
@@ -570,9 +583,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 canchip_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 +592,16 @@ 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;
+	if (cl2_get_status(chipext, &status) == CL2_NO_REQUEST) {
+		/* Reenable interrupts generation, this has to be even there, 
+		 * because irq_accept disables interrupts
+		 */
+		cl2_gen_interrupt(chipext);
+		return CANCHIP_IRQ_NONE;
+	}
 
 	cl2_clear_interrupt(chipext);
 
@@ -607,12 +624,31 @@ can_irqreturn_t unican_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 		unican_read(chip, obj);
 	}
 
+	/* Reenable interrupts generation */
 	cl2_gen_interrupt(chipext);
 
-	return CAN_IRQ_HANDLED;
+	return CANCHIP_IRQ_HANDLED;
 }
 
 
+/**
+ * unican_irq_accept: - fast irq accept routine, blocks further interrupts
+ * @irq: interrupt vector number, this value is system specific
+ * @chip: pointer to chip state structure
+ * 
+ * This routine only accepts interrupt reception and stops further
+ * incoming interrupts, but does not handle situation causing interrupt.
+ * File: src/unican.c
+ */
+int unican_irq_accept(int irq, struct canchip_t *chip)
+{
+	sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
+
+	cl2_clear_interrupt(chipext);
+
+	return CANCHIP_IRQ_ACCEPTED;
+}
+
 /*void unican_do_tx_timeout(unsigned long data)
 {
 	struct msgobj_t *obj=(struct msgobj_t *)data;
@@ -627,7 +663,7 @@ can_irqreturn_t unican_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
-int unican_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
+int unican_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	can_preempt_disable();
 
@@ -657,12 +693,12 @@ int unican_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
  */
 int unican_request_io(struct candevice_t *candev)
 {
-        unsigned long remap_addr;
+        can_ioptr_t remap_addr;
 	if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - unican")) {
 		CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr);
 		return -ENODEV;
 	}
-	if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
+	if ( !( remap_addr = ioremap( candev->io_addr, IO_RANGE ) ) ) {
 		CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr);
 		can_release_mem_region(candev->io_addr,IO_RANGE);
 		return -ENODEV;
@@ -682,7 +718,7 @@ int unican_request_io(struct candevice_t *candev)
  */
 int unican_release_io(struct candevice_t *candev)
 {
-	iounmap((void*)candev->dev_base_addr);
+	iounmap(candev->dev_base_addr);
 	can_release_mem_region(candev->io_addr,IO_RANGE);
 	return 0;
 }
@@ -698,7 +734,7 @@ int unican_reset(struct candevice_t *candev)
 {
 	int ret;
 	int i;
-	struct chip_t *chip = candev->chip[0];
+	struct canchip_t *chip = candev->chip[0];
 	sCAN_CARD *chipext;
 	
 
@@ -759,8 +795,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
@@ -771,14 +805,14 @@ 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;
+	struct canchip_t *chip = candev->chip[chipnr];
+	chip->chip_type = "unican";
 	chip->chip_base_addr = 0;
 	chip->clock = 10000000;
 	chip->int_clk_reg = 0x0;
 	chip->int_bus_reg = 0x0;
 	chip->max_objects = 1;
-	chip->chip_base_addr=candev->io_addr;
+	chip->chip_base_addr=candev->dev_base_addr;
 			
 	CANMSG("initializing unican chip operations\n");
 	chip->chipspecops->chip_config=unican_chip_config;
@@ -797,9 +831,12 @@ int unican_init_chip_data(struct candevice_t *candev, int chipnr)
 	chip->chipspecops->enable_configuration=unican_enable_configuration;
 	chip->chipspecops->disable_configuration=unican_disable_configuration;
 	chip->chipspecops->set_btregs=unican_set_btregs;
+	chip->chipspecops->attach_to_chip=unican_attach_to_chip;
+	chip->chipspecops->release_chip=unican_release_chip;
 	chip->chipspecops->start_chip=unican_start_chip;
 	chip->chipspecops->stop_chip=unican_stop_chip;
 	chip->chipspecops->irq_handler=unican_irq_handler;
+	chip->chipspecops->irq_accept=unican_irq_accept;
 
 	return 0;
 }
@@ -812,7 +849,7 @@ int unican_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/unican.c
  */
-int unican_init_obj_data(struct chip_t *chip, int objnr)
+int unican_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	struct msgobj_t *obj=chip->msgobj[objnr];
 	obj->obj_base_addr=chip->chip_base_addr;
@@ -854,7 +891,7 @@ int unican_register(struct hwspecops_t *hwspecops)
 
 int unican_pci_request_io(struct candevice_t *candev)
 {
-        unsigned long remap_addr;
+        can_ioptr_t remap_addr;
 
     #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))
 	if(pci_request_region(candev->sysdevptr.pcidev, 0, "unican_pci") != 0){
@@ -868,11 +905,10 @@ 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;
+	candev->io_addr=pci_resource_start(candev->sysdevptr.pcidev,0);
+	candev->res_addr=candev->io_addr;
 
-	if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
+	if ( !( remap_addr = 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);
@@ -885,7 +921,8 @@ int unican_pci_request_io(struct candevice_t *candev)
 	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);
+		can_ioptr2ulong(candev->dev_base_addr),
+		can_ioptr2ulong(candev->chip[0]->chip_base_addr));
 
 	return 0;
 }
@@ -893,7 +930,7 @@ int unican_pci_request_io(struct candevice_t *candev)
 
 int unican_pci_release_io(struct candevice_t *candev)
 {
-	iounmap((void*)candev->dev_base_addr);
+	iounmap(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))*/
@@ -922,9 +959,9 @@ 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);
-	candev->io_addr=candev->dev_base_addr;
-	candev->res_addr=candev->dev_base_addr;
+	candev->io_addr=pci_resource_start(pcidev,0);
+	candev->res_addr=candev->io_addr;
+	candev->dev_base_addr=NULL;
 	
 	/*candev->flags |= CANDEV_PROGRAMMABLE_IRQ;*/