On 05/11/15 17:42, Hartley Sweeten wrote:
On Thursday, November 05, 2015 6:17 AM, Ian Abbott wrote:
On 04/11/15 16:55, H Hartley Sweeten wrote:
Counters 1 and 2 of the 8254 are cascaeded to create the 32-bit timer
used for the analog input pacer trigger. The base clock to these counters
is 10 MHz.
Counter 0 is available to the user for general purpose use. This counter
can use either an internal 1 MHz clock or an external clock. The
(*insn_config) for the counter subdevice provides support for
INSN_CONFIG_{SET,GET}_CLOCK_SRC to allow the user to select the
clock source to use. Fix the INSN_CONFIG_GET_CLOCK_SRC so it returns
the correct speed of the internal clock.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c
b/drivers/staging/comedi/drivers/adv_pci1710.c
index c5f8bff..9e45f3d 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -701,7 +701,7 @@ static int pci1710_counter_insn_config(struct comedi_device
*dev,
data[2] = 0;
} else {
data[1] = 0;
- data[2] = I8254_OSC_BASE_10MHZ;
+ data[2] = I8254_OSC_BASE_1MHZ;
}
break;
default:
The manual I have says it's 1 MHz for PCI-1711/1711L/1716/1716L,
and 100 kHz for PCI-1710/1710L/1710HG/1710HGL.
The data I have is a bit different.
The PCI-1710/1710HG User's manual I have has some issues....
Just so we're on the same page, I downloaded the user manual from
http://support.advantech.com/support/SearchResult.aspx?keyword=PCI-1710&searchtabs=Manual
Strangely, the date on the download page is 2015-10-28 which seems a bit
recent, although the actual vintage seems to be 2nd Edition, November 2003.
The Specifications say:
Channel 1: 10 MHz
Channel 2: Takes input from output of channel 1
Channel 0: Internal 1 MHz or external clock (10 MHz max)
In the manual I have, section "A.1 PCI-1710/1710L/1710HG/1710HGL" has
channel 2 taking its input from the output of channel 1, channel 1 using
a 1 MHz clock, channel 0 Internal 100 kHz or external (1 MHz) max.
Section "A.2 PCI-1711/1711L Specifications" has channel 2 taking the
output of 1, channel 1 using 1 MHz, and channel 0 Internal 1 MHz or
external (10 MHz) max.
Section "A.3 PCI-1716/1716L Specifications" has same counter spec as
PCI-1711.
The Block Diagram also show a 1 MHz internal clock (10 MHz / 10) or
an external clock (CNT0_CLK pin).
The I/O connector description says this about the CNT0_CLK pin.
"Counter 0 Clock Input. This pin is the external clock input of counter 0.
The clock input of counter 0 can be either external (up to 10 MHz) or
Internal (100 kHz), as set up software."
I can't see a block diagram, but "Table 3-1 I/O Connector Signal
Description" says:
Counter 0 Clock Input. The clock input of counter 0 can be
either external (up to 10 MHz) or internal (1 MHz), as set by
software.
The Trigger Source Connections says that all three counters are connected
to a 1 MHz clock.
In the manual I have, section "3.5 Trigger Source Connections" says they
are connected to a 10 MHz clock.
The Control Register description says that:
"CNT0 Counter 0 clock source select bit
0 means that the clock source of Counter 0 comes from the internal clock
(100 kHz), and 1 means that the clock source of Counter 0 comes from the
external clock (maximum up to 10 MHz)."
In the manual I have, section "C.7 Control Register — BASE+6" says:
CNT0 Counter 0 clock source select bit
0 The clock source of Counter 0 comes from the
internal clock
1 MHz for PCI-1711/1711L/17161716L
100 KHz for PCI-1710/1710L/1710HG/
1710HGL
1 The clock source of Counter 0 comes from the
external clock
maximum up to 10 MHz for PCI-1711/1711L/
1716/1716L
maximum up to 1 MHz for PCI-1710/1710L/
1710HG/1710HGL
The "A.1 The Intel 82C54" appendix says:
"The 82C54 has a maximum input clock frequency of 1 MHz. The PCI-1710/
1710HG provides 1 MHz input frequencies to the counter chip from an
on-board oscillator."
In the manual I have, section "D.1 The Intel 82C54" says:
The 82C54 has a maximum input clock frequency of 10 MHz. The
PCI-1710/1710L/1710HG/1710HGL/1711/1711L/1716/1716L provides 10 MHz
input frequencies to the counter chip from an on-board crystal oscillator.
The PCI-1711/1731 manual I have is a bit better. The block diagram, I/O
Connector and CNT0 description all have a 1 MHz internal clock.
I think the manuals are a bit messed up. The 82C54 datasheet says that the
Chip can handle clock inputs up to 10 MHz. A 10 MHz base clock to the cascaded
counters is pretty typical for DAQ cards and a 1 MHz clock to the user counter
seems a bit more useful than a 100 kHz clock.
I agree the manuals are a bit messed up!
--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbo...@mev.co.uk> )=-
-=( Web: http://www.mev.co.uk/ )=-
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
