Separated normal read and RTR assisted read transfer.

[lincan.git] / lincan / src / nsi.c

diff --git a/lincan/src/nsi.c b/lincan/src/nsi.c
index 03ba230bc761348d3785eef043e07f5ddbeecc70..777850bac2f1c39648e2a1fdbedf2dd8c62c9a21 100644 (file)
--- a/lincan/src/nsi.c
+++ b/lincan/src/nsi.c
@@ -4,7 +4,7 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
 #include "../include/can.h"
@@ -119,11 +119,10 @@ int nsi_init_hw_data(struct candevice_t *candev)
  * argument supplied at module loading time.
  * The clock argument holds the chip clock value in Hz.
  */
-#define CHIP_TYPE "i82527"
 
 int nsi_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type=CHIP_TYPE;
+       i82527_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=
            candev->io_addr;
        candev->chip[chipnr]->clock = 16000000;
@@ -146,7 +145,7 @@ int nsi_init_chip_data(struct candevice_t *candev, int chipnr)
  * base address.
  * Unless the hardware uses a segmented memory map, flags can be set zero.
  */
-int nsi_init_obj_data(struct chip_t *chip, int objnr)
+int nsi_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
        chip->msgobj[objnr]->obj_base_addr=
@@ -170,7 +169,7 @@ int nsi_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void nsi_write_register(unsigned char data, unsigned long address)
+void nsi_write_register(unsigned data, unsigned long address)
 {
     /* address is an absolute address */