Added prefix sja to all sjaXX_YY register bit-fields definitions.

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

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index 2b9893ec4713ca1b3ff241262fdfa9d781d1632d..273db868b21d12d3edcd5606f0dbc7473f86e05d 100644 (file)
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -148,24 +148,24 @@ int kv_pcican_reset(struct candevice_t *candev)
                if(!candev->chip[chip_nr]) continue;
                chip=candev->chip[chip_nr];
 
-               kv_pcican_write_register(MOD_RM, chip->chip_base_addr+SJAMOD);
+               kv_pcican_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
                udelay(1000);
 
                cdr=kv_pcican_read_register(chip->chip_base_addr+SJACDR);
-               kv_pcican_write_register(cdr|CDR_PELICAN, chip->chip_base_addr+SJACDR);
+               kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
                kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);
 
                i=20;
                kv_pcican_write_register(0, chip->chip_base_addr+SJAMOD);
-               while (kv_pcican_read_register(chip->chip_base_addr+SJAMOD)&MOD_RM){
+               while (kv_pcican_read_register(chip->chip_base_addr+SJAMOD)&sjaMOD_RM){
                        if(!i--) return -ENODEV;
                        udelay(1000);
                        kv_pcican_write_register(0, chip->chip_base_addr+SJAMOD);
                }
 
                cdr=kv_pcican_read_register(chip->chip_base_addr+SJACDR);
-               kv_pcican_write_register(cdr|CDR_PELICAN, chip->chip_base_addr+SJACDR);
+               kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
                kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);
                
@@ -240,7 +240,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
        candev->chip[chipnr]->int_cpu_reg = 0;
        candev->chip[chipnr]->int_clk_reg = 0;
        candev->chip[chipnr]->int_bus_reg = 0;
-       candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
+       candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
        candev->chip[chipnr]->sja_ocr_reg = KV_PCICAN_OCR_DEFAULT_STD;
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;