Skip to content

Commit 1f6817c

Browse files
committed
lib: event_scheduler: rename to bm_scheduler
Rename to bm_scheduler to follow the repository new naming scheme. Signed-off-by: Emanuele Di Santo <[email protected]>
1 parent cc3934c commit 1f6817c

File tree

14 files changed

+46
-42
lines changed

14 files changed

+46
-42
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
/lib/bm_buttons/ @nrfconnect/ncs-bm
5858
/lib/bm_timer/ @nrfconnect/ncs-bm
5959
/lib/boot_banner/ @nrfconnect/ncs-bm
60-
/lib/event_scheduler/ @nrfconnect/ncs-bm
60+
/lib/bm_scheduler/ @nrfconnect/ncs-bm
6161
/lib/sensorsim/ @nrfconnect/ncs-bm
6262
/lib/zephyr_queue/ @nrfconnect/ncs-eris
6363

doc/nrf-bm/api/api.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Bare Metal Buttons library
6666
:inner:
6767
:members:
6868

69-
.. _api_event_scheduler:
69+
.. _api_bm_scheduler:
7070

7171
Bare Metal Event Scheduler library
7272
==================================
7373

74-
.. doxygengroup:: event_scheduler
74+
.. doxygengroup:: bm_scheduler
7575
:inner:
7676
:members:
7777

doc/nrf-bm/libraries/event_scheduler.rst renamed to doc/nrf-bm/libraries/bm_scheduler.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _lib_event_scheduler:
1+
.. _lib_bm_scheduler:
22

33
Event Scheduler
44
###############
@@ -20,9 +20,9 @@ Configuration
2020
*************
2121

2222
The library is enabled using the Kconfig system.
23-
Set the :kconfig:option:`CONFIG_EVENT_SCHEDULER` Kconfig option to enable the library.
23+
Set the :kconfig:option:`CONFIG_BM_SCHEDULER` Kconfig option to enable the library.
2424

25-
Use the :kconfig:option:`CONFIG_EVENT_SCHEDULER_BUF_SIZE` Kconfig option to set the size of the event scheduler buffer that the events are copied into.
25+
Use the :kconfig:option:`CONFIG_BM_SCHEDULER_BUF_SIZE` Kconfig option to set the size of the event scheduler buffer that the events are copied into.
2626

2727
Initialization
2828
==============
@@ -32,9 +32,9 @@ The library is initialized automatically on application startup.
3232
Usage
3333
*****
3434

35-
The SoftDevice event handler can call the :c:func:`event_scheduler_defer` function to schedule an event for later execution in the main thread.
35+
The SoftDevice event handler can call the :c:func:`bm_scheduler_defer` function to schedule an event for later execution in the main thread.
3636

37-
To process these deferred events, call the :c:func:`event_scheduler_process` function regularly in the main application function.
37+
To process these deferred events, call the :c:func:`bm_scheduler_process` function regularly in the main application function.
3838

3939
Dependencies
4040
************
@@ -44,7 +44,7 @@ This library does not have any dependencies.
4444
API documentation
4545
*****************
4646

47-
| Header file: :file:`include/bm/event_scheduler.h`
48-
| Source files: :file:`lib/event_scheduler/`
47+
| Header file: :file:`include/bm/bm_scheduler.h`
48+
| Source files: :file:`lib/bm_scheduler/`
4949
50-
:ref:`Event Scheduler library API reference <api_event_scheduler>`
50+
:ref:`Event Scheduler library API reference <api_bm_scheduler>`

doc/nrf-bm/release_notes/release_notes_changelog.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ Libraries
224224
* Updated the event handling to align with other libraries.
225225
The :c:struct:`ble_gq_req` now takes an :c:type:`ble_gq_evt_handler_t` event handler and the :c:member:`ble_gq_req.ctx` context.
226226

227+
* :ref:`lib_bm_scheduler` library:
228+
229+
* Renamed library from ``event_scheduler`` to ``bm_scheduler``.
230+
227231
Samples
228232
=======
229233

@@ -257,7 +261,7 @@ Documentation
257261
* Added documentation for the :ref:`lib_ble_adv` library.
258262
* Added documentation for the :ref:`lib_ble_gatt_queue` library.
259263
* Added documentation for the :ref:`lib_ble_queued_writes` library.
260-
* Added documentation for the :ref:`lib_event_scheduler` library.
264+
* Added documentation for the :ref:`lib_bm_scheduler` library.
261265
* Added documentation for the :ref:`lib_sensorsim` library.
262266
* Added documentation for the :ref:`lib_storage` library.
263267
* Added documentation for the :ref:`lib_ble_queued_writes` library.

include/bm/event_scheduler.h renamed to include/bm/bm_scheduler.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
/** @file
88
*
9-
* @defgroup event_scheduler NCS Bare Metal Event Scheduler library
9+
* @defgroup bm_scheduler NCS Bare Metal Event Scheduler library
1010
* @{
1111
*/
1212

13-
#ifndef EVENT_SCHEDULER_H__
14-
#define EVENT_SCHEDULER_H__
13+
#ifndef BM_SCHEDULER_H__
14+
#define BM_SCHEDULER_H__
1515

1616
#include <stdint.h>
1717
#include <zephyr/sys/slist.h>
@@ -30,7 +30,7 @@ typedef void (*evt_handler_t)(void *evt, size_t len);
3030
*
3131
* An event consists of a function (handler) and some data that the function has to process.
3232
*/
33-
struct event_scheduler_event {
33+
struct bm_scheduler_event {
3434
/**
3535
* @brief Reserved.
3636
*/
@@ -63,7 +63,7 @@ struct event_scheduler_event {
6363
* @retval -EINVAL Invalid @p data and @p len combination.
6464
* @retval -ENOMEM No memory to schedule this event.
6565
*/
66-
int event_scheduler_defer(evt_handler_t handler, void *data, size_t len);
66+
int bm_scheduler_defer(evt_handler_t handler, void *data, size_t len);
6767

6868
/**
6969
* @brief Process deferred events.
@@ -72,12 +72,12 @@ int event_scheduler_defer(evt_handler_t handler, void *data, size_t len);
7272
*
7373
* @retval 0 On success.
7474
*/
75-
int event_scheduler_process(void);
75+
int bm_scheduler_process(void);
7676

7777
#ifdef __cplusplus
7878
}
7979
#endif
8080

81-
#endif /* EVENT_SCHEDULER_H__ */
81+
#endif /* BM_SCHEDULER_H__ */
8282

8383
/** @} */

lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
add_subdirectory(bluetooth)
8-
add_subdirectory_ifdef(CONFIG_EVENT_SCHEDULER event_scheduler)
8+
add_subdirectory_ifdef(CONFIG_BM_SCHEDULER bm_scheduler)
99
add_subdirectory_ifdef(CONFIG_BM_BUTTONS bm_buttons)
1010
add_subdirectory_ifdef(CONFIG_BM_TIMER bm_timer)
1111
add_subdirectory_ifdef(CONFIG_SENSORSIM sensorsim)

lib/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
menu "Libraries"
77

88
rsource "bluetooth/Kconfig"
9-
rsource "event_scheduler/Kconfig"
9+
rsource "bm_scheduler/Kconfig"
1010
rsource "bm_buttons/Kconfig"
1111
rsource "bm_timer/Kconfig"
1212
rsource "sensorsim/Kconfig"

lib/event_scheduler/CMakeLists.txt renamed to lib/bm_scheduler/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
zephyr_library()
7-
zephyr_library_sources(event_scheduler.c)
7+
zephyr_library_sources(bm_scheduler.c)

lib/event_scheduler/Kconfig renamed to lib/bm_scheduler/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
#
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
6-
menuconfig EVENT_SCHEDULER
6+
menuconfig BM_SCHEDULER
77
bool "Event scheduler"
88
help
99
A library to defer event processing to main().
1010

11-
if EVENT_SCHEDULER
11+
if BM_SCHEDULER
1212

13-
config EVENT_SCHEDULER_BUF_SIZE
13+
config BM_SCHEDULER_BUF_SIZE
1414
int "Event buffer size"
1515
# Maximum BLE event length is 500 (w/ 247 MTU)
1616
default 512
1717
help
1818
Size of the buffer that events will be copied into.
1919
This is a dedicated heap.
2020

21-
module=EVENT_SCHEDULER
21+
module=BM_SCHEDULER
2222
module-str=Event scheduler
2323
source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
2424

lib/event_scheduler/event_scheduler.c renamed to lib/bm_scheduler/bm_scheduler.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
#include <errno.h>
88
#include <string.h>
9-
#include <bm/event_scheduler.h>
9+
#include <bm/bm_scheduler.h>
1010
#include <zephyr/logging/log.h>
1111
#include <zephyr/init.h>
1212
#include <zephyr/sys/sys_heap.h>
1313
#include <zephyr/sys/slist.h>
1414
#include <zephyr/sys/util.h>
1515

16-
LOG_MODULE_REGISTER(event_scheduler, CONFIG_EVENT_SCHEDULER_LOG_LEVEL);
16+
LOG_MODULE_REGISTER(bm_scheduler, CONFIG_BM_SCHEDULER_LOG_LEVEL);
1717

1818
static sys_slist_t event_list;
1919
static struct sys_heap heap;
20-
static uint8_t buf[CONFIG_EVENT_SCHEDULER_BUF_SIZE];
20+
static uint8_t buf[CONFIG_BM_SCHEDULER_BUF_SIZE];
2121

22-
int event_scheduler_defer(evt_handler_t handler, void *data, size_t len)
22+
int bm_scheduler_defer(evt_handler_t handler, void *data, size_t len)
2323
{
2424
uint32_t pm;
25-
struct event_scheduler_event *evt;
25+
struct bm_scheduler_event *evt;
2626

2727
if (!handler) {
2828
return -EFAULT;
@@ -33,7 +33,7 @@ int event_scheduler_defer(evt_handler_t handler, void *data, size_t len)
3333

3434
pm = __get_PRIMASK();
3535
__disable_irq();
36-
evt = sys_heap_alloc(&heap, sizeof(struct event_scheduler_event) + len);
36+
evt = sys_heap_alloc(&heap, sizeof(struct bm_scheduler_event) + len);
3737
if (!pm) {
3838
__enable_irq();
3939
}
@@ -59,11 +59,11 @@ int event_scheduler_defer(evt_handler_t handler, void *data, size_t len)
5959
return 0;
6060
}
6161

62-
int event_scheduler_process(void)
62+
int bm_scheduler_process(void)
6363
{
6464
uint32_t pm;
6565
sys_snode_t *node;
66-
struct event_scheduler_event *evt;
66+
struct bm_scheduler_event *evt;
6767

6868
while (!sys_slist_is_empty(&event_list)) {
6969

@@ -74,7 +74,7 @@ int event_scheduler_process(void)
7474
__enable_irq();
7575
}
7676

77-
evt = CONTAINER_OF(node, struct event_scheduler_event, node);
77+
evt = CONTAINER_OF(node, struct bm_scheduler_event, node);
7878
LOG_DBG("Dispatching event %p to handler %p", evt, evt->handler);
7979
evt->handler(evt->data, evt->len);
8080

@@ -89,7 +89,7 @@ int event_scheduler_process(void)
8989
return 0;
9090
}
9191

92-
static int event_scheduler_init(void)
92+
static int bm_scheduler_init(void)
9393
{
9494
sys_slist_init(&event_list);
9595
sys_heap_init(&heap, buf, sizeof(buf));
@@ -99,4 +99,4 @@ static int event_scheduler_init(void)
9999
return 0;
100100
}
101101

102-
SYS_INIT(event_scheduler_init, APPLICATION, 0);
102+
SYS_INIT(bm_scheduler_init, APPLICATION, 0);

0 commit comments

Comments
 (0)