LinCAN sources go through big white-space cleanup.

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

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index 30ac37731d6848ca74066a76b460b41f50d1f8be..cb0d4b506e4fb3b2c133a8361700ff6978403166 100644 (file)
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -63,13 +63,13 @@
 
 /*
 
 
 /*
 

-You need to know the following: 
-" RX1 is connected to ground. 
-" TX1 is not connected. 
-" CLKO is not connected. 
-" Setting the OCR register to 0xDA is a good idea. 
-  This means  normal output mode , push-pull and the correct polarity. 
-" In the CDR register, you should set CBP to 1. 
+You need to know the following:
+" RX1 is connected to ground.
+" TX1 is not connected.
+" CLKO is not connected.
+" Setting the OCR register to 0xDA is a good idea.
+  This means  normal output mode , push-pull and the correct polarity.
+" In the CDR register, you should set CBP to 1.

   You will probably also want to set the clock divider value to 0 (meaning divide-by-2),
   the Pelican bit, and the clock-off bit (you have no need for CLKOUT anyway.)
 
   You will probably also want to set the clock divider value to 0 (meaning divide-by-2),
   the Pelican bit, and the clock-off bit (you have no need for CLKOUT anyway.)
 


@@ -126,7 +126,7 @@ int kv_pcican_request_io(struct candevice_t *candev)
     error_io:
        pci_release_region(candev->sysdevptr.pcidev, 0);
     #endif /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/
     error_io:
        pci_release_region(candev->sysdevptr.pcidev, 0);
     #endif /*(LINUX_VERSION_CODE > KERNEL_VERSION(2,4,21))*/

-       
+

        return -ENODEV;
 }
 
        return -ENODEV;
 }
 


@@ -148,7 +148,7 @@ int kv_pcican_release_io(struct candevice_t *candev)
 
 void kv_pcican_write_register(unsigned data, can_ioptr_t address)
 {
 
 void kv_pcican_write_register(unsigned data, can_ioptr_t address)
 {

-       can_outb(data,address); 
+       can_outb(data,address);

 }
 
 unsigned kv_pcican_read_register(can_ioptr_t address)
 }
 
 unsigned kv_pcican_read_register(can_ioptr_t address)


@@ -193,15 +193,15 @@ int kv_pcican_reset(struct candevice_t *candev)
                kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
                kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);
                kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
                kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);

-               
+

                kv_pcican_read_register(chip->chip_base_addr+SJAIR);
        }
                kv_pcican_read_register(chip->chip_base_addr+SJAIR);
        }

-       
+

 
        kv_pcican_connect_irq(candev);
 
        return 0;
 
        kv_pcican_connect_irq(candev);
 
        return 0;

-}      
+}

 
 int kv_pcican_init_hw_data(struct candevice_t *candev)
 {
 
 int kv_pcican_init_hw_data(struct candevice_t *candev)
 {


@@ -211,14 +211,14 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        pcidev = can_pci_get_next_untaken_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID);
        if(pcidev == NULL)
                return -ENODEV;
        pcidev = can_pci_get_next_untaken_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID);
        if(pcidev == NULL)
                return -ENODEV;

-       
+

        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of PCICAN failed\n");
                can_pci_dev_put(pcidev);
                return -EIO;
        }
        candev->sysdevptr.pcidev=pcidev;
        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of PCICAN failed\n");
                can_pci_dev_put(pcidev);
                return -EIO;
        }
        candev->sysdevptr.pcidev=pcidev;

-       
+

        for(i=0;i<3;i++){
                if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
                        printk(KERN_CRIT "PCICAN region %d is not IO\n",i);
        for(i=0;i<3;i++){
                if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
                        printk(KERN_CRIT "PCICAN region %d is not IO\n",i);


@@ -229,7 +229,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        candev->dev_base_addr=pci_resource_start(pcidev,0); /*S5920*/
        candev->io_addr=pci_resource_start(pcidev,1); /*IO window for SJA1000 chips*/
        candev->res_addr=pci_resource_start(pcidev,2); /*XILINX board wide address*/
        candev->dev_base_addr=pci_resource_start(pcidev,0); /*S5920*/
        candev->io_addr=pci_resource_start(pcidev,1); /*IO window for SJA1000 chips*/
        candev->res_addr=pci_resource_start(pcidev,2); /*XILINX board wide address*/

-       
+

        /*candev->flags |= CANDEV_PROGRAMMABLE_IRQ;*/
 
        if (!strcmp(candev->hwname,"pcican-s")) {
        /*candev->flags |= CANDEV_PROGRAMMABLE_IRQ;*/
 
        if (!strcmp(candev->hwname,"pcican-s")) {


@@ -262,7 +262,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
 
        if(candev->sysdevptr.pcidev==NULL)
                return -ENODEV;
 
        if(candev->sysdevptr.pcidev==NULL)
                return -ENODEV;

-       
+

        candev->chip[chipnr]->chip_irq=candev->sysdevptr.pcidev->irq;
 
        sja1000p_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_irq=candev->sysdevptr.pcidev->irq;
 
        sja1000p_fill_chipspecops(candev->chip[chipnr]);


@@ -278,7 +278,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
        candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;
 
        return 0;
        candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;
 
        return 0;

-}      
+}

 
 int kv_pcican_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
 int kv_pcican_init_obj_data(struct canchip_t *chip, int objnr)
 {