Separated normal read and RTR assisted read transfer.

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

diff --git a/lincan/src/hms30c7202_can.c b/lincan/src/hms30c7202_can.c
index af9f72902572fb3ae65f1967c15a8e56d5c9e6b0..df21d2db2be1002b52a097d9251a36ebd724c3c0 100644 (file)
--- a/lincan/src/hms30c7202_can.c
+++ b/lincan/src/hms30c7202_can.c
@@ -6,7 +6,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 <linux/delay.h>
@@ -143,7 +143,7 @@ int hms30c7202_reset(  struct candevice_t *candev)
 {
        int i=0;
        int enableTest=0, disableTest=0;
-       struct chip_t *pchip = candev->chip[0];
+       struct canchip_t *pchip = candev->chip[0];
        
        enableTest = pchip->chipspecops->enable_configuration(pchip);
        disableTest = pchip->chipspecops->disable_configuration(pchip);
@@ -190,7 +190,7 @@ int hms30c7202_reset(  struct candevice_t *candev)
  * File: src/template.c
  */
 int hms30c7202_init_hw_data(struct candevice_t *candev) 
-/*( struct chip_t *pchip, u16 chip_nr, u16 startminor, u32 baseaddr, u8 irq )*/
+/*( struct canchip_t *pchip, u16 chip_nr, u16 startminor, u32 baseaddr, u8 irq )*/
 {
        //      u32 intCntrVAddr = 0;
        u32 gpioVAddr = 0;
@@ -294,20 +294,20 @@ int hms30c7202_init_hw_data(struct candevice_t *candev)
  */
 int hms30c7202_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type=CHIP_TYPE;
+       // Register chip operations
+       c_can_fill_chipspecops(candev->chip[chipnr]);
+       /* override chip provided default value */
+       candev->chip[chipnr]->max_objects = NR_MSGOBJ;
+
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
        
        candev->chip[chipnr]->clock = 16000000;
        
-       candev->chip[chipnr]->max_objects = NR_MSGOBJ;
-       
        /*candev->chip[chipnr]->int_clk_reg = 0x0;
        candev->chip[chipnr]->int_bus_reg = 0x0;
        candev->chip[chipnr]->sja_cdr_reg = 0x0;
        candev->chip[chipnr]->sja_ocr_reg = 0x0;*/
        
-       // Register chip operations
-       c_can_register(candev->chip[chipnr]->chipspecops);
 
        return 0;
 }
@@ -327,7 +327,7 @@ int hms30c7202_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int hms30c7202_init_obj_data(struct chip_t *chip, int objnr)
+int hms30c7202_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
        DEBUGMSG("(c%d)calling hms30c7202_init_obj_data( ...)\n", chip->chip_idx);