deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use event instead of interrupt (STM32F103 USB).

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-11-16 08:39:30 +09:00
parent 040f389449
commit 83643c53ca
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2017-11-16 NIIBE Yutaka <gniibe@fsij.org>
* chopstx-cortex-m.c (idle): Support WFE.
* mcu/usb-stm32f103.c (usb_lld_init): Use event.
* usb_lld.h (INTR_REQ_USB_WAKEUP): Remove.
2017-11-15 NIIBE Yutaka <gniibe@fsij.org> 2017-11-15 NIIBE Yutaka <gniibe@fsij.org>
* usb_lld.h (INTR_REQ_USB_WAKEUP): New. * usb_lld.h (INTR_REQ_USB_WAKEUP): New.

24
chopstx-cortex-m.c
View File

@@ -237,7 +237,11 @@ idle (void)
for (;;) for (;;)
{ {
asm ("ldr %0, %1" : "=r" (sleep_enabled): "m" (chx_allow_sleep)); asm ("ldr %0, %1" : "=r" (sleep_enabled): "m" (chx_allow_sleep));
if (sleep_enabled) if (!sleep_enabled)
continue;
if ((sleep_enabled & 0x80))
asm volatile ("wfe" : : : "memory");
else
asm volatile ("wfi" : : : "memory"); asm volatile ("wfi" : : : "memory");
} }
} }
@@ -737,31 +741,31 @@ struct PWR
volatile uint32_t CSR; volatile uint32_t CSR;
}; };
static struct PWR *const PWR = ((struct PWR *)0x40007000); static struct PWR *const PWR = ((struct PWR *)0x40007000);
#define PWR_CR_LPDS 0x0001 #define PWR_CR_LPDS 0x0001 /* Low-power deepsleep */
#define PWR_CR_PDDS 0x0002 #define PWR_CR_PDDS 0x0002 /* Power down deepsleep */
#define PWR_CR_CWUF 0x0004 #define PWR_CR_CWUF 0x0004 /* Clear wakeup flag */
void void
chx_sleep_mode (int enable_sleep) chx_sleep_mode (int how)
{ {
if (enable_sleep == 0) if (how == 0)
; ;
else else
{ {
if (enable_sleep == 1) if (how == 1)
/* sleep only */ /* sleep only */
SCB->SCR &= ~SCB_SCR_SLEEPDEEP; SCB->SCR &= ~SCB_SCR_SLEEPDEEP;
else else
{ {
PWR->CR |= PWR_CR_CWUF; PWR->CR |= PWR_CR_CWUF;
if (enable_sleep == 2 || enable_sleep == 3) if (how == 2 || how == 3)
{ {
PWR->CR &= ~PWR_CR_PDDS; PWR->CR &= ~PWR_CR_PDDS;
if (enable_sleep == 3) if (how == 3)
PWR->CR |= PWR_CR_LPDS; PWR->CR |= PWR_CR_LPDS;
} }
else /* enable_sleep == 4 */ else /* how == 4 */
PWR->CR |= PWR_CR_PDDS; PWR->CR |= PWR_CR_PDDS;
SCB->SCR |= SCB_SCR_SLEEPDEEP; SCB->SCR |= SCB_SCR_SLEEPDEEP;

11
chopstx.c
View File

@@ -1485,11 +1485,10 @@ chopstx_setpriority (chopstx_prio_t prio_new)
* *
* Behavior of @enable_sleep >= 1 depends on MCU. * Behavior of @enable_sleep >= 1 depends on MCU.
* *
* For STM32F103, it's like following. * For STM32F103, 1 for Sleep (CPU clock OFF only), 2 for Stop (Wakeup
* 1: Sleep (CPU clock OFF only) * by EXTI, voltage regulator on), 3 for Stop (Wakeup by EXTI, voltage
* 2: Stop Wakeup by EXTI (voltage regulator on) * regulator low-power), 4 for Standby (Wakeup by RESET, voltage
* 3: Stop Wakeup by EXTI (voltage regulator low-power) * regulator off), and 128 is or-ed to ask WFE instead of WFI.
* 4: Standby Wakeup by RESET (voltage regulator off)
* *
* Return previous value of @enable_sleep. * Return previous value of @enable_sleep.
*/ */
@@ -1501,7 +1500,7 @@ chopstx_conf_idle (int enable_sleep)
chx_spin_lock (&chx_enable_sleep_lock); chx_spin_lock (&chx_enable_sleep_lock);
r = chx_allow_sleep; r = chx_allow_sleep;
chx_allow_sleep = enable_sleep; chx_allow_sleep = enable_sleep;
chx_sleep_mode (enable_sleep); chx_sleep_mode ((enable_sleep & 0x7f));
chx_spin_unlock (&chx_enable_sleep_lock); chx_spin_unlock (&chx_enable_sleep_lock);
return r; return r;

5
mcu/usb-stm32f103.c
View File

@@ -343,10 +343,9 @@ void usb_lld_init (struct usb_dev *dev, uint8_t feature)
st103_set_cntr (CNTR_CTRM | CNTR_OVRM | CNTR_ERRM st103_set_cntr (CNTR_CTRM | CNTR_OVRM | CNTR_ERRM
| CNTR_WKUPM | CNTR_SUSPM | CNTR_RESETM); | CNTR_WKUPM | CNTR_SUSPM | CNTR_RESETM);
/* Setting of EXTI wakeup interrupt to break sleep mode. */ /* Setting of EXTI wakeup event to break sleep on WFE. */
EXTI->RTSR |= (1 << 18); /* Rising trigger selection */ EXTI->RTSR |= (1 << 18); /* Rising trigger selection */
EXTI->PR |= (1 << 18); /* Clear pending bit */ EXTI->EMR |= (1 << 18); /* Event mask cleared */
EXTI->IMR |= (1 << 18); /* Interrupt mask disabled */
} }
void usb_lld_prepare_shutdown (void) void usb_lld_prepare_shutdown (void)

1
usb_lld.h
View File

@@ -153,7 +153,6 @@ void usb_lld_setup_endp (struct usb_dev *dev, int ep_num, int rx_en, int tx_en);
void usb_lld_stall_tx (int ep_num); void usb_lld_stall_tx (int ep_num);
void usb_lld_stall_rx (int ep_num); void usb_lld_stall_rx (int ep_num);
#else #else
#define INTR_REQ_USB_WAKEUP 42
#define INTR_REQ_USB 20 #define INTR_REQ_USB 20
/* EP_TYPE[1:0] EndPoint TYPE */ /* EP_TYPE[1:0] EndPoint TYPE */
#define EP_BULK (0x0000) /* EndPoint BULK */ #define EP_BULK (0x0000) /* EndPoint BULK */