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

Rename _PHR_ (as peripheral) to specific bus (AHB, APB, etc.).

Browse Source
This commit is contained in:
NIIBE Yutaka
2019-04-12 10:45:12 +09:00
parent 52efc84f5c
commit f237314ebf
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mcu/sys-stm32l4.c
View File

@@ -47,8 +47,8 @@ static void wait (int count)
void
usb_lld_sys_shutdown (void)
{
RCC->APB1ENR1 &= ~(RCC_PHR_USB | RCC_PHR_CRS);
RCC->APB1RSTR1 |= (RCC_PHR_USB | RCC_PHR_CRS);
RCC->APB1ENR1 &= ~(RCC_APB1_1_USB | RCC_APB1_1_CRS);
RCC->APB1RSTR1 |= (RCC_APB1_1_USB | RCC_APB1_1_CRS);
}
void
@@ -56,7 +56,8 @@ usb_lld_sys_init (void)
{
/* XXX: should configure CRS (clock recovery system) and HSI48 clock */
if ((RCC->APB1ENR1 & RCC_PHR_USB) && (RCC->APB1RSTR1 & RCC_PHR_USB) == 0)
if ((RCC->APB1ENR1 & RCC_APB1_1_USB)
&& (RCC->APB1RSTR1 & RCC_APB1_1_USB) == 0)
/* Make sure the device is disconnected, even after core reset. */
{
usb_lld_sys_shutdown ();
@@ -64,8 +65,8 @@ usb_lld_sys_init (void)
wait (5*MHZ);
}
RCC->APB1ENR1 |= (RCC_PHR_USB | RCC_PHR_CRS);
RCC->APB1RSTR1 = (RCC_PHR_USB | RCC_PHR_CRS);
RCC->APB1ENR1 |= (RCC_APB1_1_USB | RCC_APB1_1_CRS);
RCC->APB1RSTR1 = (RCC_APB1_1_USB | RCC_APB1_1_CRS);
RCC->APB1RSTR1 = 0;
}