X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/7b27dfa59f08097c83b79a90edd2c72716f930f7..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/include/c_can.h diff --git a/lincan/include/c_can.h b/lincan/include/c_can.h index b68bea0..5a189b3 100644 --- a/lincan/include/c_can.h +++ b/lincan/include/c_can.h @@ -14,7 +14,7 @@ */ extern inline void c_can_write_reg_w(const struct canchip_t *pchip, u16 data, unsigned reg) { - u32 address = pchip->chip_base_addr + reg; + can_ioptr_t address = pchip->chip_base_addr + reg; #ifndef CONFIG_OC_LINCAN_DYNAMICIO writew(data,address); #else /*CONFIG_OC_LINCAN_DYNAMICIO*/ @@ -24,7 +24,7 @@ extern inline void c_can_write_reg_w(const struct canchip_t *pchip, u16 data, un extern inline u16 c_can_read_reg_w(const struct canchip_t *pchip, unsigned reg) { - u32 address = pchip->chip_base_addr + reg; + can_ioptr_t address = pchip->chip_base_addr + reg; #ifndef CONFIG_OC_LINCAN_DYNAMICIO return readw(address); #else /*CONFIG_OC_LINCAN_DYNAMICIO*/ @@ -70,7 +70,7 @@ void c_can_registerdump(struct canchip_t *pchip); void c_can_if1_registerdump(struct canchip_t *pchip); -void c_can_irq_sync_activities(struct canchip_t *pchip, struct msgobj_t *obj); +void c_can_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj); int c_can_irq_handler(int irq, struct canchip_t *pchip);