Skip to content

Commit d1f2c45

Browse files
lemreycarlescufi
lemrey
authored and
carlescufi
committed
manifest: update fw-nrfconnect-zephyr
- Update fw-nrfconnect-zephyr revision, fixing a Kernel panic issue: zephyrproject-rtos/zephyr#13411 Signed-off-by: Emanuele Di Santo <[email protected]>
1 parent dd45c43 commit d1f2c45

File tree

14 files changed

+32
-29
lines changed

14 files changed

+32
-29
lines changed

‎doc/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ add_custom_target(
143143
ENV_VAR_ARCH=*
144144
KERNELVERSION=${PROJECT_VERSION}
145145
SRCARCH=x86
146+
GENERATED_DTS_BOARD_CONF=not_applicable
147+
KCONFIG_TURBO_MODE=${KCONFIG_TURBO_MODE}
148+
KCONFIG_DOC_MODE=1
146149
${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/doc/scripts/genrest.py ${NRF_BASE}/Kconfig.nrf ${NRF_RST_OUT}/doc/nrf/reference/kconfig/
147150
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
148151
)

‎lib/bsdlib/bsd_os.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ int32_t bsd_os_trace_put(const uint8_t * const data, uint32_t len)
265265
u32_t remaining_bytes = len;
266266

267267
while (remaining_bytes) {
268-
u8_t transfer_len = min(remaining_bytes, UINT8_MAX);
268+
u8_t transfer_len = MIN(remaining_bytes, UINT8_MAX);
269269
u32_t idx = len - remaining_bytes;
270270

271271
nrfx_uarte_tx(&uarte_inst, &data[idx], transfer_len);

‎samples/bluetooth/peripheral_hids_mouse/src/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ static void mouse_movement_send(s16_t x_delta, s16_t y_delta)
358358
}
359359

360360
if (conn_mode[i].in_boot_mode) {
361-
x_delta = max(min(x_delta, SCHAR_MAX), SCHAR_MIN);
362-
y_delta = max(min(y_delta, SCHAR_MAX), SCHAR_MIN);
361+
x_delta = MAX(MIN(x_delta, SCHAR_MAX), SCHAR_MIN);
362+
y_delta = MAX(MIN(y_delta, SCHAR_MAX), SCHAR_MIN);
363363

364364
bt_gatt_hids_boot_mouse_inp_rep_send(&hids_obj,
365365
conn_mode[i].conn,
@@ -372,8 +372,8 @@ static void mouse_movement_send(s16_t x_delta, s16_t y_delta)
372372
u8_t y_buff[2];
373373
u8_t buffer[INPUT_REP_MOVEMENT_LEN];
374374

375-
s16_t x = max(min(x_delta, 0x07ff), -0x07ff);
376-
s16_t y = max(min(y_delta, 0x07ff), -0x07ff);
375+
s16_t x = MAX(MIN(x_delta, 0x07ff), -0x07ff);
376+
s16_t y = MAX(MIN(y_delta, 0x07ff), -0x07ff);
377377

378378
/* Convert to little-endian. */
379379
sys_put_le16(x, x_buff);

‎samples/bluetooth/throughput/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static u8_t read_fn(struct bt_conn *conn, u8_t err,
268268
}
269269

270270
if (data) {
271-
len = min(len, sizeof(met));
271+
len = MIN(len, sizeof(met));
272272
memcpy(&met, data, len);
273273

274274
printk("[peer] received %u bytes (%u KB)"

‎samples/nrf_desktop/src/hw_interface/wheel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static void data_ready_handler(struct device *dev, struct sensor_trigger *trig)
6868
wheel /= CONFIG_DESKTOP_WHEEL_SENSOR_VALUE_DIVIDER;
6969
}
7070

71-
event->wheel = max(min(wheel, SCHAR_MAX), SCHAR_MIN);
71+
event->wheel = MAX(MIN(wheel, SCHAR_MAX), SCHAR_MIN);
7272

7373
EVENT_SUBMIT(event);
7474
}

‎samples/nrf_desktop/src/modules/Kconfig.power_manager

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ menu "Power manager"
99
config DESKTOP_POWER_MANAGER_ENABLE
1010
bool "Enable power management"
1111
default n
12-
select SYS_POWER_MANAGEMENT
13-
select SYS_POWER_LOW_POWER_STATE_SUPPORTED
14-
select SYS_POWER_LOW_POWER_STATE
15-
select SYS_POWER_DEEP_SLEEP
12+
select SYS_POWER_LOW_POWER_STATES
13+
select SYS_POWER_DEEP_SLEEP_STATES
14+
select SYS_POWER_LOW_POWER_STATES_SUPPORTED
15+
select SYS_POWER_STATE_DEEP_SLEEP_SUPPORTED
1616
select DEVICE_POWER_MANAGEMENT
1717
help
1818
Enable power management, which will put the device to low-power mode

‎samples/nrf_desktop/src/modules/usb_state.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ static void send_mouse_report(const struct hid_mouse_event *event)
9898
REPORT_SIZE_MOUSE_BOOT];
9999

100100
if (hid_protocol == HID_PROTOCOL_REPORT) {
101-
s16_t wheel = max(min(event->wheel, REPORT_MOUSE_WHEEL_MAX),
101+
s16_t wheel = MAX(MIN(event->wheel, REPORT_MOUSE_WHEEL_MAX),
102102
REPORT_MOUSE_WHEEL_MIN);
103-
s16_t x = max(min(event->dx, REPORT_MOUSE_XY_MAX),
103+
s16_t x = MAX(MIN(event->dx, REPORT_MOUSE_XY_MAX),
104104
REPORT_MOUSE_XY_MIN);
105-
s16_t y = max(min(event->dy, REPORT_MOUSE_XY_MAX),
105+
s16_t y = MAX(MIN(event->dy, REPORT_MOUSE_XY_MAX),
106106
REPORT_MOUSE_XY_MIN);
107107
/* Convert to little-endian. */
108108
u8_t x_buff[2];
@@ -122,9 +122,9 @@ static void send_mouse_report(const struct hid_mouse_event *event)
122122
buffer[5] = (y_buff[1] << 4) | (y_buff[0] >> 4);
123123

124124
} else {
125-
s8_t x = max(min(event->dx, REPORT_MOUSE_XY_MAX_BOOT),
125+
s8_t x = MAX(MIN(event->dx, REPORT_MOUSE_XY_MAX_BOOT),
126126
REPORT_MOUSE_XY_MIN_BOOT);
127-
s8_t y = max(min(event->dy, REPORT_MOUSE_XY_MAX_BOOT),
127+
s8_t y = MAX(MIN(event->dy, REPORT_MOUSE_XY_MAX_BOOT),
128128
REPORT_MOUSE_XY_MIN_BOOT);
129129

130130
__ASSERT(sizeof(buffer) == 3, "Invalid boot report size");

‎samples/nrf_desktop/src/services/hids.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,19 +289,19 @@ static void send_mouse_report(const struct hid_mouse_event *event)
289289
int err;
290290

291291
if (report_mode == REPORT_MODE_BOOT) {
292-
s8_t x = max(min(event->dx, SCHAR_MAX), SCHAR_MIN);
293-
s8_t y = max(min(event->dy, SCHAR_MAX), SCHAR_MIN);
292+
s8_t x = MAX(MIN(event->dx, SCHAR_MAX), SCHAR_MIN);
293+
s8_t y = MAX(MIN(event->dy, SCHAR_MAX), SCHAR_MIN);
294294

295295
err = bt_gatt_hids_boot_mouse_inp_rep_send(&hids_obj, NULL,
296296
&event->button_bm,
297297
x, y,
298298
mouse_report_sent_cb);
299299
} else {
300-
s16_t wheel = max(min(event->wheel, REPORT_MOUSE_WHEEL_MAX),
300+
s16_t wheel = MAX(MIN(event->wheel, REPORT_MOUSE_WHEEL_MAX),
301301
REPORT_MOUSE_WHEEL_MIN);
302-
s16_t x = max(min(event->dx, REPORT_MOUSE_XY_MAX),
302+
s16_t x = MAX(MIN(event->dx, REPORT_MOUSE_XY_MAX),
303303
REPORT_MOUSE_XY_MIN);
304-
s16_t y = max(min(event->dy, REPORT_MOUSE_XY_MAX),
304+
s16_t y = MAX(MIN(event->dy, REPORT_MOUSE_XY_MAX),
305305
REPORT_MOUSE_XY_MIN);
306306

307307
/* Convert to little-endian. */

‎subsys/bluetooth/services/throughput.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static ssize_t read_callback(struct bt_conn *conn,
6262
u16_t len, u16_t offset)
6363
{
6464
const struct metrics *metrics = attr->user_data;
65-
len = min(sizeof(struct metrics), len);
65+
len = MIN(sizeof(struct metrics), len);
6666

6767
printk("\n[local] received %u bytes (%u KB)"
6868
" in %u GATT writes at %u bps\n",

‎subsys/bootloader/bl_crypto/bl_crypto_cc310_hash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static bool cc310_bl_hash(u8_t *out_hash, const u8_t *data,
3030
if ((u32_t)data < CONFIG_SRAM_BASE_ADDRESS) {
3131
/* Cryptocell has DMA access to RAM only */
3232
u32_t remaining_copy_len = data_len;
33-
u32_t block_len = min(remaining_copy_len, MAX_CHUNK_LEN);
33+
u32_t block_len = MIN(remaining_copy_len, MAX_CHUNK_LEN);
3434

3535
for (u32_t i = 0; i < data_len; i += MAX_CHUNK_LEN) {
3636
memcpy32(ram_buffer, &data[i], block_len);
@@ -42,13 +42,13 @@ static bool cc310_bl_hash(u8_t *out_hash, const u8_t *data,
4242
}
4343

4444
remaining_copy_len -= block_len;
45-
block_len = min(remaining_copy_len, MAX_CHUNK_LEN);
45+
block_len = MIN(remaining_copy_len, MAX_CHUNK_LEN);
4646
}
4747
} else {
4848
for (u32_t i = 0; i < data_len; i += MAX_CHUNK_LEN) {
4949
if (nrf_cc310_bl_hash_sha256_update(
5050
&context, &data[i],
51-
min(data_len - i, MAX_CHUNK_LEN)) !=
51+
MIN(data_len - i, MAX_CHUNK_LEN)) !=
5252
CRYS_OK) {
5353
return false;
5454
}

‎subsys/bootloader/debug/printk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void printk(const char *fmt, ...)
1717
va_start(argptr, fmt);
1818
int len = vsnprintf(_str, CONFIG_SB_DEBUG_PRINTF_BUF_LEN, fmt, argptr);
1919

20-
len = min(len, CONFIG_SB_DEBUG_PRINTF_BUF_LEN - 1);
20+
len = MIN(len, CONFIG_SB_DEBUG_PRINTF_BUF_LEN - 1);
2121
if (len > 0) {
2222
#ifdef CONFIG_SB_DEBUG_PORT_SEGGER_RTT
2323
SEGGER_RTT_Write(0, _str, len);

‎subsys/bootloader/debug/uart/uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void uart_vprintf(const char *__fmt, va_list argptr)
5757
int len = vsnprintf(_str, CONFIG_SB_DEBUG_PRINTF_BUF_LEN, __fmt, argptr);
5858

5959
if (len > 0) {
60-
uart_print(_str, min(len, CONFIG_SB_DEBUG_PRINTF_BUF_LEN - 1));
60+
uart_print(_str, MIN(len, CONFIG_SB_DEBUG_PRINTF_BUF_LEN - 1));
6161
}
6262
}
6363

‎subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static u32_t dc_send(const struct nct_dc_data *dc_data, u8_t qos)
214214
static bool strings_compare(const char *s1, const char *s2,
215215
u32_t s1_len, u32_t s2_len)
216216
{
217-
return (strncmp(s1, s2, min(s1_len, s2_len))) ? false : true;
217+
return (strncmp(s1, s2, MIN(s1_len, s2_len))) ? false : true;
218218
}
219219

220220
/* Verify if the topic is a control channel topic or not. */

‎west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ manifest:
3434
- name: fw-nrfconnect-zephyr
3535
path: zephyr
3636
west-commands: scripts/west-commands.yml
37-
revision: a9d9dc78760a7751576987401fde7263eaa6c094
37+
revision: pull/99/head
3838
- name: fw-nrfconnect-mcuboot
3939
path: mcuboot
4040
revision: d75212468ce0f88ed57a4aacac8aa07cc8a725bc

0 commit comments

Comments
 (0)