j3d1/RTL00_WEB
1
0
Fork 0
mirror of https://github.com/pvvx/RTL00_WEB.git synced 2025-07-31 20:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
pvvx 2017-09-22 10:44:42 +03:00
parent 9ffd9dac1a
commit eac35630e6
31 changed files with 185 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

16
USDK/component/common/file_system/fatfs/disk_if/src/sdcard.c
View file

@ -6,12 +6,11 @@
* This module is a confidential and proprietary property of RealTek and
* possession or use of this module requires written permission of RealTek.
*/
#include "integer.h"
#include <disk_if/inc/sdcard.h>
#if FATFS_DISK_SD
//#if FATFS_DISK_SD
#include "sd.h" // sd card driver with sdio interface
#include "integer.h"
#include <disk_if/inc/sdcard.h>
#define SD_BLOCK_SIZE 512
@ -53,7 +52,7 @@ DRESULT SD_disk_read(BYTE *buff, DWORD sector, UINT count){
/* Write sector(s) --------------------------------------------*/
#if _USE_WRITE == 1
DRESULT SD_disk_write(const BYTE *buff, DWORD sector, UINT count){
DRESULT SD_disk_write(const BYTE * buff, DWORD sector, UINT count){
SD_RESULT res;
res = SD_WriteBlocks(sector, buff, count);
@ -66,7 +65,6 @@ DRESULT SD_disk_write(const BYTE *buff, DWORD sector, UINT count){
DRESULT SD_disk_ioctl (BYTE cmd, void* buff){
DRESULT res = RES_ERROR;
SD_RESULT result;
DWORD last_blk_addr, block_size;
switch(cmd){
/* Generic command (used by FatFs) */
@ -118,7 +116,8 @@ DRESULT SD_disk_ioctl (BYTE cmd, void* buff){
}
#endif
ll_diskio_drv SD_disk_Driver ={
ll_diskio_drv SD_disk_Driver = {
.disk_initialize = SD_disk_initialize,
.disk_status = SD_disk_status,
.disk_read = SD_disk_read,
@ -130,4 +129,5 @@ ll_diskio_drv SD_disk_Driver ={
#endif
.TAG = "SD"
};
#endif
//#endif // FATFS_DISK_SD

1
USDK/component/common/file_system/fatfs/r0.10c/include/ff.h
View file

@ -335,6 +335,7 @@ int ff_del_syncobj (_SYNC_t sobj); /* Delete a sync object */
#define ST_DWORD(ptr,val) *(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8); *((BYTE*)(ptr)+2)=(BYTE)((DWORD)(val)>>16); *((BYTE*)(ptr)+3)=(BYTE)((DWORD)(val)>>24)
#endif
#ifdef __cplusplus
}
#endif

2
USDK/component/common/file_system/fatfs/r0.10c/src/diskio.c
View file

@ -87,7 +87,7 @@ DRESULT disk_write (
)
{
DRESULT res = RES_PARERR;
int index = 0;
// int index = 0;
if (pdrv < 0 || pdrv >= disk.nbr || buff == (void*)0 || count <= 0)
return RES_PARERR; // Return if the parameter is invalid

13
USDK/component/common/file_system/fatfs/r0.10c/src/ff.c
View file

@ -119,8 +119,6 @@
#include "diskio.h" /* Declarations of disk I/O functions */
/*--------------------------------------------------------------------------
Module Private Definitions
@ -595,9 +593,14 @@ int mem_cmp (const void* dst, const void* src, UINT cnt) {
return r;
}
#else
#define mem_cpy memcpy
#define mem_set memset
#define mem_cmp memcmp
typedef unsigned int size_t;
extern int rtl_memcmp(const void * m1 , const void * m2 , size_t n);
extern void * rtl_memcpy(void * dst0 , const void * src0 , size_t len0);
extern void * rtl_memset(void * m , int c , size_t n);
#define mem_cpy rtl_memcpy
#define mem_set rtl_memset
#define mem_cmp rtl_memcmp
#endif
/* Check if chr is contained in the string */