Skip to content

Commit 3b5e68f

Browse files
AGlass0fMilkArto Kinnunen
AGlass0fMilk
authored and
Arto Kinnunen
committed
Finished compatibility changes for nrfx renaming
1 parent b3a461e commit 3b5e68f

File tree

5 files changed

+991
-48
lines changed

5 files changed

+991
-48
lines changed

‎targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@
23702370
// <e> NRFX_POWER_ENABLED - nrfx_power - POWER peripheral driver
23712371
//==========================================================
23722372
#ifndef NRFX_POWER_ENABLED
2373-
#define NRFX_POWER_ENABLED 0
2373+
#define NRFX_POWER_ENABLED 1
23742374
#endif
23752375
// <o> NRFX_POWER_CONFIG_IRQ_PRIORITY - Interrupt priority
23762376

‎targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/integration/nrfx/legacy/nrf_drv_usbd.c

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include "nrf_drv_usbd.h"
4444
#include "nrf.h"
4545
#include "nordic_common.h"
46-
#include "nrf_drv_common.h"
4746
#include "nrf_atomic.h"
4847
#include "nrf_delay.h"
4948
#include "app_util_platform.h"
@@ -235,7 +234,7 @@ STATIC_ASSERT(USBD_EP_BITPOS(NRF_DRV_USBD_EPOUT7) == USBD_EPDATASTATUS_EPOUT7_Po
235234
/**
236235
* @brief Current driver state
237236
*/
238-
static nrf_drv_state_t m_drv_state = NRF_DRV_STATE_UNINITIALIZED;
237+
static nrfx_drv_state_t m_drv_state = NRFX_DRV_STATE_UNINITIALIZED;
239238

240239
/**
241240
* @brief Event handler for the library
@@ -496,7 +495,7 @@ bool nrf_drv_usbd_consumer(
496495
nrf_drv_usbd_transfer_t * p_transfer = p_context;
497496
ASSERT(ep_size >= data_size);
498497
ASSERT((p_transfer->p_data.rx == NULL) ||
499-
nrf_drv_is_in_RAM((const void*)(p_transfer->p_data.ptr)));
498+
nrfx_is_in_ram((const void*)(p_transfer->p_data.ptr)));
500499

501500
size_t size = p_transfer->size;
502501
if (size < data_size)
@@ -533,7 +532,7 @@ bool nrf_drv_usbd_feeder_ram(
533532
size_t ep_size)
534533
{
535534
nrf_drv_usbd_transfer_t * p_transfer = p_context;
536-
ASSERT(nrf_drv_is_in_RAM((const void*)(p_transfer->p_data.ptr)));
535+
ASSERT(nrfx_is_in_ram((const void*)(p_transfer->p_data.ptr)));
537536

538537
size_t tx_size = p_transfer->size;
539538
if (tx_size > ep_size)
@@ -566,7 +565,7 @@ bool nrf_drv_usbd_feeder_ram_zlp(
566565
size_t ep_size)
567566
{
568567
nrf_drv_usbd_transfer_t * p_transfer = p_context;
569-
ASSERT(nrf_drv_is_in_RAM((const void*)(p_transfer->p_data.ptr)));
568+
ASSERT(nrfx_is_in_ram((const void*)(p_transfer->p_data.ptr)));
570569

571570
size_t tx_size = p_transfer->size;
572571
if (tx_size > ep_size)
@@ -599,7 +598,7 @@ bool nrf_drv_usbd_feeder_flash(
599598
size_t ep_size)
600599
{
601600
nrf_drv_usbd_transfer_t * p_transfer = p_context;
602-
ASSERT(!nrf_drv_is_in_RAM((const void*)(p_transfer->p_data.ptr)));
601+
ASSERT(!nrfx_is_in_ram((const void*)(p_transfer->p_data.ptr)));
603602

604603
size_t tx_size = p_transfer->size;
605604
void * p_buffer = nrf_drv_usbd_feeder_buffer_get();
@@ -637,7 +636,7 @@ bool nrf_drv_usbd_feeder_flash_zlp(
637636
size_t ep_size)
638637
{
639638
nrf_drv_usbd_transfer_t * p_transfer = p_context;
640-
ASSERT(!nrf_drv_is_in_RAM((const void*)(p_transfer->p_data.ptr)));
639+
ASSERT(!nrfx_is_in_ram((const void*)(p_transfer->p_data.ptr)));
641640

642641
size_t tx_size = p_transfer->size;
643642
void * p_buffer = nrf_drv_usbd_feeder_buffer_get();
@@ -1583,7 +1582,7 @@ void USBD_IRQHandler(void)
15831582
while (to_process)
15841583
{
15851584
uint8_t event_nr = __CLZ(__RBIT(to_process));
1586-
if (nrf_usbd_event_get_and_clear((nrf_usbd_event_t)nrf_drv_bitpos_to_event(event_nr)))
1585+
if (nrf_usbd_event_get_and_clear((nrf_usbd_event_t)nrfx_bitpos_to_event(event_nr)))
15871586
{
15881587
active |= 1UL << event_nr;
15891588
}
@@ -1709,13 +1708,13 @@ ret_code_t nrf_drv_usbd_init(nrf_drv_usbd_event_handler_t const event_handler)
17091708
{
17101709
return NRF_ERROR_INVALID_PARAM;
17111710
}
1712-
if ( m_drv_state != NRF_DRV_STATE_UNINITIALIZED)
1711+
if ( m_drv_state != NRFX_DRV_STATE_UNINITIALIZED)
17131712
{
17141713
return NRF_ERROR_INVALID_STATE;
17151714
}
17161715

17171716
m_event_handler = event_handler;
1718-
m_drv_state = NRF_DRV_STATE_INITIALIZED;
1717+
m_drv_state = NRFX_DRV_STATE_INITIALIZED;
17191718

17201719
uint8_t n;
17211720
for (n = 0; n < NRF_USBD_EPIN_CNT; ++n)
@@ -1744,19 +1743,19 @@ ret_code_t nrf_drv_usbd_init(nrf_drv_usbd_event_handler_t const event_handler)
17441743

17451744
ret_code_t nrf_drv_usbd_uninit(void)
17461745
{
1747-
if (m_drv_state != NRF_DRV_STATE_INITIALIZED)
1746+
if (m_drv_state != NRFX_DRV_STATE_INITIALIZED)
17481747
{
17491748
return NRF_ERROR_INVALID_STATE;
17501749
}
17511750

17521751
m_event_handler = NULL;
1753-
m_drv_state = NRF_DRV_STATE_UNINITIALIZED;
1752+
m_drv_state = NRFX_DRV_STATE_UNINITIALIZED;
17541753
return NRF_SUCCESS;
17551754
}
17561755

17571756
void nrf_drv_usbd_enable(void)
17581757
{
1759-
ASSERT(m_drv_state == NRF_DRV_STATE_INITIALIZED);
1758+
ASSERT(m_drv_state == NRFX_DRV_STATE_INITIALIZED);
17601759

17611760
/* Prepare for READY event receiving */
17621761
nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
@@ -1834,7 +1833,7 @@ void nrf_drv_usbd_enable(void)
18341833
usbd_dma_pending_clear();
18351834
m_last_setup_dir = NRF_DRV_USBD_EPOUT0;
18361835

1837-
m_drv_state = NRF_DRV_STATE_POWERED_ON;
1836+
m_drv_state = NRFX_DRV_STATE_POWERED_ON;
18381837

18391838
if (nrf_drv_usbd_errata_187())
18401839
{
@@ -1855,7 +1854,7 @@ void nrf_drv_usbd_enable(void)
18551854

18561855
void nrf_drv_usbd_disable(void)
18571856
{
1858-
ASSERT(m_drv_state != NRF_DRV_STATE_UNINITIALIZED);
1857+
ASSERT(m_drv_state != NRFX_DRV_STATE_UNINITIALIZED);
18591858

18601859
/* Stop just in case */
18611860
nrf_drv_usbd_stop();
@@ -1864,12 +1863,12 @@ void nrf_drv_usbd_disable(void)
18641863
nrf_usbd_int_disable(nrf_usbd_int_enable_get());
18651864
nrf_usbd_disable();
18661865
usbd_dma_pending_clear();
1867-
m_drv_state = NRF_DRV_STATE_INITIALIZED;
1866+
m_drv_state = NRFX_DRV_STATE_INITIALIZED;
18681867
}
18691868

18701869
void nrf_drv_usbd_start(bool enable_sof)
18711870
{
1872-
ASSERT(m_drv_state == NRF_DRV_STATE_POWERED_ON);
1871+
ASSERT(m_drv_state == NRFX_DRV_STATE_POWERED_ON);
18731872
m_bus_suspend = false;
18741873

18751874
uint32_t ints_to_enable =
@@ -1900,7 +1899,7 @@ void nrf_drv_usbd_start(bool enable_sof)
19001899

19011900
void nrf_drv_usbd_stop(void)
19021901
{
1903-
ASSERT(m_drv_state == NRF_DRV_STATE_POWERED_ON);
1902+
ASSERT(m_drv_state == NRFX_DRV_STATE_POWERED_ON);
19041903

19051904
/* Clear interrupt */
19061905
NRFX_IRQ_PENDING_CLEAR(USBD_IRQn);
@@ -1923,12 +1922,12 @@ void nrf_drv_usbd_stop(void)
19231922

19241923
bool nrf_drv_usbd_is_initialized(void)
19251924
{
1926-
return (m_drv_state >= NRF_DRV_STATE_INITIALIZED);
1925+
return (m_drv_state >= NRFX_DRV_STATE_INITIALIZED);
19271926
}
19281927

19291928
bool nrf_drv_usbd_is_enabled(void)
19301929
{
1931-
return (m_drv_state >= NRF_DRV_STATE_POWERED_ON);
1930+
return (m_drv_state >= NRFX_DRV_STATE_POWERED_ON);
19321931
}
19331932

19341933
bool nrf_drv_usbd_is_started(void)
@@ -2127,7 +2126,7 @@ ret_code_t nrf_drv_usbd_ep_transfer(
21272126
if (NRF_USBD_EPIN_CHECK(ep))
21282127
{
21292128
p_context = m_ep_feeder_state + NRF_USBD_EP_NR_GET(ep);
2130-
if (nrf_drv_is_in_RAM(p_transfer->p_data.tx))
2129+
if (nrfx_is_in_ram(p_transfer->p_data.tx))
21312130
{
21322131
/* RAM */
21332132
if (0 == (p_transfer->flags & NRF_DRV_USBD_TRANSFER_ZLP_FLAG))
@@ -2187,7 +2186,7 @@ ret_code_t nrf_drv_usbd_ep_transfer(
21872186
else
21882187
{
21892188
p_context = m_ep_consumer_state + NRF_USBD_EP_NR_GET(ep);
2190-
ASSERT((p_transfer->p_data.rx == NULL) || (nrf_drv_is_in_RAM(p_transfer->p_data.rx)));
2189+
ASSERT((p_transfer->p_data.rx == NULL) || (nrfx_is_in_ram(p_transfer->p_data.rx)));
21912190
p_state->handler.consumer = nrf_drv_usbd_consumer;
21922191
}
21932192
*p_context = *p_transfer;

0 commit comments

Comments
 (0)