X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/8fdb6813a61bd9b0f5b98ee90d0ebbbcca82fad6..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/setup.c

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index 5a4ecb6..cb6550d 100644
--- 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_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 next_minor=0;
@@ -32,9 +32,9 @@ int next_minor=0;
  * This function is prepared to simplify board specific xxx_request_io() function
  * for memory mapped devices.
  */
-int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base)
+int can_base_addr_fixup(struct candevice_t *candev, can_ioptr_t new_base)
 {
-	unsigned long offs;
+	long offs;
 	int i, j;
 
 	offs=new_base-candev->dev_base_addr;
@@ -212,6 +212,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
 	int chipnr;
 	long bd;
 	int irqsig=-1;
+	long clock;
 
 	candev=(struct candevice_t *)can_checked_malloc(sizeof(struct candevice_t));
 	if (candev==NULL)
@@ -227,6 +228,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];
+	clock=clockfreq[card];
 
 	candev->hwspecops=(struct hwspecops_t *)can_checked_malloc(sizeof(struct hwspecops_t));
 	if (candev->hwspecops==NULL)
@@ -249,7 +251,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];
 
-		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;
 	}
 
@@ -295,6 +297,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
+ * @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
@@ -303,7 +306,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
  */
-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;
@@ -327,6 +330,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->clock=clock;
 	chip->flags=0x0;
 
 	if(candev->hwspecops->init_chip_data(candev,chipnr)<0)