riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/samd21: adapted to PWM interface changes

Browse Source
This commit is contained in:
Hauke Petersen 2015-10-21 12:42:52 +02:00 committed by Joakim Nohlgård
parent ba8cda7894
commit 41cbc35b73
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cpu/samd21/periph/pwm.c
View File

@ -30,9 +30,6 @@
#include "periph/pwm.h" #include "periph/pwm.h"
/* ignore file in case no PWM devices are defined */
#if PWM_NUMOF
static inline int _num(pwm_t dev) static inline int _num(pwm_t dev)
{ {
return ((int)(pwm_config[dev].dev) & 0xc00) >> 10; return ((int)(pwm_config[dev].dev) & 0xc00) >> 10;
@ -90,23 +87,22 @@ static uint8_t get_prescaler(unsigned int target, int *scale)
return target - 1; return target - 1;
} }
int pwm_init(pwm_t dev, pwm_mode_t mode, uint32_t pwm_init(pwm_t dev, pwm_mode_t mode, uint32_t freq, uint16_t res)
unsigned int frequency, unsigned int resolution)
{ {
uint8_t prescaler; uint8_t prescaler;
int scale = 1; int scale = 1;
int f_real; uint32_t f_real;
if (dev >= PWM_NUMOF) { if (dev >= PWM_NUMOF) {
return -1; return 0;
} }
/* calculate the closest possible clock presacler */ /* calculate the closest possible clock presacler */
prescaler = get_prescaler(CLOCK_CORECLOCK / (frequency * resolution), &scale); prescaler = get_prescaler(CLOCK_CORECLOCK / (freq * res), &scale);
if (prescaler == 0xff) { if (prescaler == 0xff) {
return -2; return 0;
} }
f_real = (CLOCK_CORECLOCK / (scale * resolution)); f_real = (CLOCK_CORECLOCK / (scale * res));
/* configure the used pins */ /* configure the used pins */
for (int i = 0; i < PWM_MAX_CHANNELS; i++) { for (int i = 0; i < PWM_MAX_CHANNELS; i++) {
@ -130,7 +126,7 @@ int pwm_init(pwm_t dev, pwm_mode_t mode,
break; break;
case PWM_CENTER: /* currently not supported */ case PWM_CENTER: /* currently not supported */
default: default:
return -1; return 0;
} }
while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_CTRLB); while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_CTRLB);
@ -141,7 +137,7 @@ int pwm_init(pwm_t dev, pwm_mode_t mode,
_tcc(dev)->WAVE.reg = (TCC_WAVE_WAVEGEN_NPWM); _tcc(dev)->WAVE.reg = (TCC_WAVE_WAVEGEN_NPWM);
while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_WAVE); while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_WAVE);
/* set the selected period */ /* set the selected period */
_tcc(dev)->PER.reg = (resolution - 1); _tcc(dev)->PER.reg = (res - 1);
while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_PER); while (_tcc(dev)->SYNCBUSY.reg & TCC_SYNCBUSY_PER);
/* start PWM operation */ /* start PWM operation */
pwm_start(dev); pwm_start(dev);
@ -149,14 +145,18 @@ int pwm_init(pwm_t dev, pwm_mode_t mode,
return f_real; return f_real;
} }
int pwm_set(pwm_t dev, int channel, unsigned int value) uint8_t pwm_channels(pwm_t dev)
{
return sizeof(pwm_config[dev].chan) / sizeof(pwm_config[dev].chan[0]);
}
void pwm_set(pwm_t dev, uint8_t channel, uint16_t value)
{ {
if (channel >= PWM_MAX_CHANNELS) { if (channel >= PWM_MAX_CHANNELS) {
return -1; return;
} }
_tcc(dev)->CC[_chan(dev, channel)].reg = value; _tcc(dev)->CC[_chan(dev, channel)].reg = value;
while (_tcc(dev)->SYNCBUSY.reg & (TCC_SYNCBUSY_CC0 << _chan(dev, channel))); while (_tcc(dev)->SYNCBUSY.reg & (TCC_SYNCBUSY_CC0 << _chan(dev, channel)));
return 0;
} }
void pwm_start(pwm_t dev) void pwm_start(pwm_t dev)
@ -193,5 +193,3 @@ void pwm_poweroff(pwm_t dev)
GCLK_CLKCTRL_ID(_clk_id(dev))); GCLK_CLKCTRL_ID(_clk_id(dev)));
while (GCLK->STATUS.bit.SYNCBUSY); while (GCLK->STATUS.bit.SYNCBUSY);
} }
#endif /* PWM_NUMOF */