To prevent future name collisions "chip_t" changed to "canchip_t"

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

diff --git a/lincan/include/pikronisa.h b/lincan/include/pikronisa.h
index 7fa56dda9bb68cf2f86fe47fca26f8d71b44a489..a6ba3998a147084e322ee781b68df54de02e8484 100644 (file)
--- a/lincan/include/pikronisa.h
+++ b/lincan/include/pikronisa.h
@@ -1,21 +1,22 @@
 /* pikronisa.h
  * Header file for the Linux CAN-bus driver.
  * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
+ * Added by Pavel Pisa pisa@cmp.felk.cvut.cz
+ * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version 0.7  6 Aug 2001
+ * Version lincan-0.3  17 Jun 2004
  *
  * Support for PiKRON Ltd ISA CAN card using 
  * memory mapped SJA1000 controller
- * Added by Pavel Pisa pisa@cmp.felk.cvut.cz
  */
 
-int pikronisa_request_io(unsigned long io_addr);
-int pikronisa_release_io(unsigned long io_addr);
-int pikronisa_reset(int card); 
-int pikronisa_init_hw_data(int card);
-int pikronisa_init_chip_data(int card, int chipnr);
-int pikronisa_init_obj_data(int chipnr, int objnr);
-void pikronisa_write_register(unsigned char data, unsigned long address);
+int pikronisa_request_io(struct candevice_t *candev);
+int pikronisa_release_io(struct candevice_t *candev);
+int pikronisa_reset(struct candevice_t *candev); 
+int pikronisa_init_hw_data(struct candevice_t *candev);
+int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr);
+int pikronisa_init_obj_data(struct canchip_t *chip, int objnr);
+int pikronisa_program_irq(struct candevice_t *candev);
+void pikronisa_write_register(unsigned data, unsigned long address);
 unsigned pikronisa_read_register(unsigned long address);
-int pikronisa_program_irq(int card);