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

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index 7f11d5c..abbbe1a 100644
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -93,7 +93,6 @@ int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
 int smartcan_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;
 }
@@ -101,19 +100,19 @@ int smartcan_init_obj_data(struct chip_t *chip, int objnr)
 
 void smartcan_write_register(unsigned char data, unsigned long address)
 {
-	disable_irq(smartcan_irq);
+	can_disable_irq(smartcan_irq);
 	outb(address-smartcan_base,smartcan_base);
 	outb(data,smartcan_base+1);
-	enable_irq(smartcan_irq);
+	can_enable_irq(smartcan_irq);
 }
 
 unsigned smartcan_read_register(unsigned long address)
 {
 	unsigned ret;
-	disable_irq(smartcan_irq);
+	can_disable_irq(smartcan_irq);
 	outb(address-smartcan_base,smartcan_base);
 	ret=inb(smartcan_base+1);
-	enable_irq(smartcan_irq);
+	can_enable_irq(smartcan_irq);
 	return ret;
 }