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

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

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index d91603cc45ff61d6efeb20b72e6830b885fe973e..39d52e70aad74f4a1836eb9af4521ba8d265c98c 100644 (file)
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -105,7 +105,7 @@ int bfadcan_reset(struct candevice_t *candev)
 {
 
        int i;
 {
 
        int i;

-       struct chip_t *chip=candev->chip[0];
+       struct canchip_t *chip=candev->chip[0];

        unsigned cdr;
        
        bfadcan_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
        unsigned cdr;
        
        bfadcan_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);


@@ -234,7 +234,7 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */

-int bfadcan_init_obj_data(struct chip_t *chip, int objnr)
+int bfadcan_init_obj_data(struct canchip_t *chip, int objnr)

 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;
        
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;