FreeRTOS/Lab-Project-FreeRTOS-FAT
1
0
Fork 0
mirror of https://github.com/FreeRTOS/Lab-Project-FreeRTOS-FAT.git synced 2025-10-19 02:23:15 +08:00
Code Issues Projects Releases Wiki Activity

changes to support UTF16 and LFN (#4)

Browse Source
This commit is contained in:
arpitayagnik
2020-10-30 19:50:12 -07:00
committed by GitHub
parent 680393f2f0
commit fc73d5a71b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ff_dir.c
View File

@@ -640,7 +640,7 @@ BaseType_t xFound;
#if( ffconfigUNICODE_UTF16_SUPPORT != 0 ) #if( ffconfigUNICODE_UTF16_SUPPORT != 0 )
FF_T_WCHAR mytoken[ ffconfigMAX_FILENAME ]; FF_T_WCHAR mytoken[ ffconfigMAX_FILENAME ];
FF_T_WCHAR *token; FF_T_WCHAR *pcToken;
#else #else
char mytoken[ ffconfigMAX_FILENAME ]; char mytoken[ ffconfigMAX_FILENAME ];
char *pcToken; char *pcToken;

10
ff_string.c
View File

@@ -51,7 +51,7 @@
*/ */
#if( ffconfigUNICODE_UTF16_SUPPORT != 0 ) #if( ffconfigUNICODE_UTF16_SUPPORT != 0 )
void FF_cstrntowcs( FF_T_WCHAR *wcsDest, const int8_t *szpSource, uint32_t ulLength ) void FF_cstrntowcs( FF_T_WCHAR *wcsDest, const char *szpSource, uint32_t ulLength )
{ {
while( ( *szpSource != '\0' ) && ( ulLength-- != 0 ) ) while( ( *szpSource != '\0' ) && ( ulLength-- != 0 ) )
{ {
@@ -63,7 +63,7 @@
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
#if( ffconfigUNICODE_UTF16_SUPPORT != 0 ) #if( ffconfigUNICODE_UTF16_SUPPORT != 0 )
void FF_cstrtowcs( FF_T_WCHAR *wcsDest, const int8_t *szpSource ) void FF_cstrtowcs( FF_T_WCHAR *wcsDest, const char *szpSource )
{ {
while( *szpSource != '\0' ) while( *szpSource != '\0' )
{ {
@@ -75,7 +75,7 @@
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
#if( ffconfigUNICODE_UTF16_SUPPORT != 0 ) #if( ffconfigUNICODE_UTF16_SUPPORT != 0 )
void FF_wcstocstr( int8_t *szpDest, const FF_T_WCHAR *wcsSource ) void FF_wcstocstr( char *szpDest, const FF_T_WCHAR *wcsSource )
{ {
while( *wcsSource != '\0' ) while( *wcsSource != '\0' )
{ {
@@ -87,7 +87,7 @@
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
#if( ffconfigUNICODE_UTF16_SUPPORT != 0 ) #if( ffconfigUNICODE_UTF16_SUPPORT != 0 )
void FF_wcsntocstr( int8_t *szpDest, const FF_T_WCHAR *wcsSource, uint32_t ulLength ) void FF_wcsntocstr( char *szpDest, const FF_T_WCHAR *wcsSource, uint32_t ulLength )
{ {
while( ( *wcsSource != '\0' ) && ( ulLength-- != 0 ) ) while( ( *wcsSource != '\0' ) && ( ulLength-- != 0 ) )
{ {
@@ -610,7 +610,7 @@
} }
else if( ulSize < 2 ) else if( ulSize < 2 )
{ {
lReturn FF_ERR_UNICODE_DEST_TOO_SMALL | FF_UTF32CTOUTF16C; /* Not enough UTF-16 units to record this character. */ lReturn = FF_ERR_UNICODE_DEST_TOO_SMALL | FF_UTF32CTOUTF16C; /* Not enough UTF-16 units to record this character. */
} }
else if( utf32char < 0x00200000 ) else if( utf32char < 0x00200000 )
{ {

2
include/ff_headers.h
View File

@@ -40,6 +40,7 @@ extern "C" {
#include "FreeRTOSFATConfig.h" #include "FreeRTOSFATConfig.h"
#include "FreeRTOSFATConfigDefaults.h" #include "FreeRTOSFATConfigDefaults.h"
#include "ff_error.h" #include "ff_error.h"
#include "ff_string.h"
#include "ff_ioman.h" #include "ff_ioman.h"
#include "ff_fat.h" #include "ff_fat.h"
#include "ff_fatdef.h" #include "ff_fatdef.h"
@@ -48,7 +49,6 @@ extern "C" {
#include "ff_crc.h" #include "ff_crc.h"
#include "ff_file.h" #include "ff_file.h"
#include "ff_dir.h" #include "ff_dir.h"
#include "ff_string.h"
#include "ff_format.h" #include "ff_format.h"
#include "ff_locking.h" #include "ff_locking.h"