Skip to content

Target xtensa esp32 p4 #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckormanyos merged 11 commits into from
Feb 12, 2026
Merged

Target xtensa esp32 p4 #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
406d00b
Initial commit Chalandi-based code running
ckormanyos Feb 9, 2026
9d01241
Add esp32_p4 to CI
ckormanyos Feb 10, 2026
1cc576e
Sync up compiler downgrade
ckormanyos Feb 10, 2026
63c9916
Restore stm32f446 Boost benches
ckormanyos Feb 10, 2026
5ef0b8d
Recover PP-def and ensure both Cores run
ckormanyos Feb 11, 2026
b7b45bf
Very preliminary adaptions toward CPP
ckormanyos Feb 11, 2026
8fbf20d
Additional slight adaptions
ckormanyos Feb 12, 2026
d414c59
Very prelim multi-channel GPT cores0/1
ckormanyos Feb 12, 2026
e24409c
Further architectural adaptions
ckormanyos Feb 12, 2026
3926b05
Next architectural adaptions
ckormanyos Feb 12, 2026
37d10a5
ref_app runs with second blinky on core1
ckormanyos Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/real-time-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,19 @@ jobs:
strategy:
fail-fast: false
matrix:
suite: [ bl602_sifive_e24_riscv, riscvfe310, wch_ch32v307, xtensa_esp32_s3_riscv_cop ]
suite: [ bl602_sifive_e24_riscv, riscvfe310, wch_ch32v307, xtensa_esp32_p4, xtensa_esp32_s3_riscv_cop ]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: update-tools
run: |
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
tar -xzf xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64.tar.gz -C ${{ runner.workspace }}
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
tar -xzf riscv32-esp-elf-14.2.0_20260121-x86_64-linux-gnu.tar.gz -C ${{ runner.workspace }}
working-directory: ./
- name: target-riscv-${{ matrix.suite }}
run: |
PATH="${{ runner.workspace }}/xpack-riscv-none-elf-gcc-15.2.0-1/bin:$PATH"
PATH="${{ runner.workspace }}/riscv32-esp-elf/bin:$PATH"
./target/build/build.sh ${{ matrix.suite }} rebuild
ls -la ./bin/ref_app.elf ./bin/ref_app.hex ./bin/ref_app.map ./bin/ref_app.s19
working-directory: ./ref_app/
Expand Down
1 change: 1 addition & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ The reference application supports the following targets (in alpha-numeric order
| `wch_ch32v307` | WCH CH32v307 RISC-V board | |
| `wch_ch32v307_llvm` | WCH CH32v307 RISC-V board (but using an LLVM toolchain) | |
| `x86_64-w64-mingw32` | PC on `Win*`/`mingw64` via GNU/GCC x86_x64 compiler | |
| `xtensa_esp32_p4` | Espressif (XTENSA) ESP32-P4 multicore RISC-V SoC | X |
| `xtensa_esp32_s3` | Espressif (XTENSA) NodeMCU ESP32-S3 | X |
| `xtensa32` | Espressif (XTENSA) NodeMCU ESP32 | X |

Expand Down
4 changes: 4 additions & 0 deletions ref_app/ref_app.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Global
target wch_ch32v307_llvm|x64 = target wch_ch32v307_llvm|x64
target wch_ch32v307|x64 = target wch_ch32v307|x64
target x86_64-w64-mingw32|x64 = target x86_64-w64-mingw32|x64
target xtensa_esp32_p4|x64 = target xtensa_esp32_p4|x64
target xtensa_esp32_s3_riscv_cop|x64 = target xtensa_esp32_s3_riscv_cop|x64
target xtensa_esp32_s3|x64 = target xtensa_esp32_s3|x64
target xtensa32|x64 = target xtensa32|x64
Expand Down Expand Up @@ -109,6 +110,7 @@ Global
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target wch_ch32v307_llvm|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target wch_ch32v307|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target x86_64-w64-mingw32|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_p4|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_s3_riscv_cop|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa_esp32_s3|x64.ActiveCfg = Release|x64
{C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target xtensa32|x64.ActiveCfg = Release|x64
Expand Down Expand Up @@ -168,6 +170,8 @@ Global
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target wch_ch32v307|x64.Build.0 = target wch_ch32v307|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target x86_64-w64-mingw32|x64.ActiveCfg = target x86_64-w64-mingw32|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target x86_64-w64-mingw32|x64.Build.0 = target x86_64-w64-mingw32|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_p4|x64.ActiveCfg = target xtensa_esp32_p4|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_p4|x64.Build.0 = target xtensa_esp32_p4|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3_riscv_cop|x64.ActiveCfg = target xtensa_esp32_s3_riscv_cop|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3_riscv_cop|x64.Build.0 = target xtensa_esp32_s3_riscv_cop|x64
{30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target xtensa_esp32_s3|x64.ActiveCfg = target xtensa_esp32_s3|x64
Expand Down
96 changes: 96 additions & 0 deletions ref_app/ref_app.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,46 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_cpu.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_eep.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_gpt.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_irq.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_led.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_osc.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_port.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_pwm.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_spi.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_wdg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_s3\mcal_cpu.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
Expand Down Expand Up @@ -3233,6 +3273,62 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_benchmark.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_cpu.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_eep.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_gpt.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_irq.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_led.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_memory_progmem.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_osc.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_port.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_pwm.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_reg.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_ser.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_spi.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_wdg.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_s3\mcal_benchmark.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
Expand Down
75 changes: 75 additions & 0 deletions ref_app/ref_app.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@
<Filter Include="src\mcal\r7fa4m1ab">
<UniqueIdentifier>{40be70da-9086-46f9-b158-4dc468860fc7}</UniqueIdentifier>
</Filter>
<Filter Include="src\mcal\xtensa_esp32_p4">
<UniqueIdentifier>{cc6519dd-1588-4aed-9bd1-c4cc22a5e560}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\app\led\app_led.cpp">
Expand Down Expand Up @@ -1369,6 +1372,36 @@
<ClCompile Include="src\mcal\r7fa4m1ab\mcal_spi.cpp">
<Filter>src\mcal\r7fa4m1ab</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_gpt.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_wdg.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_eep.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_irq.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_led.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_osc.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_port.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_pwm.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_spi.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
<ClCompile Include="src\mcal\xtensa_esp32_p4\mcal_cpu.cpp">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\math\calculus\derivative.h">
Expand Down Expand Up @@ -3120,6 +3153,48 @@
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_benchmark.h">
<Filter>src\mcal\r7fa4m1ab</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_reg.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_gpt.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_wdg.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_eep.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_irq.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_led.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_memory_progmem.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_osc.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_port.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_pwm.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_ser.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_spi.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_benchmark.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
<ClInclude Include="src\mcal\xtensa_esp32_p4\mcal_cpu.h">
<Filter>src\mcal\xtensa_esp32_p4</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="src\util\STL\algorithm">
Expand Down
20 changes: 16 additions & 4 deletions ref_app/src/mcal/am6254_soc/mcal_gpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Copyright Christopher Kormanyos 2007 - 2025.
// Copyright Christopher Kormanyos 2007 - 2026.
// Distributed under the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)
Expand Down Expand Up @@ -32,7 +32,11 @@ auto mcal::gpt::secure::get_time_elapsed_core1() -> mcal::gpt::value_type_core1
const value_type_core1 consistent_microsecond_tick = static_cast<value_type_core1>(ARM64_READ_SYSREG(CNTPCT_EL0));

// Convert the consistent tick to microseconds.
return static_cast<value_type_core1>(static_cast<value_type_core1>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
return
static_cast<value_type_core1>
(
static_cast<value_type_core1>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
);
}

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

// Convert the consistent tick to microseconds.
return static_cast<value_type_core2>(static_cast<value_type_core2>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
return
static_cast<value_type_core2>
(
static_cast<value_type_core2>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
);
}

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

// Convert the consistent tick to microseconds.
return static_cast<value_type_core3>(static_cast<value_type_core3>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
return
static_cast<value_type_core3>
(
static_cast<value_type_core3>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
);
}
6 changes: 3 additions & 3 deletions ref_app/src/mcal/riscvfe310/mcal_gpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ void mcal::gpt::init(const config_type*)
using clint_mtimecmp_reg_address_type = std::uint32_t;
using clint_mtimecmp_reg_value_type = std::uint64_t;

using clint_mtimecmp_reg_access_type =
using clint_mtimecmp_reg_set_type =
mcal::reg::reg_access_static<clint_mtimecmp_reg_address_type,
clint_mtimecmp_reg_value_type,
mcal::reg::clint_mtimecmp,
(std::numeric_limits<clint_mtimecmp_reg_value_type>::max)()>;

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

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

gpt_is_initialized() = true;
}
Expand Down
4 changes: 2 additions & 2 deletions ref_app/src/mcal/xtensa32/from_sdk/esp32-hal-gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <stdint.h>

#ifdef __cplusplus
#if defined(__cplusplus)
extern "C"
{
#endif
Expand Down Expand Up @@ -57,7 +57,7 @@
void digitalWrite(const uint8_t pin, const uint8_t val);
int digitalRead (const uint8_t pin);

#ifdef __cplusplus
#if defined(__cplusplus)
}
#endif

Expand Down
Loading
Loading