diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-03-23 13:12:41 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-03-23 13:12:41 +0000 |
| commit | 506212845dd0644b2755191da1252380aababd24 (patch) | |
| tree | 112d1f18e69f049b45bceb119226fef188f7f82a /os | |
| parent | 9d812b5db3c21ff09e30a115c7643f7fec5492a3 (diff) | |
| download | ChibiOS-506212845dd0644b2755191da1252380aababd24.tar.gz ChibiOS-506212845dd0644b2755191da1252380aababd24.tar.bz2 ChibiOS-506212845dd0644b2755191da1252380aababd24.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2839 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/include/usb.h | 3 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/pwm_lld.c | 16 | ||||
| -rw-r--r-- | os/various/usb_msc.c | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h index b70ce4160..c4cf68fe2 100644 --- a/os/hal/include/usb.h +++ b/os/hal/include/usb.h @@ -416,7 +416,7 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, * @brief Common ISR code, usb event callback.
*
* @param[in] usbp pointer to the @p USBDriver object
- * @param[in] ep endpoint number
+ * @param[in] evt USB event code
*
* @notapi
*/
@@ -429,7 +429,6 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, * @brief Common ISR code, SOF callback.
*
* @param[in] usbp pointer to the @p USBDriver object
- * @param[in] ep endpoint number
*
* @notapi
*/
diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c index 7469c7fca..ac41edbfd 100644 --- a/os/hal/platforms/STM32/pwm_lld.c +++ b/os/hal/platforms/STM32/pwm_lld.c @@ -111,7 +111,7 @@ static void serve_interrupt(PWMDriver *pwmp) { sr = pwmp->tim->SR;
sr &= pwmp->tim->DIER;
pwmp->tim->SR = ~(TIM_SR_CC1IF | TIM_SR_CC2IF | TIM_SR_CC3IF |
- TIM_SR_CC4IF | TIM_SR_UIF);
+ TIM_SR_CC4IF | TIM_SR_UIF);
if ((sr & TIM_SR_CC1IF) != 0)
pwmp->config->channels[0].callback(pwmp);
if ((sr & TIM_SR_CC2IF) != 0)
@@ -354,13 +354,13 @@ void pwm_lld_start(PWMDriver *pwmp) { /* All channels configured in PWM1 mode with preload enabled and will
stay that way until the driver is stopped.*/
pwmp->tim->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 |
- TIM_CCMR1_OC1PE |
- TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 |
- TIM_CCMR1_OC2PE;
+ TIM_CCMR1_OC1PE |
+ TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 |
+ TIM_CCMR1_OC2PE;
pwmp->tim->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_2 |
- TIM_CCMR2_OC3PE |
- TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 |
- TIM_CCMR2_OC4PE;
+ TIM_CCMR2_OC3PE |
+ TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 |
+ TIM_CCMR2_OC4PE;
}
else {
/* Driver re-configuration scenario, it must be stopped first.*/
@@ -444,7 +444,7 @@ void pwm_lld_stop(PWMDriver *pwmp) { pwmp->tim->BDTR = 0;
pwmp->tim->DIER = 0;
pwmp->tim->SR = 0;
- pwmp->tim->EGR = TIM_EGR_UG; /* Update event. */
+ pwmp->tim->EGR = TIM_EGR_UG; /* Update event. */
#if STM32_PWM_USE_TIM1
if (&PWMD1 == pwmp) {
diff --git a/os/various/usb_msc.c b/os/various/usb_msc.c index 22dee45d3..d1eb6c9a7 100644 --- a/os/various/usb_msc.c +++ b/os/various/usb_msc.c @@ -299,3 +299,5 @@ stall_both: chSysUnlockFromIsr();
return;
}
+
+/** @} */
|