Skip to content

Commit 7c3a0c0

Browse files
committed
applications: nrf_desktop: Remove invalid Kconfigs
Removes references to Kconfigs that do not exist Signed-off-by: Jamie McCrae <[email protected]>
1 parent 7194e06 commit 7c3a0c0

File tree

3 files changed

+0
-150
lines changed

3 files changed

+0
-150
lines changed

applications/nrf_desktop/doc/dfu_mcumgr.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ Make sure that the DFU lock utility is enabled if your nRF Desktop application c
6969
You cannot use this module with the :ref:`caf_ble_smp`.
7070
In other words, you cannot simultaneously enable the :ref:`CONFIG_DESKTOP_DFU_MCUMGR_ENABLE <config_desktop_app_options>` option and the :kconfig:option:`CONFIG_CAF_BLE_SMP` Kconfig option.
7171

72-
You have to choose the backend for the DFU process by enabling the following option:
73-
74-
* :kconfig:option:`CONFIG_DESKTOP_DFU_BACKEND_MCUBOOT` - This option depends on the MCUboot bootloader support for the DFU process.
75-
For details, see :ref:`mcuboot` in the Zephyr documentation.
76-
7772
.. note::
7873
B0 bootloader is not integrated with MCUmgr.
7974

applications/nrf_desktop/doc/hid_provider_mouse.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,10 @@ The reason for this operation is to allow to track key presses that happen right
109109
When the device is disconnected and the input event with the button data is received, the data is stored onto the :ref:`nrf_desktop_hid_eventq` instance, a member of the :c:struct:`report_data` structure.
110110
This queue preserves an order in which input data events are received.
111111

112-
Storing limitations
113-
-------------------
114-
115-
You can limit the number of events that can be inserted into the queue using the :ref:`CONFIG_DESKTOP_HID_REPORT_PROVIDER_MOUSE_EVENT_QUEUE_SIZE <config_desktop_app_options>` Kconfig option.
116-
117112
Discarding events
118113
------------------
119114

120115
When there is no space for a new input event, the module tries to free space by discarding the oldest event in the queue.
121-
Events stored in the queue are automatically discarded after the period defined by the :ref:`CONFIG_DESKTOP_HID_REPORT_PROVIDER_MOUSE_KEYPRESS_EXPIRATION <config_desktop_app_options>` option.
122116

123117
When discarding an event from the queue, the module checks if the key associated with the event is pressed.
124118
This is to avoid missing key releases for earlier key presses when the keys from the queue are replayed to the host.

applications/nrf_desktop/src/modules/dfu.c

Lines changed: 0 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
9292
#else
9393
#error Missing partition definitions.
9494
#endif
95-
#elif CONFIG_SUIT
96-
BUILD_ASSERT(!IS_ENABLED(CONFIG_PARTITION_MANAGER_ENABLED),
97-
"SUIT DFU is supported only without Partition Manager");
98-
BUILD_ASSERT(DT_NODE_EXISTS(DT_NODELABEL(dfu_partition)),
99-
"DFU partition must be defined in devicetree");
100-
#include <sdfw/sdfw_services/suit_service.h>
101-
#include <suit_plat_mem_util.h>
102-
#define BOOTLOADER_NAME "SUIT"
103-
#define DFU_SLOT_ID FIXED_PARTITION_ID(dfu_partition)
104-
#define UPDATE_CANDIDATE_CNT 1
105-
static suit_plat_mreg_t update_candidate;
10695
#else
10796
#error Bootloader not supported.
10897
#endif
@@ -236,16 +225,6 @@ static void reboot_request_handler(struct k_work *work)
236225

237226
LOG_PANIC();
238227

239-
#if CONFIG_SUIT
240-
if ((update_candidate.mem != 0) && (update_candidate.size != 0) &&
241-
(cur_offset == img_length) && !slot_was_used_by_other_transport) {
242-
LOG_INF("Configuration channel reboot request triggered SUIT update");
243-
int ret = suit_trigger_update(&update_candidate, UPDATE_CANDIDATE_CNT);
244-
245-
LOG_INF("SUIT update triggered with status: %d", ret);
246-
}
247-
#endif
248-
249228
sys_reboot(SYS_REBOOT_WARM);
250229

251230
if (!k_work_delayable_is_pending(&background_erase)) {
@@ -336,12 +315,6 @@ static void complete_dfu_data_store(void)
336315
if (err) {
337316
LOG_ERR("Cannot request the image upgrade (err:%d)", err);
338317
}
339-
#elif CONFIG_SUIT
340-
update_candidate.mem
341-
= suit_plat_mem_nvm_ptr_get(FIXED_PARTITION_OFFSET(dfu_partition));
342-
update_candidate.size = img_length;
343-
LOG_INF("DFU update candidate stored in DFU partition");
344-
LOG_INF("Update will be performed on configuration channel reboot request");
345318
#endif
346319
terminate_dfu();
347320
}
@@ -808,118 +781,6 @@ static void handle_image_info_request(uint8_t *data, size_t *size)
808781
LOG_ERR("Cannot obtain image information");
809782
}
810783
}
811-
#elif CONFIG_SUIT
812-
static const char *suit_release_type_str_get(suit_version_release_type_t type)
813-
{
814-
switch (type) {
815-
case SUIT_VERSION_RELEASE_NORMAL:
816-
return NULL;
817-
case SUIT_VERSION_RELEASE_RC:
818-
return "rc";
819-
case SUIT_VERSION_RELEASE_BETA:
820-
return "beta";
821-
case SUIT_VERSION_RELEASE_ALPHA:
822-
return "alpha";
823-
default:
824-
__ASSERT(0, "Unknown release type");
825-
return NULL;
826-
}
827-
};
828-
829-
static void handle_image_info_request(uint8_t *data, size_t *size)
830-
{
831-
unsigned int seq_num = 0;
832-
suit_ssf_manifest_class_info_t class_info;
833-
suit_semver_raw_t version_raw;
834-
suit_version_t version;
835-
bool is_semver_supported;
836-
837-
int err = suit_get_supported_manifest_info(SUIT_MANIFEST_APP_ROOT, &class_info);
838-
839-
if (!err) {
840-
err = suit_get_installed_manifest_info(&(class_info.class_id),
841-
&seq_num, &version_raw, NULL, NULL, NULL);
842-
}
843-
if (!err) {
844-
/* Semantic versioning support has been added to the SDFW in the v0.6.2
845-
* public release. Older SDFW versions return empty array in the version
846-
* variable.
847-
*/
848-
is_semver_supported = (version_raw.len != 0);
849-
if (is_semver_supported) {
850-
err = suit_metadata_version_from_array(&version,
851-
version_raw.raw,
852-
version_raw.len);
853-
}
854-
}
855-
856-
if (!err) {
857-
uint8_t flash_area_id = 0;
858-
/* SUIT supports multiple images, return zero as a special image size value. */
859-
uint32_t image_size = 0;
860-
uint32_t build_num = seq_num;
861-
uint8_t major = 0;
862-
uint8_t minor = 0;
863-
uint16_t revision = 0;
864-
865-
if (is_semver_supported) {
866-
const char *release_type;
867-
868-
release_type = suit_release_type_str_get(version.type);
869-
if (release_type) {
870-
LOG_INF("Booted application version: %d.%d.%d-%s%d",
871-
version.major, version.minor, version.patch,
872-
release_type, version.pre_release_number);
873-
} else {
874-
LOG_INF("Booted application version: %d.%d.%d",
875-
version.major, version.minor, version.patch);
876-
}
877-
878-
__ASSERT_NO_MSG((version.major >= 0) && (version.major <= UINT8_MAX));
879-
__ASSERT_NO_MSG((version.minor >= 0) && (version.minor <= UINT8_MAX));
880-
__ASSERT_NO_MSG((version.patch >= 0) && (version.patch <= UINT16_MAX));
881-
882-
major = version.major;
883-
minor = version.minor;
884-
revision = version.patch;
885-
/* The Release type and the pre-release number are not included
886-
* in the image info response.
887-
*/
888-
}
889-
890-
LOG_INF("Booted application sequence number: %" PRIu32, seq_num);
891-
892-
size_t data_size = sizeof(flash_area_id) +
893-
sizeof(image_size) +
894-
sizeof(major) +
895-
sizeof(minor) +
896-
sizeof(revision) +
897-
sizeof(build_num);
898-
size_t pos = 0;
899-
900-
*size = data_size;
901-
902-
data[pos] = flash_area_id;
903-
pos += sizeof(flash_area_id);
904-
905-
sys_put_le32(image_size, &data[pos]);
906-
pos += sizeof(image_size);
907-
908-
data[pos] = major;
909-
pos += sizeof(major);
910-
911-
data[pos] = minor;
912-
pos += sizeof(minor);
913-
914-
sys_put_le16(revision, &data[pos]);
915-
pos += sizeof(revision);
916-
917-
sys_put_le32(build_num, &data[pos]);
918-
pos += sizeof(build_num);
919-
} else {
920-
LOG_ERR("suit retrieve manifest seq num failed (err: %d)", err);
921-
}
922-
}
923784
#endif
924785

925786
static void update_config(const uint8_t opt_id, const uint8_t *data,

0 commit comments

Comments
 (0)