From bfb3cb185e8cffda075207795b532f72923b982e Mon Sep 17 00:00:00 2001
From: guanjiao ren <guanjiao.ren@ninebot.com>
Date: 星期一, 21 五月 2018 16:02:58 +0800
Subject: [PATCH] 将main.c中的主程序移到dw_app.c
---
源码/核心板/Src/decadriver/deca_device.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/decadriver/deca_device.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/decadriver/deca_device.c"
index 93587d1..407d576 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/decadriver/deca_device.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/decadriver/deca_device.c"
@@ -14,8 +14,7 @@
#include "deca_param_types.h"
#include "deca_regs.h"
#include "deca_device_api.h"
-#include "deca_sleep.h"
-#include "port.h"
+#include "dw_driver.h"
// Defines for enable_clocks function
#define FORCE_SYS_XTI 0
@@ -1050,7 +1049,7 @@
*/
uint32 dwt_read32bitoffsetreg(int regFileID, int regOffset)
{
- uint32 regval = DWT_ERROR ;
+ uint32 regval = (uint32)DWT_ERROR ;
int j ;
uint8 buffer[4] ;
@@ -1082,7 +1081,7 @@
*/
uint16 dwt_read16bitoffsetreg(int regFileID, int regOffset)
{
- uint16 regval = DWT_ERROR ;
+ uint16 regval = (uint16)DWT_ERROR ;
uint8 buffer[2] ;
int result = dwt_readfromdevice(regFileID, regOffset, 2, buffer); // Read 2 bytes (16-bits) register into buffer
@@ -1397,7 +1396,7 @@
break;
default :
// printf("OTP SET MR: ERROR : Invalid mode selected\n",mode);
- return DWT_ERROR;
+ return (uint32)DWT_ERROR;
}
wr_buf[0] = mra & 0x00ff;
@@ -1531,7 +1530,7 @@
if((rd_buf[0] & 0x02) != 0x02)
{
// printf("OTP PROG 32: ERROR VPP NOT OK, programming will fail. Are MR/MRA/MRB set?\n");
- return DWT_ERROR;
+ return (uint32)DWT_ERROR;
}
// Write the data
--
Gitblit v1.9.3