Skip to content

Commit e5b724d

Browse files
ryanwinterryanwinter
authored
remove rx read/write redirection (#250)
1 parent d1154ea commit e5b724d

File tree

10 files changed

+155
-66
lines changed

10 files changed

+155
-66
lines changed

‎Renesas/RSK_RX65N_2MB/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ include(${GSG_BASE_DIR}/cmake/utilities.cmake)
2323
# Define the Project
2424
project(rx65n_azure_iot C ASM)
2525

26-
set(DISABLE_NEWLIB_STUB true)
27-
2826
add_subdirectory(${CORE_SRC_DIR} core_src)
2927
add_subdirectory(lib)
3028
add_subdirectory(app)

‎Renesas/RSK_RX65N_2MB/app/console.c‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,27 @@ void printf_transmit_end(void)
3636
tx_semaphore_put(&printf_semaphore);
3737
}
3838

39-
void my_sw_charput_function(char c)
39+
int read(int file, char* ptr, int len)
40+
{
41+
int DataIdx;
42+
43+
for (DataIdx = 0; DataIdx < len; DataIdx++)
44+
{
45+
*ptr++ = charget();
46+
}
47+
48+
return len;
49+
}
50+
51+
int write(int file, char* ptr, int len)
4052
{
4153
tx_mutex_get(&printf_mutex, TX_WAIT_FOREVER);
4254

43-
R_Config_SCI8_Serial_Send(&c, 1u);
55+
R_Config_SCI8_Serial_Send(ptr, len);
4456

4557
tx_semaphore_get(&printf_semaphore, TX_WAIT_FOREVER);
4658

4759
tx_mutex_put(&printf_mutex);
4860

49-
return;
61+
return len;
5062
}
51-

‎Renesas/RSK_RX65N_2MB/lib/rx_driver_package/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ set(SOURCES
1616

1717
src/smc_gen/r_bsp/mcu/all/dbsct.c
1818
src/smc_gen/r_bsp/mcu/all/lowlvl.c
19-
src/smc_gen/r_bsp/mcu/all/lowsrc.c
2019
src/smc_gen/r_bsp/mcu/all/mcu_locks.c
2120
src/smc_gen/r_bsp/mcu/all/r_bsp_common.c
2221
src/smc_gen/r_bsp/mcu/all/r_bsp_cpu.c

‎Renesas/RSK_RX65N_2MB/lib/rx_driver_package/RSK_RX65N_2MB.scfg‎

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<Item currentVect="97" id="PDC_PCDFI" priority="15" usedState="Not Use"/>
335335
<Item currentVect="98" id="SCI7_RXI7" priority="15" usedState="Not Use"/>
336336
<Item currentVect="99" id="SCI7_TXI7" priority="15" usedState="Not Use"/>
337-
<Item currentVect="100" id="SCI8_RXI8" priority="15" usedState="Used"/>
337+
<Item currentVect="100" id="SCI8_RXI8" priority="15" usedState="Not Use"/>
338338
<Item currentVect="101" id="SCI8_TXI8" priority="15" usedState="Used"/>
339339
<Item currentVect="102" id="SCI9_RXI9" priority="15" usedState="Not Use"/>
340340
<Item currentVect="103" id="SCI9_TXI9" priority="15" usedState="Not Use"/>
@@ -491,7 +491,6 @@
491491
</tool>
492492
<tool id="Pins" version="1.0.1.0">
493493
<pinItem allocation="22" comments="" direction="None" id="XTAL" isUsedBySoftware="true" locked="false" status="0"/>
494-
<pinItem allocation="59" comments="" direction="None" id="RXD8" isUsedBySoftware="true" locked="false" status="0"/>
495494
<pinItem allocation="113" comments="" direction="O" id="PG6" isUsedBySoftware="true" locked="false" status="0"/>
496495
<pinItem allocation="116" comments="" direction="O" id="PG5" isUsedBySoftware="true" locked="false" status="0"/>
497496
<pinItem allocation="111" comments="" direction="O" id="PG7" isUsedBySoftware="true" locked="false" status="0"/>
@@ -648,7 +647,7 @@
648647
<gridItem id="BSP_CFG_IO_LIB_ENABLE" selectedIndex="0"/>
649648
<gridItem id="BSP_CFG_USER_CHARGET_ENABLED" selectedIndex="0"/>
650649
<gridItem id="BSP_CFG_USER_CHARGET_FUNCTION" selectedIndex="my_sw_charget_function"/>
651-
<gridItem id="BSP_CFG_USER_CHARPUT_ENABLED" selectedIndex="1"/>
650+
<gridItem id="BSP_CFG_USER_CHARPUT_ENABLED" selectedIndex="0"/>
652651
<gridItem id="BSP_CFG_USER_CHARPUT_FUNCTION" selectedIndex="my_sw_charput_function"/>
653652
<gridItem id="BSP_CFG_RUN_IN_USER_MODE" selectedIndex="0"/>
654653
<gridItem id="BSP_CFG_ID_CODE_LONG_1" selectedIndex="0xFFFFFFFF"/>
@@ -696,10 +695,6 @@
696695
<configuration id="90b40387-372b-486f-8ce7-3618e7b05c91" inuse="true" name="Config_SCI8">
697696
<allocatable id="SCI8">
698697
<isocket id="CountingClockB" selection="Clock.tool_clock_pclkb" value="6.0E7"/>
699-
<option enabled="true" id="BitEdge" selection="LowLevel">
700-
<item id="LowLevel" input="" vlaue="0"/>
701-
<item id="FallEdge" input="" vlaue="0"/>
702-
</option>
703698
<option enabled="true" id="DataLength" selection="8Bits">
704699
<item id="9Bits" input="" vlaue="0"/>
705700
<item id="8Bits" input="" vlaue="0"/>
@@ -737,36 +732,23 @@
737732
<item id="325000" input="325000" vlaue="0"/>
738733
<item id="375000" input="375000" vlaue="0"/>
739734
</option>
740-
<option enabled="true" id="DutyCorrection" selection="Disable">
735+
<option enabled="true" id="DutyCorrection" selection="Enable">
741736
<item id="Enable" input="" vlaue="0"/>
742737
<item id="Disable" input="" vlaue="0"/>
743738
</option>
744739
<option enabled="true" id="SCKPinFun" selection="SckUnuse">
745740
<item id="SckUnuse" input="" vlaue="0"/>
746741
<item id="ClkOut" input="" vlaue="0"/>
747742
</option>
748-
<option enabled="true" id="NoiseFilt" selection="Disable">
749-
<item id="Enable" input="" vlaue="0"/>
750-
<item id="Disable" input="" vlaue="0"/>
751-
</option>
752-
<option enabled="false" id="FiltClk" selection="Div1">
753-
<item id="Div1" input="" vlaue="0"/>
754-
</option>
755743
<option enabled="true" id="FlowControl" selection="None">
756744
<item id="None" input="" vlaue="0"/>
757745
<item id="CTS" input="" vlaue="0"/>
758-
<item id="RTS" input="" vlaue="0"/>
759746
</option>
760747
<option enabled="true" id="TransDataHandle" selection="ISR">
761748
<item id="ISR" input="" vlaue="0"/>
762749
<item id="DMAC" input="" vlaue="0"/>
763750
<item id="DTC" input="" vlaue="0"/>
764751
</option>
765-
<option enabled="true" id="RecvDataHandle" selection="ISR">
766-
<item id="ISR" input="" vlaue="0"/>
767-
<item id="DMAC" input="" vlaue="0"/>
768-
<item id="DTC" input="" vlaue="0"/>
769-
</option>
770752
<option enabled="true" id="TXIPriority" selection="Level15">
771753
<item id="Level0" input="" vlaue="0"/>
772754
<item id="Level1" input="" vlaue="0"/>
@@ -785,28 +767,6 @@
785767
<item id="Level14" input="" vlaue="0"/>
786768
<item id="Level15" input="" vlaue="0"/>
787769
</option>
788-
<option enabled="true" id="RXIPriority" selection="Level15">
789-
<item id="Level0" input="" vlaue="0"/>
790-
<item id="Level1" input="" vlaue="0"/>
791-
<item id="Level2" input="" vlaue="0"/>
792-
<item id="Level3" input="" vlaue="0"/>
793-
<item id="Level4" input="" vlaue="0"/>
794-
<item id="Level5" input="" vlaue="0"/>
795-
<item id="Level6" input="" vlaue="0"/>
796-
<item id="Level7" input="" vlaue="0"/>
797-
<item id="Level8" input="" vlaue="0"/>
798-
<item id="Level9" input="" vlaue="0"/>
799-
<item id="Level10" input="" vlaue="0"/>
800-
<item id="Level11" input="" vlaue="0"/>
801-
<item id="Level12" input="" vlaue="0"/>
802-
<item id="Level13" input="" vlaue="0"/>
803-
<item id="Level14" input="" vlaue="0"/>
804-
<item id="Level15" input="" vlaue="0"/>
805-
</option>
806-
<option enabled="true" id="ERIEnable" selection="Enable">
807-
<item id="Enable" input="" vlaue="0"/>
808-
<item id="Disable" input="" vlaue="0"/>
809-
</option>
810770
<option enabled="true" id="ERIPriority" selection="Level15">
811771
<item id="Level0" input="" vlaue="0"/>
812772
<item id="Level1" input="" vlaue="0"/>
@@ -829,19 +789,11 @@
829789
<item id="Enable" input="" vlaue="0"/>
830790
<item id="Disable" input="" vlaue="0"/>
831791
</option>
832-
<option enabled="true" id="RecvEnd" selection="Enable">
833-
<item id="Enable" input="" vlaue="0"/>
834-
<item id="Disable" input="" vlaue="0"/>
835-
</option>
836-
<option enabled="true" id="RecvError" selection="Enable">
837-
<item id="Enable" input="" vlaue="0"/>
838-
<item id="Disable" input="" vlaue="0"/>
839-
</option>
840792
</allocatable>
841793
<component description="This software component provides configurations for SCI(SCIF) single(multi-processor) asynchronous mode." detailDescription="" display="SCI/SCIF Asynchronous Mode" id="com.renesas.smc.tools.swcomponent.codegenerator.sciasyncmode" version="1.9.1"/>
842794
<allocator channelLevel0="8" channelLevel1="" channelLevel2="" channelLevel3="" channelLevel4="" channelLevel5="" description="SCI channel 8" display="SCI8" id="com.renesas.smc.tools.swcomponent.codegenerator.sciasync.rx651.sci8" type="">
843795
<context>
844-
<option enabled="true" id="Mode" selection="BothMode">
796+
<option enabled="true" id="Mode" selection="TransMode">
845797
<item enabled="true" id="TransMode"/>
846798
<item enabled="true" id="RecvMode"/>
847799
<item enabled="true" id="BothMode"/>

‎Renesas/RSK_RX65N_2MB/lib/rx_driver_package/src/smc_gen/Config_SCI8/Config_SCI8_user.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ void R_Config_SCI8_Create_UserInit(void)
6262
{
6363
/* Start user code for user init. Do not edit comment generated here */
6464
/* End user code. Do not edit comment generated here */
65+
void printf_init(void);
66+
printf_init();
6567
}
6668

6769
/***********************************************************************************************************************

‎Renesas/RSK_RX65N_2MB/lib/rx_driver_package/src/smc_gen/r_config/r_bsp_config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Configuration Options
194194
#define BSP_CFG_USER_CHARGET_ENABLED (0)
195195
#define BSP_CFG_USER_CHARGET_FUNCTION my_sw_charget_function
196196

197-
#define BSP_CFG_USER_CHARPUT_ENABLED (1)
197+
#define BSP_CFG_USER_CHARPUT_ENABLED (0)
198198
#define BSP_CFG_USER_CHARPUT_FUNCTION my_sw_charput_function
199199

200200
/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information

‎Renesas/RSK_RX65N_2MB/lib/rx_driver_package/src/smc_gen/r_pincfg/Pin.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
* Version : 1.0.2
2323
* Device(s) : R5F565NEDxFC
2424
* Description : This file implements SMC pin code generation.
25-
* Creation Date: 2020-12-18
2625
***********************************************************************************************************************/
2726

2827
/***********************************************************************************************************************
@@ -128,10 +127,6 @@ void R_Pins_Create(void)
128127
MPC.P80PFS.BYTE = 0x11U;
129128
PORT8.PMR.BYTE |= 0x01U;
130129

131-
/* Set RXD8 pin */
132-
MPC.PJ1PFS.BYTE = 0x0AU;
133-
PORTJ.PMR.BYTE |= 0x02U;
134-
135130
/* Set TXD8 pin */
136131
PORTJ.PODR.BYTE |= 0x04U;
137132
MPC.PJ2PFS.BYTE = 0x0AU;

‎Renesas/RSK_RX65N_2MB/projects/e2studio/.project‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>rsk_rx65n_2mb</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
<nature>org.eclipse.cdt.core.cnature</nature>
11+
</natures>
12+
<linkedResources>
13+
<link>
14+
<name>RSK_RX65N_2MB.scfg</name>
15+
<type>1</type>
16+
<locationURI>PARENT-2-PROJECT_LOC/lib/rx_driver_package/RSK_RX65N_2MB.scfg</locationURI>
17+
</link>
18+
</linkedResources>
19+
</projectDescription>

0 commit comments

Comments
 (0)