Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / cc_can104.h

diff --git a/lincan/include/cc_can104.h b/lincan/include/cc_can104.h
index 3f2b063fd9a3b1a19676a75b4f5e5f25315c1390..b3e5b1006e632eef38d7cd8550a4a47295e5c268 100644 (file)
--- a/lincan/include/cc_can104.h
+++ b/lincan/include/cc_can104.h
@@ -12,8 +12,8 @@ int cc104_release_io(struct candevice_t *candev);
 int cc104_reset(struct candevice_t *candev); 
 int cc104_init_hw_data(struct candevice_t *candev);
 int cc104_init_chip_data(struct candevice_t *candev, int chipnr);
-int cc104_init_obj_data(struct chip_t *chip, int objnr);
-void cc104_write_register(unsigned data, unsigned long address);
-unsigned cc104_read_register(unsigned long address);
+int cc104_init_obj_data(struct canchip_t *chip, int objnr);
+void cc104_write_register(unsigned data, can_ioptr_t address);
+unsigned cc104_read_register(can_ioptr_t address);
 int cc104_program_irq(struct candevice_t *candev);