developer
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair running error by remove interrupt stack,and repair the uart output problems

This commit is contained in:
Wang_Weigen 2022-02-17 11:10:02 +08:00
parent d5d7ea74c8
commit 26e8a1a7e8
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ubiquitous/XiUOS/arch/risc-v/rv32m1_vega/interrupt_gcc.S
View File

@ -20,7 +20,7 @@ IRQ_Handler:
mv fp, sp mv fp, sp
/* switch to interrupt stack */ /* switch to interrupt stack */
la sp, __stack # la sp, __stack
/* interrupt handle */ /* interrupt handle */

4
Ubiquitous/XiUOS/arch/risc-v/rv32m1_vega/startup_RV32M1_ri5cy.S
View File

@ -23,7 +23,7 @@
// this License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR // this License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the // CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License. // specific language governing permissions and limitations under the License.
.extern Rv32m1VgeaStart
#define EXCEPTION_STACK_SIZE 0x58 #define EXCEPTION_STACK_SIZE 0x58
.text .text
@ -98,7 +98,7 @@ Reset_Handler:
# Enable global interrupt. */ # Enable global interrupt. */
# csrsi mstatus, 8 # csrsi mstatus, 8
jal entry jal Rv32m1VgeaStart
ebreak ebreak
.size Reset_Handler, . - Reset_Handler .size Reset_Handler, . - Reset_Handler

20
Ubiquitous/XiUOS/board/rv32m1_vega/board.c
View File

@ -18,6 +18,12 @@
#include <fsl_intmux.h> #include <fsl_intmux.h>
extern int InitHwUart(); extern int InitHwUart();
extern void entry(void);
void Rv32m1VgeaStart(void)
{
entry();
}
void LPIT0_IRQHandler(void) void LPIT0_IRQHandler(void)
{ {
@ -55,21 +61,13 @@ void InitBoardHardware(void)
INTMUX_Init(INTMUX0); INTMUX_Init(INTMUX0);
INTMUX_EnableInterrupt(INTMUX0, 0, PORTC_IRQn); INTMUX_EnableInterrupt(INTMUX0, 0, PORTC_IRQn);
/* initialize hardware interrupt */ InitHwUart();
InitHwTick(); InitHwTick();
InstallConsole("uart0", "uart0_drv", "uart0_dev0");
KPrintf("console init completed.\n");
InitBoardMemory(MEMORY_START_ADDRESS, MEMORY_END_ADDRESS); InitBoardMemory(MEMORY_START_ADDRESS, MEMORY_END_ADDRESS);
InitHwUart();
InstallConsole("uart0", "uart0_drv", "uart0_dev");
KPrintf("console init completed.\n");
KPrintf("board initialization......\n");
// InitHwTick();
KPrintf("memory address range: [0x%08x - 0x%08x], size: %d\n", (x_ubase) MEMORY_START_ADDRESS, (x_ubase) MEMORY_END_ADDRESS, RV32M1VEGA_SRAM_SIZE); KPrintf("memory address range: [0x%08x - 0x%08x], size: %d\n", (x_ubase) MEMORY_START_ADDRESS, (x_ubase) MEMORY_END_ADDRESS, RV32M1VEGA_SRAM_SIZE);
/* initialize memory system */
KPrintf("board init done.\n"); KPrintf("board init done.\n");
KPrintf("start kernel...\n"); KPrintf("start kernel...\n");
} }

4
Ubiquitous/XiUOS/board/rv32m1_vega/config.mk
View File

@ -1,9 +1,9 @@
export CFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O2 -Os export CFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O0 -ggdb -Werror
export AFLAGS := -c -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb export AFLAGS := -c -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb
export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiUOS_rv32m1_vega.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiUOS_rv32m1_vega.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds
export CXXFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O2 -Os export CXXFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O0 -ggdb -Werror
export CROSS_COMPILE ?=/opt/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.1-20190425-1021/bin/riscv-none-embed- export CROSS_COMPILE ?=/opt/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.1-20190425-1021/bin/riscv-none-embed-

4
Ubiquitous/XiUOS/board/rv32m1_vega/third_party_driver/uart/connect_uart.c
View File

@ -125,8 +125,8 @@ static uint32 SerialInit(struct SerialDriver *serial_drv, struct BusConfigureInf
break; break;
} }
config.enableTx = 0; config.enableTx = 1;
config.enableRx = 0; config.enableRx = 1;
CLOCK_SetIpSrc(kCLOCK_Lpuart0, kCLOCK_IpSrcFircAsync); CLOCK_SetIpSrc(kCLOCK_Lpuart0, kCLOCK_IpSrcFircAsync);

3
Ubiquitous/XiUOS/kernel/memory/byte_manage.c
View File

@ -1222,8 +1222,9 @@ void ShowBuddy(void)
}; };
} }
KPrintf("\n\033[41;1mlist extern memory information\033[0m\n");
#ifdef MEM_EXTERN_SRAM #ifdef MEM_EXTERN_SRAM
KPrintf("\n\033[41;1mlist extern memory information\033[0m\n");
for(i = 0; i < EXTSRAM_MAX_NUM; i++) { for(i = 0; i < EXTSRAM_MAX_NUM; i++) {
if(NONE != ExtByteManager[i].done){ if(NONE != ExtByteManager[i].done){
KPrintf("\nlist extern sram[%d] memory information\n\n",i); KPrintf("\nlist extern sram[%d] memory information\n\n",i);

4
Ubiquitous/XiUOS/kernel/thread/tick.c
View File

@ -74,7 +74,9 @@ void TickAndTaskTimesliceUpdate(void)
RoundRobinTaskTimesliceUpdate(task); RoundRobinTaskTimesliceUpdate(task);
#elif defined (SCHED_POLICY_RR_REMAINSLICE) #elif defined (SCHED_POLICY_RR_REMAINSLICE)
task = GetKTaskDescriptor(); task = GetKTaskDescriptor();
RoundRobinRemainTaskTimesliceUpdate(task); if(task){
RoundRobinRemainTaskTimesliceUpdate(task);
}
#endif #endif
CheckTaskDelay(); CheckTaskDelay();
#ifdef KERNEL_SOFTTIMER #ifdef KERNEL_SOFTTIMER