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

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index eb344b4..e01a9eb 100644
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -56,18 +56,18 @@ void kv_pcican_disconnect_irq(struct candevice_t *candev)
 {
 	unsigned long tmp;
 	/* Disable interrupts from card */
-	tmp = inl(candev->dev_base_addr + S5920_INTCSR);
+	tmp = can_inl(candev->dev_base_addr + S5920_INTCSR);
 	tmp &= ~INTCSR_ADDON_INTENABLE_M;
-	outl(tmp, candev->dev_base_addr + S5920_INTCSR);
+	can_outl(tmp, candev->dev_base_addr + S5920_INTCSR);
 }
 
 void kv_pcican_connect_irq(struct candevice_t *candev)
 {
 	unsigned long tmp;
 	/* Enable interrupts from card */
-	tmp = inl(candev->dev_base_addr + S5920_INTCSR);
+	tmp = can_inl(candev->dev_base_addr + S5920_INTCSR);
 	tmp |= INTCSR_ADDON_INTENABLE_M;
-	outl(tmp, candev->dev_base_addr + S5920_INTCSR);
+	can_outl(tmp, candev->dev_base_addr + S5920_INTCSR);
 }
 
 
@@ -121,26 +121,26 @@ int kv_pcican_release_io(struct candevice_t *candev)
 }
 
 
-void kv_pcican_write_register(unsigned data, unsigned long address)
+void kv_pcican_write_register(unsigned data, can_ioptr_t address)
 {
-	outb(data,address); 
+	can_outb(data,address); 
 }
 
-unsigned kv_pcican_read_register(unsigned long address)
+unsigned kv_pcican_read_register(can_ioptr_t address)
 {
-	return inb(address);
+	return can_inb(address);
 }
 
 int kv_pcican_reset(struct candevice_t *candev)
 {
 	int i=0,chip_nr;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	unsigned cdr;
 
 	DEBUGMSG("Resetting kv_pcican hardware ...\n");
 
 	/* Assert PTADR# - we're in passive mode so the other bits are not important */
-	outl(0x80808080L, candev->dev_base_addr + S5920_PTCR);
+	can_outl(0x80808080L, candev->dev_base_addr + S5920_PTCR);
 
 	kv_pcican_disconnect_irq(candev);
 
@@ -248,7 +248,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
 	return 0;
 }	
 
-int kv_pcican_init_obj_data(struct chip_t *chip, int objnr)
+int kv_pcican_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
 	return 0;