Skip to content

Commit cb5bf7f

Browse files
ckormanyosckormanyos
authored
Merge pull request #720 from ckormanyos/target_xtensa_esp32_p4
Fix #711 via target xtensa esp32 p4
2 parents 10de570 + 37d10a5 commit cb5bf7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4412
-31
lines changed

‎.github/workflows/real-time-cpp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ jobs:
236236
strategy:
237237
fail-fast: false
238238
matrix:
239-
suite: [ bl602_sifive_e24_riscv, riscvfe310, wch_ch32v307, xtensa_esp32_s3_riscv_cop ]
239+
suite: [ bl602_sifive_e24_riscv, riscvfe310, wch_ch32v307, xtensa_esp32_p4, xtensa_esp32_s3_riscv_cop ]
240240
steps:
241241
- uses: actions/checkout@v4
242242
with:
243243
fetch-depth: '0'
244244
- name: update-tools
245245
run: |
246-
wget --no-check-certificate https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64.tar.gz
247-
tar -xzf xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64.tar.gz -C ${{ runner.workspace }}
246+
wget --no-check-certificate https://github.com/espressif/crosstool-NG/releases/download/esp-14.2.0_20260121/riscv32-esp-elf-14.2.0_20260121-x86_64-linux-gnu.tar.gz
247+
tar -xzf riscv32-esp-elf-14.2.0_20260121-x86_64-linux-gnu.tar.gz -C ${{ runner.workspace }}
248248
working-directory: ./
249249
- name: target-riscv-${{ matrix.suite }}
250250
run: |
251-
PATH="${{ runner.workspace }}/xpack-riscv-none-elf-gcc-15.2.0-1/bin:$PATH"
251+
PATH="${{ runner.workspace }}/riscv32-esp-elf/bin:$PATH"
252252
./target/build/build.sh ${{ matrix.suite }} rebuild
253253
ls -la ./bin/ref_app.elf ./bin/ref_app.hex ./bin/ref_app.map ./bin/ref_app.s19
254254
working-directory: ./ref_app/

‎readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ The reference application supports the following targets (in alpha-numeric order
9696
| `wch_ch32v307` | WCH CH32v307 RISC-V board | |
9797
| `wch_ch32v307_llvm` | WCH CH32v307 RISC-V board (but using an LLVM toolchain) | |
9898
| `x86_64-w64-mingw32` | PC on `Win*`/`mingw64` via GNU/GCC x86_x64 compiler | |
99+
| `xtensa_esp32_p4` | Espressif (XTENSA) ESP32-P4 multicore RISC-V SoC | X |
99100
| `xtensa_esp32_s3` | Espressif (XTENSA) NodeMCU ESP32-S3 | X |
100101
| `xtensa32` | Espressif (XTENSA) NodeMCU ESP32 | X |
101102

‎ref_app/ref_app.sln‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Global
7373
target wch_ch32v307_llvm|x64 = target wch_ch32v307_llvm|x64
7474
target wch_ch32v307|x64 = target wch_ch32v307|x64
7575
target x86_64-w64-mingw32|x64 = target x86_64-w64-mingw32|x64
76+
target xtensa_esp32_p4|x64 = target xtensa_esp32_p4|x64
7677
target xtensa_esp32_s3_riscv_cop|x64 = target xtensa_esp32_s3_riscv_cop|x64
7778
target xtensa_esp32_s3|x64 = target xtensa_esp32_s3|x64
7879
target xtensa32|x64 = target xtensa32|x64
@@ -109,6 +110,7 @@ Global
109110
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target wch_ch32v307_llvm|x64.ActiveCfg = Release|x64
110111
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target wch_ch32v307|x64.ActiveCfg = Release|x64
111112
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target x86_64-w64-mingw32|x64.ActiveCfg = Release|x64
113+
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_p4|x64.ActiveCfg = Release|x64
112114
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_s3_riscv_cop|x64.ActiveCfg = Release|x64
113115
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_s3|x64.ActiveCfg = Release|x64
114116
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa32|x64.ActiveCfg = Release|x64
@@ -168,6 +170,8 @@ Global
168170
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target wch_ch32v307|x64.Build.0 = target wch_ch32v307|x64
169171
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target x86_64-w64-mingw32|x64.ActiveCfg = target x86_64-w64-mingw32|x64
170172
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target x86_64-w64-mingw32|x64.Build.0 = target x86_64-w64-mingw32|x64
173+
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_p4|x64.ActiveCfg = target xtensa_esp32_p4|x64
174+
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_p4|x64.Build.0 = target xtensa_esp32_p4|x64
171175
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3_riscv_cop|x64.ActiveCfg = target xtensa_esp32_s3_riscv_cop|x64
172176
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3_riscv_cop|x64.Build.0 = target xtensa_esp32_s3_riscv_cop|x64
173177
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3|x64.ActiveCfg = target xtensa_esp32_s3|x64

‎ref_app/ref_app.vcxproj‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,6 +1401,46 @@
14011401
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
14021402
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
14031403
</ClCompile>
1404+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_cpu.cpp">
1405+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1406+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1407+
</ClCompile>
1408+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_eep.cpp">
1409+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1410+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1411+
</ClCompile>
1412+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_gpt.cpp">
1413+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1414+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1415+
</ClCompile>
1416+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_irq.cpp">
1417+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1418+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1419+
</ClCompile>
1420+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_led.cpp">
1421+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1422+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1423+
</ClCompile>
1424+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_osc.cpp">
1425+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1426+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1427+
</ClCompile>
1428+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_port.cpp">
1429+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1430+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1431+
</ClCompile>
1432+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_pwm.cpp">
1433+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1434+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1435+
</ClCompile>
1436+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_spi.cpp">
1437+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1438+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1439+
</ClCompile>
1440+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_wdg.cpp">
1441+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1442+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1443+
</ClCompile>
14041444
<ClCompile Include="src\mcal\xtensa_esp32_s3\mcal_cpu.cpp">
14051445
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
14061446
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -3233,6 +3273,62 @@
32333273
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
32343274
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
32353275
</ClInclude>
3276+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_benchmark.h">
3277+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3278+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3279+
</ClInclude>
3280+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_cpu.h">
3281+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3282+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3283+
</ClInclude>
3284+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_eep.h">
3285+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3286+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3287+
</ClInclude>
3288+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_gpt.h">
3289+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3290+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3291+
</ClInclude>
3292+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_irq.h">
3293+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3294+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3295+
</ClInclude>
3296+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_led.h">
3297+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3298+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3299+
</ClInclude>
3300+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_memory_progmem.h">
3301+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3302+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3303+
</ClInclude>
3304+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_osc.h">
3305+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3306+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3307+
</ClInclude>
3308+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_port.h">
3309+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3310+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3311+
</ClInclude>
3312+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_pwm.h">
3313+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3314+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3315+
</ClInclude>
3316+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_reg.h">
3317+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3318+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3319+
</ClInclude>
3320+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_ser.h">
3321+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3322+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3323+
</ClInclude>
3324+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_spi.h">
3325+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3326+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3327+
</ClInclude>
3328+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_wdg.h">
3329+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
3330+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
3331+
</ClInclude>
32363332
<ClInclude Include="src\mcal\xtensa_esp32_s3\mcal_benchmark.h">
32373333
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
32383334
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

‎ref_app/ref_app.vcxproj.filters‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,9 @@
287287
<Filter Include="src\mcal\r7fa4m1ab">
288288
<UniqueIdentifier>{40be70da-9086-46f9-b158-4dc468860fc7}</UniqueIdentifier>
289289
</Filter>
290+
<Filter Include="src\mcal\xtensa_esp32_p4">
291+
<UniqueIdentifier>{cc6519dd-1588-4aed-9bd1-c4cc22a5e560}</UniqueIdentifier>
292+
</Filter>
290293
</ItemGroup>
291294
<ItemGroup>
292295
<ClCompile Include="src\app\led\app_led.cpp">
@@ -1369,6 +1372,36 @@
13691372
<ClCompile Include="src\mcal\r7fa4m1ab\mcal_spi.cpp">
13701373
<Filter>src\mcal\r7fa4m1ab</Filter>
13711374
</ClCompile>
1375+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_gpt.cpp">
1376+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1377+
</ClCompile>
1378+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_wdg.cpp">
1379+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1380+
</ClCompile>
1381+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_eep.cpp">
1382+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1383+
</ClCompile>
1384+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_irq.cpp">
1385+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1386+
</ClCompile>
1387+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_led.cpp">
1388+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1389+
</ClCompile>
1390+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_osc.cpp">
1391+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1392+
</ClCompile>
1393+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_port.cpp">
1394+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1395+
</ClCompile>
1396+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_pwm.cpp">
1397+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1398+
</ClCompile>
1399+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_spi.cpp">
1400+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1401+
</ClCompile>
1402+
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_cpu.cpp">
1403+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
1404+
</ClCompile>
13721405
</ItemGroup>
13731406
<ItemGroup>
13741407
<ClInclude Include="src\math\calculus\derivative.h">
@@ -3120,6 +3153,48 @@
31203153
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_benchmark.h">
31213154
<Filter>src\mcal\r7fa4m1ab</Filter>
31223155
</ClInclude>
3156+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_reg.h">
3157+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3158+
</ClInclude>
3159+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_gpt.h">
3160+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3161+
</ClInclude>
3162+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_wdg.h">
3163+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3164+
</ClInclude>
3165+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_eep.h">
3166+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3167+
</ClInclude>
3168+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_irq.h">
3169+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3170+
</ClInclude>
3171+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_led.h">
3172+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3173+
</ClInclude>
3174+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_memory_progmem.h">
3175+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3176+
</ClInclude>
3177+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_osc.h">
3178+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3179+
</ClInclude>
3180+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_port.h">
3181+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3182+
</ClInclude>
3183+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_pwm.h">
3184+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3185+
</ClInclude>
3186+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_ser.h">
3187+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3188+
</ClInclude>
3189+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_spi.h">
3190+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3191+
</ClInclude>
3192+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_benchmark.h">
3193+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3194+
</ClInclude>
3195+
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_cpu.h">
3196+
<Filter>src\mcal\xtensa_esp32_p4</Filter>
3197+
</ClInclude>
31233198
</ItemGroup>
31243199
<ItemGroup>
31253200
<None Include="src\util\STL\algorithm">

‎ref_app/src/mcal/am6254_soc/mcal_gpt.cpp‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///////////////////////////////////////////////////////////////////////////////
2-
// Copyright Christopher Kormanyos 2007 - 2025.
2+
// Copyright Christopher Kormanyos 2007 - 2026.
33
// Distributed under the Boost Software License,
44
// Version 1.0. (See accompanying file LICENSE_1_0.txt
55
// or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -32,7 +32,11 @@ auto mcal::gpt::secure::get_time_elapsed_core1() -> mcal::gpt::value_type_core1
3232
const value_type_core1 consistent_microsecond_tick = static_cast<value_type_core1>(ARM64_READ_SYSREG(CNTPCT_EL0));
3333

3434
// Convert the consistent tick to microseconds.
35-
return static_cast<value_type_core1>(static_cast<value_type_core1>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
35+
return
36+
static_cast<value_type_core1>
37+
(
38+
static_cast<value_type_core1>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
39+
);
3640
}
3741

3842
auto mcal::gpt::secure::get_time_elapsed_core2() -> mcal::gpt::value_type_core2
@@ -41,7 +45,11 @@ auto mcal::gpt::secure::get_time_elapsed_core2() -> mcal::gpt::value_type_core2
4145
const value_type_core2 consistent_microsecond_tick = static_cast<value_type_core2>(ARM64_READ_SYSREG(CNTPCT_EL0));
4246

4347
// Convert the consistent tick to microseconds.
44-
return static_cast<value_type_core2>(static_cast<value_type_core2>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
48+
return
49+
static_cast<value_type_core2>
50+
(
51+
static_cast<value_type_core2>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
52+
);
4553
}
4654

4755
auto mcal::gpt::secure::get_time_elapsed_core3() -> mcal::gpt::value_type_core3
@@ -50,5 +58,9 @@ auto mcal::gpt::secure::get_time_elapsed_core3() -> mcal::gpt::value_type_core3
5058
const value_type_core3 consistent_microsecond_tick = static_cast<value_type_core3>(ARM64_READ_SYSREG(CNTPCT_EL0));
5159

5260
// Convert the consistent tick to microseconds.
53-
return static_cast<value_type_core3>(static_cast<value_type_core3>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
61+
return
62+
static_cast<value_type_core3>
63+
(
64+
static_cast<value_type_core3>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
65+
);
5466
}

‎ref_app/src/mcal/riscvfe310/mcal_gpt.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,18 @@ void mcal::gpt::init(const config_type*)
8787
using clint_mtimecmp_reg_address_type = std::uint32_t;
8888
using clint_mtimecmp_reg_value_type = std::uint64_t;
8989

90-
using clint_mtimecmp_reg_access_type =
90+
using clint_mtimecmp_reg_set_type =
9191
mcal::reg::reg_access_static<clint_mtimecmp_reg_address_type,
9292
clint_mtimecmp_reg_value_type,
9393
mcal::reg::clint_mtimecmp,
9494
(std::numeric_limits<clint_mtimecmp_reg_value_type>::max)()>;
9595

96-
static_assert(std::is_same<typename clint_mtimecmp_reg_access_type::register_value_type, clint_mtimecmp_reg_value_type>::value,
96+
static_assert(std::is_same<typename clint_mtimecmp_reg_set_type::register_value_type, clint_mtimecmp_reg_value_type>::value,
9797
"Error: Unexpected clint_mtimecmp register value type");
9898

9999
// Set the 64-bit mtimer compare register to its maximum value.
100100
// This results in an essentially infinite timeout.
101-
clint_mtimecmp_reg_access_type::reg_set();
101+
clint_mtimecmp_reg_set_type::reg_set();
102102

103103
gpt_is_initialized() = true;
104104
}

‎ref_app/src/mcal/xtensa32/from_sdk/esp32-hal-gpio.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <stdint.h>
3030

31-
#ifdef __cplusplus
31+
#if defined(__cplusplus)
3232
extern "C"
3333
{
3434
#endif
@@ -57,7 +57,7 @@
5757
void digitalWrite(const uint8_t pin, const uint8_t val);
5858
int digitalRead (const uint8_t pin);
5959

60-
#ifdef __cplusplus
60+
#if defined(__cplusplus)
6161
}
6262
#endif
6363

0 commit comments

Comments
 (0)