aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c
diff options
context:
space:
mode:
authormarcoveeneman <marco-veeneman@hotmail.com>2016-10-27 22:55:17 +0200
committermarcoveeneman <marco-veeneman@hotmail.com>2016-10-27 22:55:17 +0200
commit223f46589016f2dce6a29cbd00d9020f80d2a556 (patch)
tree66653c078459a091ade80f5a6434cad9ee1c2741 /os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c
parent94fe96d3ae4a8d05b7d752f9ff8e0bd4b3de25d6 (diff)
downloadChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.tar.gz
ChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.tar.bz2
ChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.zip
Replaced custom register bitfield macros by TivaWare bitfield macros.
Diffstat (limited to 'os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c')
-rw-r--r--os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c b/os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c
index 6f132dd..964f45b 100644
--- a/os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c
+++ b/os/hal/ports/TIVA/LLD/PWM/hal_pwm_lld.c
@@ -30,13 +30,6 @@
/* Driver local definitions. */
/*===========================================================================*/
-#define PWM_INT_CMPBD (1 << 5)
-#define PWM_INT_CMPBU (1 << 4)
-#define PWM_INT_CMPAD (1 << 3)
-#define PWM_INT_CMPAU (1 << 2)
-#define PWM_INT_CNTLOAD (1 << 1)
-#define PWM_INT_CNTZERO (1 << 0)
-
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
@@ -82,31 +75,31 @@ static void pwm_lld_serve_generator_interrupt (PWMDriver *pwmp, uint8_t i)
isc = HWREG(pwm + pwm_generator_offsets[i] + PWM_O_X_ISC);
HWREG(pwm + pwm_generator_offsets[i] + PWM_O_X_ISC) = isc;
- if (((isc & PWM_INT_CMPAD) != 0) &&
+ if (((isc & PWM_X_ISC_INTCMPAD) != 0) &&
(pwmp->config->channels[i * 2 + 0].callback != NULL)) {
pwmp->config->channels[i * 2 + 0].callback(pwmp);
}
- if (((isc & PWM_INT_CMPAU) != 0) &&
+ if (((isc & PWM_X_ISC_INTCMPAU) != 0) &&
(pwmp->config->channels[i * 2 + 0].callback != NULL)) {
pwmp->config->channels[i * 2 + 0].callback(pwmp);
}
- if (((isc & PWM_INT_CMPBD) != 0) &&
+ if (((isc & PWM_X_ISC_INTCMPBD) != 0) &&
(pwmp->config->channels[i * 2 + 1].callback != NULL)) {
pwmp->config->channels[i * 2 + 1].callback(pwmp);
}
- if (((isc & PWM_INT_CMPBU) != 0) &&
+ if (((isc & PWM_X_ISC_INTCMPBU) != 0) &&
(pwmp->config->channels[i * 2 + 1].callback != NULL)) {
pwmp->config->channels[i * 2 + 1].callback(pwmp);
}
- if (((isc & PWM_INT_CNTLOAD) != 0) && (pwmp->config->callback != NULL)) {
+ if (((isc & PWM_X_ISC_INTCNTLOAD) != 0) && (pwmp->config->callback != NULL)) {
pwmp->config->callback(pwmp);
}
- if (((isc & PWM_INT_CNTZERO) != 0) && (pwmp->config->callback != NULL)) {
+ if (((isc & PWM_X_ISC_INTCNTZERO) != 0) && (pwmp->config->callback != NULL)) {
pwmp->config->callback(pwmp);
}
}