[nrf noup] Handle pending slot requests

Interpret pending active slot requests while calculating the expected
next slot to boot.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c

@@ -233,6 +233,10 @@ static int read_directxip_state(int slot)
 }
 #endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */
 
+#ifdef CONFIG_NRF_MCUBOOT_BOOT_REQUEST
+#include <bootutil/boot_request.h>
+#endif /* CONFIG_NRF_MCUBOOT_BOOT_REQUEST */
+
 #if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP) || \
 	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT)
 int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
@@ -285,6 +289,15 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
 		if (active_slot_state == DIRECT_XIP_BOOT_ONCE) {
 			lt = NEXT_BOOT_TYPE_TEST;
 		}
+#ifdef CONFIG_NRF_MCUBOOT_BOOT_REQUEST
+	} else if (boot_request_get_preferred_slot(image) == other_slot) {
+		if (other_slot_state == DIRECT_XIP_BOOT_FOREVER) {
+			return_slot = other_slot;
+		} else if (other_slot_state == DIRECT_XIP_BOOT_ONCE) {
+			lt = NEXT_BOOT_TYPE_TEST;
+			return_slot = other_slot;
+		}
+#endif /* CONFIG_NRF_MCUBOOT_BOOT_REQUEST */
 	} else if (img_mgmt_vercmp(&aver, &over) < 0) {
 		if (other_slot_state == DIRECT_XIP_BOOT_FOREVER) {
 			return_slot = other_slot;