zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6421 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
pcirillo 2013-11-09 09:28:40 +00:00
parent 99b95e812c
commit 29b952db0c
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/platforms/SPC5xx/eMIOS200_v1/icu_lld.c
View File

@ -702,7 +702,7 @@ void icu_lld_start(ICUDriver *icup) {
/* Set eMIOS Clock.*/ /* Set eMIOS Clock.*/
#if SPC5_ICU_USE_EMIOS #if SPC5_ICU_USE_EMIOS
active_emios_clock(icup, NULL); icu_active_emios_clock(icup);
#endif #endif
} }

2
os/hal/platforms/SPC5xx/eMIOS200_v1/pwm_lld.c
View File

@ -686,7 +686,7 @@ void pwm_lld_start(PWMDriver *pwmp) {
/* Set eMIOS Clock.*/ /* Set eMIOS Clock.*/
#if SPC5_PWM_USE_EMIOS #if SPC5_PWM_USE_EMIOS
active_emios_clock(NULL, pwmp); pwm_active_emios_clock(pwmp);
#endif #endif
} }

19
os/hal/platforms/SPC5xx/eMIOS200_v1/spc5_emios.c
View File

@ -66,13 +66,13 @@ void decrease_emios_active_channels() {
emios_active_channels--; emios_active_channels--;
} }
void active_emios_clock(ICUDriver *icup, PWMDriver *pwmp) { #if HAL_USE_ICU
void icu_active_emios_clock(ICUDriver *icup) {
/* If this is the first Channel activated then the eMIOS0 is enabled.*/ /* If this is the first Channel activated then the eMIOS0 is enabled.*/
if (emios_active_channels == 1) { if (emios_active_channels == 1) {
SPC5_EMIOS_ENABLE_CLOCK(); SPC5_EMIOS_ENABLE_CLOCK();
/* Disable all unified channels.*/ /* Disable all unified channels.*/
if (icup != NULL) {
icup->emiosp->MCR.B.GPREN = 0; icup->emiosp->MCR.B.GPREN = 0;
icup->emiosp->MCR.R = EMIOSMCR_GPRE(SPC5_EMIOS_GPRE_VALUE); icup->emiosp->MCR.R = EMIOSMCR_GPRE(SPC5_EMIOS_GPRE_VALUE);
icup->emiosp->MCR.R |= EMIOSMCR_GPREN; icup->emiosp->MCR.R |= EMIOSMCR_GPREN;
@ -81,7 +81,17 @@ void active_emios_clock(ICUDriver *icup, PWMDriver *pwmp) {
icup->emiosp->UCDIS.R = 0xFFFFFFFF; icup->emiosp->UCDIS.R = 0xFFFFFFFF;
} else if (pwmp != NULL) { }
}
#endif
#if HAL_USE_PWM
void pwm_active_emios_clock(PWMDriver *pwmp) {
/* If this is the first Channel activated then the eMIOS0 is enabled.*/
if (emios_active_channels == 1) {
SPC5_EMIOS_ENABLE_CLOCK();
/* Disable all unified channels.*/
pwmp->emiosp->MCR.B.GPREN = 0; pwmp->emiosp->MCR.B.GPREN = 0;
pwmp->emiosp->MCR.R = EMIOSMCR_GPRE(SPC5_EMIOS_GPRE_VALUE); pwmp->emiosp->MCR.R = EMIOSMCR_GPRE(SPC5_EMIOS_GPRE_VALUE);
pwmp->emiosp->MCR.R |= EMIOSMCR_GPREN; pwmp->emiosp->MCR.R |= EMIOSMCR_GPREN;
@ -91,9 +101,8 @@ void active_emios_clock(ICUDriver *icup, PWMDriver *pwmp) {
pwmp->emiosp->UCDIS.R = 0xFFFFFFFF; pwmp->emiosp->UCDIS.R = 0xFFFFFFFF;
} }
}
} }
#endif
void deactive_emios_clock() { void deactive_emios_clock() {
/* If it is the last active channels then the eMIOS0 is disabled.*/ /* If it is the last active channels then the eMIOS0 is disabled.*/

7
os/hal/platforms/SPC5xx/eMIOS200_v1/spc5_emios.h
View File

@ -105,7 +105,12 @@ void reset_emios_active_channels(void);
uint32_t get_emios_active_channels(void);; uint32_t get_emios_active_channels(void);;
void increase_emios_active_channels(void); void increase_emios_active_channels(void);
void decrease_emios_active_channels(void); void decrease_emios_active_channels(void);
void active_emios_clock(ICUDriver *icup, PWMDriver *pwmp); #if HAL_USE_ICU
void icu_active_emios_clock(ICUDriver *icup);
#endif
#if HAL_USE_PWM
void pwm_active_emios_clock(PWMDriver *pwmp);
#endif
void deactive_emios_clock(void); void deactive_emios_clock(void);
#endif /* HAL_USE_ICU || HAL_USE_PWM */ #endif /* HAL_USE_ICU || HAL_USE_PWM */