Unified module parameters style to new one for 2.6.x kernels.

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

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index ac8378922880c0b9af287be4693ef4fa04accc1c..bce1226f1bd4f499c3d3b498c6eb4805e45fb996 100644 (file)
--- a/lincan/src/setup.c
+++ b/lincan/src/setup.c
@@ -16,7 +16,7 @@
 
 int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
 int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);
 
 int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
 int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);

-int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate);
+int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock);

 int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
 
 /**
 int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
 
 /**


@@ -187,6 +187,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
        int chipnr;
        long bd;
        int irqsig=-1;
        int chipnr;
        long bd;
        int irqsig=-1;

+       long clock;

        
        candev=(struct candevice_t *)can_checked_malloc(sizeof(struct candevice_t));
        if (candev==NULL)
        
        candev=(struct candevice_t *)can_checked_malloc(sizeof(struct candevice_t));
        if (candev==NULL)


@@ -202,6 +203,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
        candev->hwname=hw[card];
        candev->io_addr=io[card];
        candev->dev_base_addr=io[card];
        candev->hwname=hw[card];
        candev->io_addr=io[card];
        candev->dev_base_addr=io[card];

+       clock=clockfreq[card];

 
        candev->hwspecops=(struct hwspecops_t *)can_checked_malloc(sizeof(struct hwspecops_t));
        if (candev->hwspecops==NULL)
 
        candev->hwspecops=(struct hwspecops_t *)can_checked_malloc(sizeof(struct hwspecops_t));
        if (candev->hwspecops==NULL)


@@ -224,7 +226,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
                bd=baudrate[*chan_param_idx_p+chipnr];
                if(!bd) bd=baudrate[0];
        
                bd=baudrate[*chan_param_idx_p+chipnr];
                if(!bd) bd=baudrate[0];
        

-               if ((ret=init_chip_struct(candev, chipnr, irqsig, bd*1000)))
+               if ((ret=init_chip_struct(candev, chipnr, irqsig, bd*1000, clock*1000)))

                        goto error_chip;
        }
        
                        goto error_chip;
        }
        


@@ -270,6 +272,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
  * @chipnr: index of the chip in the corresponding device/board structure
  * @irq: chip IRQ number or (-1) if not appropriate
  * @baudrate: baudrate in the units of 1Bd
  * @chipnr: index of the chip in the corresponding device/board structure
  * @irq: chip IRQ number or (-1) if not appropriate
  * @baudrate: baudrate in the units of 1Bd

+ * @clock: optional chip base clock frequency in 1Hz step

  *
  * Chip structure is allocated and chip specific operations are filled by 
  * call to board specific init_chip_data() which calls chip specific
  *
  * Chip structure is allocated and chip specific operations are filled by 
  * call to board specific init_chip_data() which calls chip specific


@@ -278,7 +281,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
  *
  * Return Value: returns negative number in the case of fail
  */
  *
  * Return Value: returns negative number in the case of fail
  */

-int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate)
+int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock)

 {
        struct canchip_t *chip;
        int objnr;
 {
        struct canchip_t *chip;
        int objnr;


@@ -302,6 +305,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr
        chip->hostdevice=candev;
        chip->chip_irq=irq;
        chip->baudrate=baudrate;
        chip->hostdevice=candev;
        chip->chip_irq=irq;
        chip->baudrate=baudrate;

+       chip->clock=clock;

        chip->flags=0x0;
 
        if(candev->hwspecops->init_chip_data(candev,chipnr)<0)
        chip->flags=0x0;
 
        if(candev->hwspecops->init_chip_data(candev,chipnr)<0)