Skip to content

Commit 4c9e8ee

Browse files
committed
minor updates all around
1 parent 2c3d210 commit 4c9e8ee

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.20)
1+
cmake_minimum_required(VERSION 3.21)
22
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
33

44
project(bitfilled
@@ -14,13 +14,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
1414
add_library(${PROJECT_NAME} INTERFACE)
1515
add_subdirectory(${PROJECT_NAME})
1616

17-
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
18-
set(IS_TOPLEVEL_PROJECT TRUE)
19-
else()
20-
set(IS_TOPLEVEL_PROJECT FALSE)
21-
endif()
22-
23-
option(BITFILLED_TESTS "Enable unit testing" ${IS_TOPLEVEL_PROJECT})
17+
option(BITFILLED_TESTS "Enable unit testing" ${PROJECT_IS_TOP_LEVEL})
2418
if(BITFILLED_TESTS)
2519
enable_testing()
2620
add_subdirectory(test)

bitfilled/bitfilled/mmreg.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ struct mmreg : public detail::accesscondition<ACCESS, detail::mmr_r<T>, detail::
127127
constexpr mmreg& operator=(const mmreg&)
128128
requires(!is_readwrite<ACCESS>)
129129
= delete;
130+
constexpr mmreg(const mmreg&)
131+
requires(is_readwrite<ACCESS>)
132+
= default;
133+
constexpr mmreg& operator=(const mmreg&)
134+
requires(is_readwrite<ACCESS>)
135+
= default;
130136

131137
BITFILLED_OPS_FORWARDING
132138
};

tools/svd2mmregmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def generate_peripheral(peripheral, bitband):
3838
# TODO: in the first round of iteration, generate enum types where enumeratedValues is provided
3939
# also de-duplicate enum types across registers
4040

41-
nametrim = peripheral.name + "_"
41+
nametrim = peripheral_name + "_"
4242
offset = 0
4343
for register in peripheral.get_registers():
4444
# filling gaps in the register map with reserved

0 commit comments

Comments
 (0)