diff options
| author | edolomb <none@example.com> | 2018-02-26 22:20:18 +0000 |
|---|---|---|
| committer | edolomb <none@example.com> | 2018-02-26 22:20:18 +0000 |
| commit | 580836e262173d5e285986dda90e561ab0e58ba1 (patch) | |
| tree | 4a74bc1e20c823c7734d5157e0f21755d88af756 /os | |
| parent | fb42b5f87eda639173667168f070e80e68097ba4 (diff) | |
| download | ChibiOS-580836e262173d5e285986dda90e561ab0e58ba1.tar.gz ChibiOS-580836e262173d5e285986dda90e561ab0e58ba1.tar.bz2 ChibiOS-580836e262173d5e285986dda90e561ab0e58ba1.zip | |
Minor changes
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11558 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c | 20 | ||||
| -rw-r--r-- | os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c index 8edc7f4b0..c4b73d6ea 100644 --- a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c +++ b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c @@ -38,7 +38,7 @@ * @notapi
*/
#define tcEnableWP(tcp) { \
- tcp->tim->TC_WPMR = TC_WPMR_WPKEY_PASSWD | TC_WPMR_WPEN; \
+ tcp->TC_WPMR = TC_WPMR_WPKEY_PASSWD | TC_WPMR_WPEN; \
}
/**
@@ -49,7 +49,7 @@ * @notapi
*/
#define tcDisableWP(tcp) { \
- tcp->tim->TC_WPMR = TC_WPMR_WPKEY_PASSWD; \
+ tcp->TC_WPMR = TC_WPMR_WPKEY_PASSWD; \
}
/*===========================================================================*/
@@ -214,7 +214,7 @@ void tc_lld_start(TCDriver *tcp) { #endif
}
/* Disable Write Protection */
- tcDisableWP(tcp);
+ tcDisableWP(tcp->tim);
/* Output enables*/
switch (tcp->config->channels[0].mode & TC_OUTPUT_MASK) {
case TC_OUTPUT_ACTIVE:
@@ -224,7 +224,7 @@ void tc_lld_start(TCDriver *tcp) { TC_CMR_ACPC_CLEAR | TC_CMR_WAVSEL_UP_RC;
tcp->tim->TC_CHANNEL[0].TC_RC = TC_RC_RC(rc);
- tcp->tim->TC_CHANNEL[0].TC_SR; /* Clear pending IRQs. */
+ tcp->tim->TC_CHANNEL[0].TC_SR; /* Clear pending IRQs. */
default:
;
}
@@ -236,7 +236,7 @@ void tc_lld_start(TCDriver *tcp) { TC_CMR_ACPC_CLEAR | TC_CMR_WAVSEL_UP_RC;
tcp->tim->TC_CHANNEL[1].TC_RC = TC_RC_RC(rc);
- tcp->tim->TC_CHANNEL[1].TC_SR; /* Clear pending IRQs. */
+ tcp->tim->TC_CHANNEL[1].TC_SR; /* Clear pending IRQs. */
default:
;
}
@@ -253,7 +253,7 @@ void tc_lld_start(TCDriver *tcp) { ;
}
/* Enable Write Protection */
- tcEnableWP(tcp);
+ tcEnableWP(tcp->tim);
}
/**
@@ -300,7 +300,7 @@ void tc_lld_enable_channel(TCDriver *tcp, tcchannel_t channel,
tccnt_t width) {
/* Disable Write Protection */
- tcDisableWP(tcp);
+ tcDisableWP(tcp->tim);
/* Changing channel duty cycle on the fly.*/
uint32_t rc = tcp->tim->TC_CHANNEL[channel].TC_RC;
@@ -309,7 +309,7 @@ void tc_lld_enable_channel(TCDriver *tcp, tcp->tim->TC_CHANNEL[channel].TC_CCR = TC_CCR_SWTRG;
/* Enable Write Protection */
- tcEnableWP(tcp);
+ tcEnableWP(tcp->tim);
}
/**
@@ -377,10 +377,10 @@ void tc_lld_disable_channel_notification(TCDriver *tcp, void tcChangeChannelFrequency(TCDriver *tcp,
tcchannel_t channel,uint32_t frequency) {
- tcDisableWP(tcp);
+ tcDisableWP(tcp->tim);
uint32_t rc =(tcp->clock) / (frequency);
tcp->tim->TC_CHANNEL[channel].TC_RC = TC_RC_RC(rc);
- tcEnableWP(tcp);
+ tcEnableWP(tcp->tim);
}
/**
* @brief TC Driver initialization.
diff --git a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h index cbd20ee7d..efa0621fe 100644 --- a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h +++ b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h @@ -113,14 +113,14 @@ typedef void (*tccallback_t)(TCDriver *tcp); * @brief TCD0 interrupt priority level setting.
*/
#if !defined(SAMA_TC0_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define SAMA_TC0_IRQ_PRIORITY 4
+#define SAMA_TC0_IRQ_PRIORITY 2
#endif
/**
* @brief TCD1 interrupt priority level setting.
*/
#if !defined(SAMA_TC1_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define SAMA_TC1_IRQ_PRIORITY 4
+#define SAMA_TC1_IRQ_PRIORITY 2
#endif
/** @} */
|