X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/cc1811f284f00d214e198cb20b466d261201385b..b34a548a5dfd2f0b068fd835a4cd51680d851068:/lincan/src/pcccan.c

diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index 6f7b576..64e6b70 100644
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -219,7 +219,6 @@ int pcccan_init_chip_data(struct candevice_t *candev, int chipnr)
 int pcccan_init_obj_data(struct chip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
-	chip->msgobj[objnr]->flags=0;
 	
 	return 0;
 }
@@ -254,10 +253,10 @@ int pcccan_program_irq(struct candevice_t *candev)
  */
 void pcccan_write_register(unsigned char data, unsigned long address)
 {
-	disable_irq(pcccan_irq);
+	can_disable_irq(pcccan_irq);
 	outb(address - pcccan_base, pcccan_base+1);
 	outb(data, pcccan_base+6);
-	enable_irq(pcccan_irq);
+	can_enable_irq(pcccan_irq);
 }
 
 /**
@@ -273,10 +272,10 @@ void pcccan_write_register(unsigned char data, unsigned long address)
 unsigned pcccan_read_register(unsigned long address)
 {
 	unsigned ret;
-	disable_irq(pcccan_irq);
+	can_disable_irq(pcccan_irq);
 	outb(address - pcccan_base, pcccan_base+1);
 	ret=inb(pcccan_base+2);
-	enable_irq(pcccan_irq);
+	can_enable_irq(pcccan_irq);
 	return ret;
 
 }