Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
1f37c8efa5 | |||
999cb97cc8 | |||
455ab71314 | |||
f0dcff0671 |
@ -147,7 +147,7 @@ uint8_t ftpd_run(uint8_t * dbuf)
|
||||
{
|
||||
uint16_t size = 0, i;
|
||||
long ret = 0;
|
||||
uint16_t blocklen, send_byte, recv_byte;
|
||||
uint32_t blocklen, send_byte, recv_byte;
|
||||
uint32_t remain_filesize;
|
||||
uint32_t remain_datasize;
|
||||
#if defined(F_FILESYSTEM)
|
||||
@ -322,7 +322,7 @@ uint8_t ftpd_run(uint8_t * dbuf)
|
||||
else
|
||||
send_byte = remain_filesize;
|
||||
|
||||
ftp.fr = f_read(&(ftp.fil), dbuf, send_byte , (void *)&blocklen);
|
||||
ftp.fr = f_read(&(ftp.fil), dbuf, send_byte , &blocklen);
|
||||
if(ftp.fr != FR_OK)
|
||||
break;
|
||||
#if defined(_FTP_DEBUG_)
|
||||
@ -389,7 +389,7 @@ uint8_t ftpd_run(uint8_t * dbuf)
|
||||
//printf("----->fn:%s data:%s \r\n", ftp.filename, dbuf);
|
||||
#endif
|
||||
|
||||
ftp.fr = f_write(&(ftp.fil), dbuf, (UINT)ret, (void *)&blocklen);
|
||||
ftp.fr = f_write(&(ftp.fil), dbuf, (UINT)ret, &blocklen);
|
||||
#if defined(_FTP_DEBUG_)
|
||||
//printf("----->dsize:%d recv:%d len:%d \r\n", remain_datasize, ret, blocklen);
|
||||
#endif
|
||||
|
@ -400,7 +400,7 @@ static void send_http_response_body(uint8_t s, uint8_t * uri_name, uint8_t * buf
|
||||
read_userReg_webContent(start_addr, &buf[0], HTTPSock_Status[get_seqnum].file_offset, send_len);
|
||||
}
|
||||
#ifdef _USE_SDCARD_
|
||||
else if(HTTPSock_Status[get_seqnum]->storage_type == SDCARD)
|
||||
else if(HTTPSock_Status[get_seqnum].storage_type == SDCARD)
|
||||
{
|
||||
// Data read from SD Card
|
||||
fr = f_read(&fs, &buf[0], send_len, (void *)&blocklen);
|
||||
@ -561,7 +561,7 @@ static void http_process_handler(uint8_t s, st_http_request * p_http_request)
|
||||
|
||||
file_len = fs.fsize;
|
||||
content_addr = fs.sclust;
|
||||
HTTPSock_Status[get_seqnum]->storage_type = SDCARD;
|
||||
HTTPSock_Status[get_seqnum].storage_type = SDCARD;
|
||||
}
|
||||
#elif _USE_FLASH_
|
||||
else if(/* Read content from Dataflash */)
|
||||
|
Reference in New Issue
Block a user