Skip to content

Commit 85c5674

Browse files
ckormanyosckormanyos
committed
Use the standard ref_app architecture
1 parent feadd0f commit 85c5674

File tree

13 files changed

+67
-63948
lines changed

13 files changed

+67
-63948
lines changed

‎ref_app/ref_app.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,6 +2141,10 @@
21412141
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
21422142
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
21432143
</ClInclude>
2144+
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_benchmark.h">
2145+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2146+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2147+
</ClInclude>
21442148
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_cpu.h">
21452149
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
21462150
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -2193,6 +2197,10 @@
21932197
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
21942198
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
21952199
</ClInclude>
2200+
<ClInclude Include="src\mcal\r7fa4m1ab\R7FA4M1AB.h">
2201+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2202+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2203+
</ClInclude>
21962204
<ClInclude Include="src\mcal\riscvfe310\mcal_benchmark.h">
21972205
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
21982206
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

‎ref_app/ref_app.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3117,6 +3117,12 @@
31173117
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_spi.h">
31183118
<Filter>src\mcal\r7fa4m1ab</Filter>
31193119
</ClInclude>
3120+
<ClInclude Include="src\mcal\r7fa4m1ab\mcal_benchmark.h">
3121+
<Filter>src\mcal\r7fa4m1ab</Filter>
3122+
</ClInclude>
3123+
<ClInclude Include="src\mcal\r7fa4m1ab\R7FA4M1AB.h">
3124+
<Filter>src\mcal\r7fa4m1ab</Filter>
3125+
</ClInclude>
31203126
</ItemGroup>
31213127
<ItemGroup>
31223128
<None Include="src\util\STL\algorithm">

ref_app/target/micros/r7fa4m1ab/startup/Code/Mcal/R7FA4M1AB.h renamed to ref_app/src/mcal/r7fa4m1ab/R7FA4M1AB.h

File renamed without changes.

‎ref_app/src/mcal/r7fa4m1ab/mcal_benchmark.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
// Copyright Christopher Kormanyos 2014 - 2026.
3+
// Distributed under the Boost Software License,
4+
// Version 1.0. (See accompanying file LICENSE_1_0.txt
5+
// or copy at http://www.boost.org/LICENSE_1_0.txt)
6+
//
7+
8+
#ifndef MCAL_BENCHMARK_2014_04_16_H_
9+
#define MCAL_BENCHMARK_2014_04_16_H_
10+
11+
#include <mcal_port.h>
12+
#include <mcal_reg.h>
13+
14+
#include <cstdint>
15+
16+
namespace mcal
17+
{
18+
namespace benchmark
19+
{
20+
typedef mcal::port::port_pin<UINT32_C(8)> benchmark_port_type;
21+
}
22+
}
23+
24+
#endif // MCAL_BENCHMARK_2014_04_16_H_

‎ref_app/src/mcal/r7fa4m1ab/mcal_led.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// or copy at http://www.boost.org/LICENSE_1_0.txt)
66
//
77

8-
#include "R7FA4M1AB.h"
9-
108
#include <mcal_led.h>
119
#include <mcal_led/mcal_led_port.h>
1210

11+
#include <R7FA4M1AB.h>
12+
1313
class led_minima_blinky : public mcal::led::led_boolean_state_base
1414
{
1515
public:

‎ref_app/src/mcal/r7fa4m1ab/mcal_osc.cpp‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,32 @@
77

88
#include <mcal_osc.h>
99

10-
extern "C"
11-
void clock_init(void);
10+
#include <R7FA4M1AB.h>
1211

1312
auto mcal::osc::init(const config_type*) -> void
1413
{
15-
clock_init();
14+
constexpr uint32_t HOCOCR2 { UINT32_C(0x4001E037) };
15+
16+
/* disable register write protection for clock module */
17+
SYSTEM->PRCR.reg = (uint16_t)((0xA5 << 8) | 1);
18+
19+
/*set system clock division to 1*/
20+
SYSTEM->SCKDIVCR.reg = 0;
21+
22+
/* set the HOCO clock frequency to 48 MHz */
23+
*((volatile uint8_t*)HOCOCR2) = (4 << 3);
24+
25+
/* switch sysclk to HOCO clock (48 MHz) */
26+
SYSTEM->OPCCR.bit.OPCM = 0;
27+
while(SYSTEM->OPCCR.bit.OPCMTSF);
28+
29+
/* switch power operation mode to high-speed mode */
30+
SYSTEM->HOCOCR.bit.HCSTP = 0;
31+
while(!SYSTEM->OSCSF.bit.HOCOSF);
32+
33+
/* enable memory wait cycle */
34+
SYSTEM->MEMWAIT.bit.MEMWAIT = 1;
35+
36+
/* switch sysclk to HOCO clock (48 MHz) */
37+
SYSTEM->SCKSCR.reg = 0;
1638
}

‎ref_app/target.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,8 +1175,6 @@
11751175
<ClCompile Include="target\micros\nxp_imxrt1062\startup\crt0_init_ram.cpp" />
11761176
<ClCompile Include="target\micros\nxp_imxrt1062\startup\crt1.cpp" />
11771177
<ClCompile Include="target\micros\nxp_imxrt1062\startup\int_vect.cpp" />
1178-
<ClCompile Include="target\micros\r7fa4m1ab\startup\Code\Appli\main.cpp" />
1179-
<ClCompile Include="target\micros\r7fa4m1ab\startup\Code\Mcal\clock.cpp" />
11801178
<ClCompile Include="target\micros\r7fa4m1ab\startup\crt0.cpp" />
11811179
<ClCompile Include="target\micros\r7fa4m1ab\startup\crt0_init_ram.cpp" />
11821180
<ClCompile Include="target\micros\r7fa4m1ab\startup\crt1.cpp" />
@@ -1270,7 +1268,6 @@
12701268
<ItemGroup>
12711269
<ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\core_macros.h" />
12721270
<ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\gic-500.h" />
1273-
<ClInclude Include="target\micros\r7fa4m1ab\startup\Code\Mcal\R7FA4M1AB.h" />
12741271
<ClInclude Include="target\micros\xtensa_esp32_s3\startup\Std\core-isa.h" />
12751272
</ItemGroup>
12761273
<ItemGroup>

‎ref_app/target.vcxproj.filters‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,6 @@
340340
<Filter Include="micros\r7fa4m1ab\startup">
341341
<UniqueIdentifier>{e85df680-7e70-4f5d-87c0-73dbb822c1ba}</UniqueIdentifier>
342342
</Filter>
343-
<Filter Include="micros\r7fa4m1ab\startup\Code">
344-
<UniqueIdentifier>{5277a12a-a3ff-4acc-a906-1b44141211c4}</UniqueIdentifier>
345-
</Filter>
346-
<Filter Include="micros\r7fa4m1ab\startup\Code\Appli">
347-
<UniqueIdentifier>{ef3d7af4-95fa-4075-a6f0-678b44bdb868}</UniqueIdentifier>
348-
</Filter>
349-
<Filter Include="micros\r7fa4m1ab\startup\Code\Mcal">
350-
<UniqueIdentifier>{e9f5404a-7f3f-4aff-bf36-630e2a2822c6}</UniqueIdentifier>
351-
</Filter>
352343
</ItemGroup>
353344
<ItemGroup>
354345
<None Include="target\app\make\app_files.gmk">
@@ -1142,12 +1133,6 @@
11421133
<ClCompile Include="target\micros\r7fa4m1ab\startup\int_vect.cpp">
11431134
<Filter>micros\r7fa4m1ab\startup</Filter>
11441135
</ClCompile>
1145-
<ClCompile Include="target\micros\r7fa4m1ab\startup\Code\Appli\main.cpp">
1146-
<Filter>micros\r7fa4m1ab\startup\Code\Appli</Filter>
1147-
</ClCompile>
1148-
<ClCompile Include="target\micros\r7fa4m1ab\startup\Code\Mcal\clock.cpp">
1149-
<Filter>micros\r7fa4m1ab\startup\Code\Mcal</Filter>
1150-
</ClCompile>
11511136
</ItemGroup>
11521137
<ItemGroup>
11531138
<Text Include="target\micros\bcm2835_raspi_b\startup\SD_CARD\PiZero\config.txt">
@@ -1167,9 +1152,6 @@
11671152
<ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\gic-500.h">
11681153
<Filter>micros\am6254_soc\Code\Startup\Core\a53</Filter>
11691154
</ClInclude>
1170-
<ClInclude Include="target\micros\r7fa4m1ab\startup\Code\Mcal\R7FA4M1AB.h">
1171-
<Filter>micros\r7fa4m1ab\startup\Code\Mcal</Filter>
1172-
</ClInclude>
11731155
</ItemGroup>
11741156
<ItemGroup>
11751157
<Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libc_call0_abi.a">

‎ref_app/target/micros/r7fa4m1ab/make/r7fa4m1ab_files.gmk‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,8 @@
99
# File list of the target-specific files in the project
1010
# ------------------------------------------------------------------------------
1111

12-
FILES_CPP :=
13-
1412
FILES_TGT = $(PATH_APP)/mcal/mcal_gcc_cxx_completion \
1513
$(PATH_TGT)/startup/crt0 \
1614
$(PATH_TGT)/startup/crt0_init_ram \
1715
$(PATH_TGT)/startup/crt1 \
18-
$(PATH_TGT)/startup/int_vect \
19-
$(PATH_APP)/mcal/$(TGT)/mcal_cpu \
20-
$(PATH_APP)/mcal/$(TGT)/mcal_gpt \
21-
$(PATH_APP)/mcal/$(TGT)/mcal_led \
22-
$(PATH_APP)/mcal/$(TGT)/mcal_osc \
23-
$(PATH_APP)/mcal/$(TGT)/mcal_port \
24-
$(PATH_APP)/mcal/$(TGT)/mcal_wdg \
25-
$(PATH_TGT)/startup/Code/Appli/main \
26-
$(PATH_TGT)/startup/Code/Mcal/clock
16+
$(PATH_TGT)/startup/int_vect

‎ref_app/target/micros/r7fa4m1ab/make/r7fa4m1ab_flags.gmk‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ INC_PREFIX := -isystem
3737

3838
SRC_DIR := $(PATH_TGT)/startup/Code
3939

40-
TGT_INCLUDES = -I$(SRC_DIR) \
41-
-I$(SRC_DIR)/Appli \
42-
-I$(SRC_DIR)/Mcal \
43-
$(INC_PREFIX)$(PATH_APP)/util/STL
40+
TGT_INCLUDES = $(INC_PREFIX)$(PATH_APP)/util/STL
4441

4542
TGT_AFLAGS =
4643

0 commit comments

Comments
 (0)