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

repair the bug of float number printf

This commit is contained in:
Wang_Weigen 2022-01-24 14:49:06 +08:00
parent d5ff9259a0
commit 672229cd0f
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APP_Framework/Framework/transform_layer/xiuos/user_api/switch_api/user_api.h
View File

@ -158,7 +158,6 @@ int statfs(const char *path, struct statfs *buf);
/* NOTE!!!: when cutting out file system, the 'printf' function can not output angthing */ /* NOTE!!!: when cutting out file system, the 'printf' function can not output angthing */
int Userprintf(const char *fmt, ...); int Userprintf(const char *fmt, ...);
#define printf Userprintf
#endif #endif
@ -242,7 +241,6 @@ uint8_t UserGetTaskPriority(int32_t id);
#endif #endif
#define UserPrintf KPrintf #define UserPrintf KPrintf
#define printf KPrintf
#endif #endif

2
Ubiquitous/XiUOS/kernel/include/user_api.h
View File

@ -240,7 +240,7 @@ uint8_t UserGetTaskPriority(int32_t id);
#endif #endif
#define UserPrintf KPrintf #define UserPrintf KPrintf
#define printf KPrintf
#endif #endif

21
Ubiquitous/XiUOS/resources/serial/dev_serial.c
View File

@ -100,6 +100,7 @@ static inline int SerialDevIntWrite(struct SerialHardwareDevice *serial_dev, str
struct SerialHwDevDone *hwdev_done = serial_dev->hwdev_done; struct SerialHwDevDone *hwdev_done = serial_dev->hwdev_done;
const uint8 *write_data = (const uint8 *)write_param->buffer; const uint8 *write_data = (const uint8 *)write_param->buffer;
x_size_t write_length = write_param->size; x_size_t write_length = write_param->size;
x_size_t len_result = 0;
while (write_length) while (write_length)
{ {
@ -109,12 +110,12 @@ static inline int SerialDevIntWrite(struct SerialHardwareDevice *serial_dev, str
} }
KPrintf("SerialDevIntWrite data %d write_length %u\n", *(char *)write_data, write_length); KPrintf("SerialDevIntWrite data %d write_length %u\n", *(char *)write_data, write_length);
len_result++;
write_data++; write_data++;
write_length--; write_length--;
} }
return EOK; return len_result;
} }
static inline int SerialDevIntRead(struct SerialHardwareDevice *serial_dev, struct BusBlockReadParam *read_param) static inline int SerialDevIntRead(struct SerialHardwareDevice *serial_dev, struct BusBlockReadParam *read_param)
@ -201,7 +202,7 @@ static inline int SerialDevDMAWrite(struct SerialHardwareDevice *serial_dev, str
CriticalAreaUnLock(lock); CriticalAreaUnLock(lock);
} }
return EOK; return write_length;
} }
static x_size_t SerialGetRxFifoLength(struct SerialHardwareDevice *serial_dev) static x_size_t SerialGetRxFifoLength(struct SerialHardwareDevice *serial_dev)
@ -329,7 +330,7 @@ static inline int SerialDevPollingWrite(struct SerialHardwareDevice *serial_dev,
struct SerialHwDevDone *hwdev_done = serial_dev->hwdev_done; struct SerialHwDevDone *hwdev_done = serial_dev->hwdev_done;
const uint8 *write_data = (const uint8 *)write_param->buffer; const uint8 *write_data = (const uint8 *)write_param->buffer;
x_size_t write_length = write_param->size; x_size_t write_length = write_param->size;
x_size_t len_result = 0;
while (write_length) while (write_length)
{ {
if ((*write_data == '\n') && (SIGN_OPER_STREAM == serial_stream_mode)) { if ((*write_data == '\n') && (SIGN_OPER_STREAM == serial_stream_mode)) {
@ -337,12 +338,12 @@ static inline int SerialDevPollingWrite(struct SerialHardwareDevice *serial_dev,
} }
hwdev_done->put_char(serial_dev, *write_data); hwdev_done->put_char(serial_dev, *write_data);
len_result++;
++write_data; ++write_data;
--write_length; --write_length;
} }
return EOK; return len_result;
} }
static inline int SerialDevPollingRead(struct SerialHardwareDevice *serial_dev, struct BusBlockReadParam *read_param) static inline int SerialDevPollingRead(struct SerialHardwareDevice *serial_dev, struct BusBlockReadParam *read_param)
@ -604,7 +605,7 @@ static uint32 SerialDevWrite(void *dev, struct BusBlockWriteParam *write_param)
if (serial_dev_param->serial_work_mode & SIGN_OPER_INT_TX) { if (serial_dev_param->serial_work_mode & SIGN_OPER_INT_TX) {
ret = SerialDevIntWrite(serial_dev, write_param); ret = SerialDevIntWrite(serial_dev, write_param);
if (EOK != ret) { if (ret < 0) {
KPrintf("SerialDevIntWrite error %d\n", ret); KPrintf("SerialDevIntWrite error %d\n", ret);
return ERROR; return ERROR;
} }
@ -612,7 +613,7 @@ static uint32 SerialDevWrite(void *dev, struct BusBlockWriteParam *write_param)
#ifdef SERIAL_USING_DMA #ifdef SERIAL_USING_DMA
else if (serial_dev_param->serial_work_mode & SIGN_OPER_DMA_TX) { else if (serial_dev_param->serial_work_mode & SIGN_OPER_DMA_TX) {
ret = SerialDevDMAWrite(serial_dev, write_param); ret = SerialDevDMAWrite(serial_dev, write_param);
if (EOK != ret) { if (ret < 0) {
KPrintf("SerialDevDMAWrite error %d\n", ret); KPrintf("SerialDevDMAWrite error %d\n", ret);
return ERROR; return ERROR;
} }
@ -620,13 +621,13 @@ static uint32 SerialDevWrite(void *dev, struct BusBlockWriteParam *write_param)
#endif #endif
else { else {
ret = SerialDevPollingWrite(serial_dev, write_param, serial_dev_param->serial_stream_mode); ret = SerialDevPollingWrite(serial_dev, write_param, serial_dev_param->serial_stream_mode);
if (EOK != ret) { if (ret < 0) {
KPrintf("SerialDevPollingWrite error %d\n", ret); KPrintf("SerialDevPollingWrite error %d\n", ret);
return ERROR; return ERROR;
} }
} }
return EOK; return ret;
} }
static uint32 SerialDevRead(void *dev, struct BusBlockReadParam *read_param) static uint32 SerialDevRead(void *dev, struct BusBlockReadParam *read_param)