From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 21 Jan 2005 22:41:00 +0000 (+0100)
Subject: Merge: Changed baudrate calculation to consider DSC selection.
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~77
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/161458aa55efa998db8f00bb9f16e1ee02fb77a2?hp=eed5b50bfb33910427fcf790e68dd51c64f42f46

Merge: Changed baudrate calculation to consider DSC selection.

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index 00dd885..66bdc55 100644
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -131,7 +131,8 @@ int i82527_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
 	if (i82527_enable_configuration(chip))
 		return -ENODEV;
 
-	clock /=2;
+	if(chip->int_cpu_reg & iCPU_DSC)
+		clock /=2;
 
 	/* tseg even = round down, odd = round up */
 	for (tseg=(0+0+2)*2; tseg<=(MAX_TSEG2+MAX_TSEG1+2)*2+1; tseg++) {
diff --git a/lincan/src/pip.c b/lincan/src/pip.c
index f0a04de..add0fee 100644
--- a/lincan/src/pip.c
+++ b/lincan/src/pip.c
@@ -107,7 +107,7 @@ int pip_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	i82527_fill_chipspecops(candev->chip[chipnr]);
 	candev->chip[chipnr]->chip_base_addr = candev->io_addr;
-	candev->chip[chipnr]->clock = 16000000;
+	candev->chip[chipnr]->clock = 8000000;
 	candev->chip[chipnr]->int_cpu_reg = 0;
 	candev->chip[chipnr]->int_clk_reg = iCLK_SL1;
 	candev->chip[chipnr]->int_bus_reg = iBUS_CBY;