Commit ed6d38c2 authored by hu's avatar hu

最新版本

parent 94899df9
......@@ -56,6 +56,7 @@ CONSTANTS
MEMORY
{
iROM_0 : ORIGIN = 0x00000000, LENGTH = 2048k
/*iROM_0 : ORIGIN = 0x00200400, LENGTH = 2048k*/
iRAM_0 : ORIGIN = 0xFEB80000, LENGTH = 512k /* RAM addres space seen by external bus masters */
iRAM_1 : ORIGIN = 0xFED80000, LENGTH = 512k /* local RAM address space */
iRAM_R0 : ORIGIN = 0x3FCE4000, LENGTH = 1k
......@@ -69,7 +70,7 @@ SECTIONS
.intvect :>iROM_0 /* start of interrupt vector */
.intvect_end 0x00000600 :>. /* end of interrupt vector */
/*.intvect_end 0x00200A00 :>. */ /* end of interrupt vector */
.text align(4) :>. /* program code area */
.rozdata :>. /* constant datas in ZDA area */
......
......@@ -47,7 +47,9 @@
#include "COM_CAN.h"
#include "UDS_Common.h"
#include "r_fdl_types.h"
#include "fdl_descriptor.h"
#define WITHOUT_BOOT 1
/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
/* Private macro -------------------------------------------------------------*/
......@@ -62,13 +64,21 @@
******************************************************************************/
void Sys_Startup_Pre_Init(void)
{
//R_DEV_WRITE_REG(32, LOC_XCRAMCFG0, 0x100100U);
// *((volatile uint32_t*)(0xFFC06050u)) = (0x100100U);
SET_EBASE(0x00200400); //set Ebase to 0x10000, set RINT to 1
SET_PSW_EBV();
/* Release all Modules (except SDRAM controller) */
Sys_Peripheral_Reset(SYS_PERI_RESETTABLE & (~SYS_PERI_SDRB0));
/* Prepare device (clear all internal config, prepare interrupts) */
R_DEV_Prepare();
#if (WITHOUT_BOOT)
{
Clock_Pre_Init();
//RTC_Pre_Init();
}
#endif
GPIO_Init(0);
......@@ -85,6 +95,8 @@ void Sys_Startup_Pre_Init(void)
* \retval None
******************************************************************************/
uint8_t u8ResetFlag = 0;
uint32_t u32FDLDataFlag[4] = {0, 0, 0, 0};
uint32_t u32FDLBlank = 0;
extern uint32_t u32ResetFlag;
extern uint32_t TestBackupRam;
......@@ -92,9 +104,7 @@ extern uint32_t TestBackupRam;
void Sys_Startup_Init(void)
{
uint8_t u8ResetFlag = 0;
uint32_t u32FDLDataFlag[4] = {0, 0, 0, 0};
uint32_t u32FDLBlank = 0;
Clock_Init();
/* Enable interrupts globally */
......
......@@ -92,7 +92,7 @@ agreement.
#endif
#ifdef USE_TAUB
//#include "r_taub_api.h"
/*#include "r_taub_api.h"*/
#include "TimerB.h"
#endif
......@@ -114,7 +114,7 @@ agreement.
#ifdef USE_SSIF
/*#include "r_ssif_api.h"*/
//#include "IIS_MAX98357.h"
/*#include "IIS_MAX98357.h"*/
#endif
#ifdef USE_VOCA
......@@ -235,8 +235,7 @@ void R_DEV_SyncM(void)
float32_t R_DEV_SQRTF(float32_t val)
{
float32_t result;
asm("sqrtf.s %0, %1"
: "+r"(val), "=r"(result));
asm ("sqrtf.s %0, %1" : "+r" (val),"=r" (result));
return result;
}
......@@ -1960,7 +1959,7 @@ void INTRCANGRECC(void)
#pragma ghs interrupt
void INTRCAN0ERR(void)
{
;//RSCAN0_CH0_Err_ISR();
//RSCAN0_CH0_Err_ISR();
}
#endif
......@@ -1984,7 +1983,7 @@ void INTRCAN0TRX(void)
#pragma ghs interrupt
void INTRCAN1ERR(void)
{
;//RSCAN0_CH1_Err_ISR();
//RSCAN0_CH1_Err_ISR();
}
#endif
......@@ -2008,7 +2007,7 @@ void INTRCAN1TRX(void)
#pragma ghs interrupt
void INTRCAN2ERR(void)
{
;//RSCAN0_CH2_Err_ISR();
//RSCAN0_CH2_Err_ISR();
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment