diff options
| author | inmarket <inmarket@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-30 09:18:54 +0000 |
|---|---|---|
| committer | inmarket <inmarket@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-30 09:18:54 +0000 |
| commit | 6a62119514c225b0d26e4c356c45dd4ea6466e9f (patch) | |
| tree | 3f8b0a2347bbfc1e090246b6634deb26aaecc28f /os/hal | |
| parent | cddb47982d494d1b1818fa33680206db1dff9318 (diff) | |
| download | ChibiOS-6a62119514c225b0d26e4c356c45dd4ea6466e9f.tar.gz ChibiOS-6a62119514c225b0d26e4c356c45dd4ea6466e9f.tar.bz2 ChibiOS-6a62119514c225b0d26e4c356c45dd4ea6466e9f.zip | |
Bug fixes for AT91SAM7 GPT driver
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6826 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/platforms/AT91SAM7/gpt_lld.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/os/hal/platforms/AT91SAM7/gpt_lld.c b/os/hal/platforms/AT91SAM7/gpt_lld.c index 703788ebf..8cd226e5d 100644 --- a/os/hal/platforms/AT91SAM7/gpt_lld.c +++ b/os/hal/platforms/AT91SAM7/gpt_lld.c @@ -362,7 +362,10 @@ void gpt_lld_stop(GPTDriver *gptp) { */
void gpt_lld_start_timer(GPTDriver *gptp, gptcnt_t interval) {
gpt_lld_change_interval(gptp, interval);
- gptp->tc->TC_CMR &= ~AT91C_TC_CPCDIS;
+ if (gptp->state == GPT_ONESHOT)
+ gptp->tc->TC_CMR |= AT91C_TC_CPCDIS;
+ else
+ gptp->tc->TC_CMR &= ~AT91C_TC_CPCDIS;
gptp->tc->TC_CCR = AT91C_TC_CLKEN|AT91C_TC_SWTRG;
if (gptp->config->callback)
gptp->tc->TC_IER = AT91C_TC_CPCS|AT91C_TC_COVFS;
@@ -415,7 +418,7 @@ void gpt_lld_change_interval(GPTDriver *gptp, gptcnt_t interval) { rc >>= 9;
cmr = AT91C_TC_CLKS_TIMER_DIV5_CLOCK;
}
- gptp->tc->TC_CMR = (gptp->tc->TC_CMR & AT91C_TC_CLKS) | cmr;
+ gptp->tc->TC_CMR = (gptp->tc->TC_CMR & ~AT91C_TC_CLKS) | cmr;
gptp->tc->TC_RC = rc;
gptp->tc->TC_RA = rc/2;
} else {
|