kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct errata check for nrf52840 first production

This commit is contained in:
hathach 2018-06-13 14:25:33 +07:00
parent d6cb34ff22
commit d1ecef4fc3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/mcu/nordic/nrf52/sdk/drivers_nrf/usbd/nrf_drv_usbd_errata.h
View File

@ -94,7 +94,7 @@ static inline bool nrf_drv_usbd_errata_type_52840_proto1(void)
static inline bool nrf_drv_usbd_errata_type_52840_fp1(void)
{
return ( nrf_drv_usbd_errata_type_52840() &&
( ((*(uint32_t *)0xF0000FE8) & 0xF0) == 0x10 ) &&
( ((*(uint32_t *)0xF0000FE8) & 0xF0) == 0x20 ) &&
( ((*(uint32_t *)0xF0000FEC) & 0xF0) == 0x00 ) );
}

4
tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
View File

@ -198,7 +198,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
// ERRATA 171, 187, 166
// Somehow Errata 187 check failed for pca10056 1.0.0 (2018.19)
//if ( nrf_drv_usbd_errata_187() )
if ( nrf_drv_usbd_errata_187() )
{
CRITICAL_REGION_ENTER();
if ( *((volatile uint32_t *) (0x4006EC00)) == 0x00000000 )
@ -262,7 +262,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
}
// Somehow Errata 187 check failed for pca10056 1.0.0 (2018.19)
//if ( nrf_drv_usbd_errata_187() )
if ( nrf_drv_usbd_errata_187() )
{
CRITICAL_REGION_ENTER();
if ( *((volatile uint32_t *) (0x4006EC00)) == 0x00000000 )