X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/pccan.c diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c index acfab07..7086151 100644 --- a/lincan/src/pccan.c +++ b/lincan/src/pccan.c @@ -77,7 +77,7 @@ int pccanq_request_io(struct candevice_t *candev) { unsigned long io_addr; int i; - + if (pccand_request_io(candev)) return -ENODEV; @@ -202,7 +202,7 @@ int pccanq_reset(struct candevice_t *candev) can_outb(0x00,candev->res_addr); } outb_p(0x01,candev->res_addr); - + can_outb(0x00,candev->chip[2]->chip_base_addr+SJACR); can_outb(0x00,candev->chip[3]->chip_base_addr+SJACR); @@ -219,7 +219,7 @@ int pccanq_reset(struct candevice_t *candev) CANMSG("Please check your hardware.\n"); return -ENODEV; } - else + else DEBUGMSG("Chip%d reset status ok.\n",chip_nr); } for (chip_nr=2; chip_nr<4; chip_nr++) { @@ -242,7 +242,7 @@ int pccanq_reset(struct candevice_t *candev) can_enable_irq(candev->chip[i]->chip_irq); return 0; -} +} int pccan_init_hw_data(struct candevice_t *candev) { @@ -279,7 +279,7 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr) candev->chip[chipnr]->int_clk_reg=iCLK_SL1; candev->chip[chipnr]->int_bus_reg=iBUS_CBY; candev->chip[chipnr]->sja_cdr_reg = 0; - candev->chip[chipnr]->sja_ocr_reg = 0; + candev->chip[chipnr]->sja_ocr_reg = 0; } else{ sja1000_fill_chipspecops(candev->chip[chipnr]); @@ -289,8 +289,8 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr) candev->chip[chipnr]->int_bus_reg = 0; candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CLK_OFF; - candev->chip[chipnr]->sja_ocr_reg = - sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH; + candev->chip[chipnr]->sja_ocr_reg = + sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH; } candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(0x1000*chipnr+0x2000+candev->io_addr); } @@ -302,14 +302,14 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr) candev->chip[chipnr]->int_clk_reg = 0; candev->chip[chipnr]->int_bus_reg = 0; candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CLK_OFF; - candev->chip[chipnr]->sja_ocr_reg = - sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH; + candev->chip[chipnr]->sja_ocr_reg = + sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH; } candev->chip[chipnr]->clock = 16000000; return 0; -} +} int pccan_init_obj_data(struct canchip_t *chip, int objnr) { @@ -365,7 +365,7 @@ int pccan_program_irq(struct candevice_t *candev) inline void pccan_write_register(unsigned data, can_ioptr_t address) { - can_outb(data,address); + can_outb(data,address); } unsigned pccan_read_register(can_ioptr_t address)