添加tftp协议
1.usb连接上之后,可以使用tftp协议传输文件 2.解决写入sd卡时如果buff地址不是4字节对齐时数据错位的问题
This commit is contained in:
@@ -122,13 +122,11 @@ static uint32_t exmem_malloc(uint32_t size) {
|
|||||||
uint32_t nmemb; // <20><>Ҫ<EFBFBD><D2AA><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
uint32_t nmemb; // <20><>Ҫ<EFBFBD><D2AA><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
uint32_t cmemb = 0; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
uint32_t cmemb = 0; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
// if(!mallco_dev.memrdy)mallco_dev.init();//δ<><CEB4>ʼ<EFBFBD><CABC>,<2C><>ִ<EFBFBD>г<EFBFBD>ʼ<EFBFBD><CABC>
|
|
||||||
if (size == 0)
|
if (size == 0)
|
||||||
return 0XFFFFFFFF; // <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>
|
return 0XFFFFFFFF; // <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>
|
||||||
|
// <20><>ȡ<EFBFBD><C8A1>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
nmemb = size / exmemblksize; // <20><>ȡ<EFBFBD><C8A1>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>
|
nmemb = (size+exmemblksize-1) / exmemblksize;
|
||||||
if (size % exmemblksize)
|
|
||||||
nmemb++;
|
|
||||||
for (offset = exmemtblsize - 1; offset >= 0; offset--) // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
for (offset = exmemtblsize - 1; offset >= 0; offset--) // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
{
|
{
|
||||||
if (!exmallco_dev.memmap[offset])
|
if (!exmallco_dev.memmap[offset])
|
||||||
@@ -152,23 +150,19 @@ static uint32_t exmem_malloc(uint32_t size) {
|
|||||||
// offset:<3A>ڴ<EFBFBD><DAB4><EFBFBD>ַƫ<D6B7><C6AB>
|
// offset:<3A>ڴ<EFBFBD><DAB4><EFBFBD>ַƫ<D6B7><C6AB>
|
||||||
// <20><><EFBFBD><EFBFBD>ֵ:0,<2C>ͷųɹ<C5B3>;1,<2C>ͷ<EFBFBD>ʧ<EFBFBD><CAA7>;
|
// <20><><EFBFBD><EFBFBD>ֵ:0,<2C>ͷųɹ<C5B3>;1,<2C>ͷ<EFBFBD>ʧ<EFBFBD><CAA7>;
|
||||||
static uint8_t exmem_free(uint32_t offset) {
|
static uint8_t exmem_free(uint32_t offset) {
|
||||||
uint32_t i;
|
// ƫ<><C6AB><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>.
|
||||||
if (!exmallco_dev.memrdy) // δ<><CEB4>ʼ<EFBFBD><CABC>,<2C><>ִ<EFBFBD>г<EFBFBD>ʼ<EFBFBD><CABC>
|
if (offset < exmemsize) {
|
||||||
{
|
// ƫ<><C6AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
// mallco_dev.init();
|
uint32_t index = offset / exmemblksize;
|
||||||
return 1; // δ<><CEB4>ʼ<EFBFBD><EFBFBD>
|
// <20>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
}
|
uint32_t nmemb = exmallco_dev.memmap[index];
|
||||||
if (offset < exmemsize) // ƫ<><C6AB><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
|
// <EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
{
|
for (int i = 0; i < nmemb; i++) {
|
||||||
uint32_t index = offset / exmemblksize; // ƫ<><C6AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
|
||||||
uint32_t nmemb = exmallco_dev.memmap[index]; // <20>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
|
||||||
for (i = 0; i < nmemb; i++) // <20>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
|
||||||
{
|
|
||||||
exmallco_dev.memmap[index + i] = 0;
|
exmallco_dev.memmap[index + i] = 0;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
} else
|
} else
|
||||||
return 2; // ƫ<>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD><EFBFBD>.
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------<2D>ڲ<EFBFBD>SRAM---------------------------------------
|
//------------------------------------<2D>ڲ<EFBFBD>SRAM---------------------------------------
|
||||||
|
@@ -12,8 +12,8 @@
|
|||||||
#include "stdlib.h"
|
#include "stdlib.h"
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
|
|
||||||
#define SD_Card 0 //SD<53><44>
|
#define SD_Card 0 // SD<EFBFBD><EFBFBD>
|
||||||
#define SPI_Flash 1 //SPI Flash
|
#define SPI_Flash 1 // SPI Flash
|
||||||
|
|
||||||
#define SD_BLOCKSIZE 512
|
#define SD_BLOCKSIZE 512
|
||||||
extern SD_CardInfo SDCardInfo;
|
extern SD_CardInfo SDCardInfo;
|
||||||
@@ -22,169 +22,144 @@ extern SD_CardInfo SDCardInfo;
|
|||||||
/* Get Drive Status */
|
/* Get Drive Status */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
DSTATUS disk_status (
|
DSTATUS disk_status(
|
||||||
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
DSTATUS stat = STA_NOINIT;
|
DSTATUS stat = STA_NOINIT;
|
||||||
|
|
||||||
switch (pdrv) {
|
switch (pdrv) {
|
||||||
|
|
||||||
case SD_Card :
|
case SD_Card:
|
||||||
stat &= ~STA_NOINIT;
|
stat &= ~STA_NOINIT;
|
||||||
return stat;
|
return stat;
|
||||||
|
|
||||||
case SPI_Flash :
|
case SPI_Flash:
|
||||||
return stat;
|
return stat;
|
||||||
}
|
}
|
||||||
return STA_NOINIT;
|
return STA_NOINIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
/* Inidialize a Drive */
|
/* Inidialize a Drive */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
DSTATUS disk_initialize (
|
DSTATUS disk_initialize(
|
||||||
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
DSTATUS stat = STA_NOINIT;
|
DSTATUS stat = STA_NOINIT;
|
||||||
|
|
||||||
switch (pdrv) {
|
switch (pdrv) {
|
||||||
|
case SD_Card:
|
||||||
case SD_Card :
|
if (SD_Init() == SD_OK) // SD<53><44><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
|
||||||
if( SD_Init()==SD_OK ) //SD<53><44><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
|
|
||||||
{
|
{
|
||||||
stat &= ~STA_NOINIT;
|
stat &= ~STA_NOINIT;
|
||||||
return stat;
|
return stat;
|
||||||
}
|
}
|
||||||
|
case SPI_Flash:
|
||||||
case SPI_Flash :
|
|
||||||
return stat;
|
return stat;
|
||||||
|
|
||||||
}
|
}
|
||||||
return STA_NOINIT;
|
return STA_NOINIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
/* Read Sector(s) */
|
/* Read Sector(s) */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
DRESULT disk_read (
|
DRESULT disk_read(BYTE pdrv, /* Physical drive nmuber to identify the drive */
|
||||||
BYTE pdrv, /* Physical drive nmuber to identify the drive */
|
|
||||||
BYTE *buff, /* Data buffer to store read data */
|
BYTE *buff, /* Data buffer to store read data */
|
||||||
DWORD sector, /* Start sector in LBA */
|
DWORD sector, /* Start sector in LBA */
|
||||||
UINT count /* Number of sectors to read */
|
UINT count /* Number of sectors to read */
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
SD_Error SD_state = SD_OK;
|
SD_Error SD_state = SD_OK;
|
||||||
BYTE *pbuff=buff;
|
BYTE *pbuff = buff;
|
||||||
if ((uint32_t)pbuff&0x3)
|
if ((uint32_t)pbuff & 0x3) {
|
||||||
{
|
pbuff = malloc(SD_BLOCKSIZE * count);
|
||||||
pbuff=malloc(SD_BLOCKSIZE*count);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (pdrv) {
|
switch (pdrv) {
|
||||||
|
|
||||||
case SD_Card:
|
case SD_Card:
|
||||||
SD_state=SD_ReadMultiBlocks(pbuff,(uint64_t)sector*SD_BLOCKSIZE,SD_BLOCKSIZE,count);
|
SD_state = SD_ReadMultiBlocks(pbuff, (uint64_t)sector * SD_BLOCKSIZE,
|
||||||
if(SD_state==SD_OK)
|
SD_BLOCKSIZE, count);
|
||||||
{
|
if (SD_state == SD_OK) {
|
||||||
SD_state=SD_WaitReadOperation();
|
SD_state = SD_WaitReadOperation();
|
||||||
while(SD_GetStatus() != SD_TRANSFER_OK);
|
while (SD_GetStatus() != SD_TRANSFER_OK)
|
||||||
|
;
|
||||||
}
|
}
|
||||||
if (pbuff!=buff)
|
if (pbuff != buff) {
|
||||||
{
|
memcpy(buff, pbuff, SD_BLOCKSIZE * count);
|
||||||
memcpy(buff,pbuff,SD_BLOCKSIZE*count);
|
|
||||||
free(pbuff);
|
free(pbuff);
|
||||||
}
|
}
|
||||||
if(SD_state==SD_OK)
|
if (SD_state == SD_OK)
|
||||||
return RES_OK;
|
return RES_OK;
|
||||||
else
|
else
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
|
case SPI_Flash:
|
||||||
case SPI_Flash :
|
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
}
|
}
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
/* Write Sector(s) */
|
/* Write Sector(s) */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
DRESULT disk_write (
|
DRESULT disk_write(BYTE pdrv, /* Physical drive nmuber to identify the drive */
|
||||||
BYTE pdrv, /* Physical drive nmuber to identify the drive */
|
|
||||||
const BYTE *buff, /* Data to be written */
|
const BYTE *buff, /* Data to be written */
|
||||||
DWORD sector, /* Start sector in LBA */
|
DWORD sector, /* Start sector in LBA */
|
||||||
UINT count /* Number of sectors to write */
|
UINT count /* Number of sectors to write */
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
SD_Error SD_state = SD_OK;
|
SD_Error SD_state = SD_OK;
|
||||||
|
BYTE *pbuff = (BYTE *)buff;
|
||||||
|
if ((uint32_t)pbuff & 0x3) {
|
||||||
|
pbuff = malloc(SD_BLOCKSIZE * count);
|
||||||
|
memcpy(pbuff, buff, SD_BLOCKSIZE * count);
|
||||||
|
}
|
||||||
switch (pdrv) {
|
switch (pdrv) {
|
||||||
|
|
||||||
case SD_Card:
|
case SD_Card:
|
||||||
SD_state=SD_WriteMultiBlocks((uint8_t *)buff,(uint64_t)sector*SD_BLOCKSIZE,SD_BLOCKSIZE,count);
|
SD_state = SD_WriteMultiBlocks(
|
||||||
if(SD_state==SD_OK)
|
(uint8_t *)pbuff, (uint64_t)sector * SD_BLOCKSIZE, SD_BLOCKSIZE, count);
|
||||||
{
|
if (SD_state == SD_OK) {
|
||||||
SD_state=SD_WaitWriteOperation();
|
SD_state = SD_WaitWriteOperation();
|
||||||
while(SD_GetStatus() != SD_TRANSFER_OK);
|
while (SD_GetStatus() != SD_TRANSFER_OK)
|
||||||
|
;
|
||||||
if(SD_state==SD_OK)
|
if (pbuff != buff) {
|
||||||
|
free(pbuff);
|
||||||
|
}
|
||||||
|
if (SD_state == SD_OK)
|
||||||
return RES_OK;
|
return RES_OK;
|
||||||
else
|
else
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
}
|
}
|
||||||
|
case SPI_Flash:
|
||||||
case SPI_Flash :
|
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
}
|
}
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
/* Miscellaneous Functions */
|
/* Miscellaneous Functions */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
DRESULT disk_ioctl (
|
DRESULT disk_ioctl(BYTE pdrv, /* Physical drive nmuber (0..) */
|
||||||
BYTE pdrv, /* Physical drive nmuber (0..) */
|
|
||||||
BYTE cmd, /* Control code */
|
BYTE cmd, /* Control code */
|
||||||
void *buff /* Buffer to send/receive control data */
|
void *buff /* Buffer to send/receive control data */
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
DRESULT res = RES_PARERR;
|
DRESULT res = RES_PARERR;
|
||||||
|
|
||||||
switch (pdrv) {
|
switch (pdrv) {
|
||||||
case SD_Card :
|
case SD_Card:
|
||||||
switch (cmd)
|
switch (cmd) {
|
||||||
{
|
|
||||||
case GET_SECTOR_COUNT:
|
case GET_SECTOR_COUNT:
|
||||||
*(DWORD * )buff = SDCardInfo.CardCapacity/SD_BLOCKSIZE;
|
*(DWORD *)buff = SDCardInfo.CardCapacity / SD_BLOCKSIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Get R/W sector size (WORD)
|
// Get R/W sector size (WORD)
|
||||||
case GET_SECTOR_SIZE :
|
case GET_SECTOR_SIZE:
|
||||||
*(WORD * )buff = SD_BLOCKSIZE;
|
*(WORD *)buff = SD_BLOCKSIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Get erase block size in unit of sector (DWORD)
|
// Get erase block size in unit of sector (DWORD)
|
||||||
case GET_BLOCK_SIZE :
|
case GET_BLOCK_SIZE:
|
||||||
*(DWORD * )buff = SD_BLOCKSIZE;
|
*(DWORD *)buff = SD_BLOCKSIZE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
return RES_OK;
|
return RES_OK;
|
||||||
|
case SPI_Flash:
|
||||||
case SPI_Flash :
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
return RES_PARERR;
|
return RES_PARERR;
|
||||||
@@ -192,8 +167,4 @@ DRESULT disk_ioctl (
|
|||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
/* ʱ<><CAB1><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ﲻʹ<EFB2BB>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD>0 */
|
/* ʱ<><CAB1><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ﲻʹ<EFB2BB>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD>0 */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
DWORD get_fattime(void) {
|
DWORD get_fattime(void) { return 0; }
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
@@ -501,3 +501,5 @@
|
|||||||
<09><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֮ǰʹ<C7B0><CAB9><EFBFBD>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>api<70><69>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>apiֻ<69><D6BB><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3>е<EFBFBD><D0B5><EFBFBD>
|
<09><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֮ǰʹ<C7B0><CAB9><EFBFBD>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>api<70><69>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>apiֻ<69><D6BB><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3>е<EFBFBD><D0B5><EFBFBD>
|
||||||
2025.10.17
|
2025.10.17
|
||||||
<20><><EFBFBD><EFBFBD>app<70>ص<EFBFBD>ʧ<EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><DEB8>˴<EFBFBD><CBB4>ڽṹ<DABD>壬<EFBFBD><E5A3AC><EFBFBD><EFBFBD>app<70><70><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>ǰ<EFBFBD>Ĵ<EFBFBD><C4B4>ڽṹ<DABD><E1B9B9>
|
<20><><EFBFBD><EFBFBD>app<70>ص<EFBFBD>ʧ<EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><DEB8>˴<EFBFBD><CBB4>ڽṹ<DABD>壬<EFBFBD><E5A3AC><EFBFBD><EFBFBD>app<70><70><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD>ǰ<EFBFBD>Ĵ<EFBFBD><C4B4>ڽṹ<DABD><E1B9B9>
|
||||||
|
2025.10.18
|
||||||
|
f_writeд<65><D0B4><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>buff<66><66><EFBFBD><EFBFBD>4<EFBFBD>ֽڶ<D6BD><DAB6>룬<EFBFBD><EBA3AC><EFBFBD><EFBFBD>sd<73><64>ͨ<EFBFBD><CDA8>dma<6D><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݻ<EFBFBD><DDBB><EFBFBD>λ
|
||||||
|
@@ -0,0 +1,97 @@
|
|||||||
|
/*
|
||||||
|
* File : tftp_port.c
|
||||||
|
* This file is part of RT-Thread RTOS
|
||||||
|
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Change Logs:
|
||||||
|
* Date Author Notes
|
||||||
|
* 2017-08-17 armink first version.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "bsp_init.h"
|
||||||
|
#include <ff.h>
|
||||||
|
#include <lwip/apps/tftp_server.h>
|
||||||
|
#include <rtthread.h>
|
||||||
|
|
||||||
|
static struct tftp_context ctx;
|
||||||
|
|
||||||
|
static void *tftp_open(const char *fname, const char *mode, u8_t write) {
|
||||||
|
FIL *file = malloc(sizeof(FIL));
|
||||||
|
FRESULT ret;
|
||||||
|
if (file == NULL) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (!rt_strcmp(mode, "octet")) {
|
||||||
|
if (write) {
|
||||||
|
ret = f_open(file, fname, FA_CREATE_ALWAYS | FA_WRITE);
|
||||||
|
} else {
|
||||||
|
ret = f_open(file, fname, FA_READ);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rt_kprintf("tftp: No support this mode(%s).", mode);
|
||||||
|
}
|
||||||
|
if (ret != FR_OK) {
|
||||||
|
rt_kprintf("ftp: open file %s failed,ret=%d\n", fname, ret);
|
||||||
|
free(file);
|
||||||
|
file = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int tftp_write(void *handle, struct pbuf *p) {
|
||||||
|
FIL *file = (FIL *)handle;
|
||||||
|
UINT wb = 0;
|
||||||
|
FRESULT ret;
|
||||||
|
uint8_t *buf = p->payload;
|
||||||
|
ret = f_write(file, p->payload, p->len, &wb);
|
||||||
|
if (ret != FR_OK) {
|
||||||
|
wb = -1;
|
||||||
|
}
|
||||||
|
return (int)wb;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void tftp_close(void *handle) {
|
||||||
|
f_close((FIL *)handle);
|
||||||
|
free(handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int tftp_read(void *handle, void *buffer, int len) {
|
||||||
|
UINT rb = 0;
|
||||||
|
FIL *file = (FIL *)handle;
|
||||||
|
FRESULT ret;
|
||||||
|
ret = f_read(file, buffer, len, &rb);
|
||||||
|
if (ret != FR_OK) {
|
||||||
|
rb = -1;
|
||||||
|
}
|
||||||
|
return (int)rb;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int tftp_server() {
|
||||||
|
ctx.open = tftp_open;
|
||||||
|
ctx.close = tftp_close;
|
||||||
|
ctx.read = tftp_read;
|
||||||
|
ctx.write = tftp_write;
|
||||||
|
|
||||||
|
if (tftp_init(&ctx) == ERR_OK) {
|
||||||
|
rt_kprintf("TFTP server start successfully.\n");
|
||||||
|
} else {
|
||||||
|
rt_kprintf("TFTP server start failed.\n");
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
extern_init(tftp, tftp_server);
|
@@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* File : tftp_port.c
|
|
||||||
* This file is part of RT-Thread RTOS
|
|
||||||
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*
|
|
||||||
* Change Logs:
|
|
||||||
* Date Author Notes
|
|
||||||
* 2017-08-17 armink first version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include <rtthread.h>
|
|
||||||
#include <dfs_posix.h>
|
|
||||||
#include <lwip/apps/tftp_server.h>
|
|
||||||
|
|
||||||
static struct tftp_context ctx;
|
|
||||||
|
|
||||||
static void* tftp_open(const char* fname, const char* mode, u8_t write)
|
|
||||||
{
|
|
||||||
int fd = -1;
|
|
||||||
|
|
||||||
if (!rt_strcmp(mode, "octet"))
|
|
||||||
{
|
|
||||||
if (write)
|
|
||||||
{
|
|
||||||
fd = open(fname, O_WRONLY | O_CREAT, 0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fd = open(fname, O_RDONLY, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
rt_kprintf("tftp: No support this mode(%s).", mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (void *) fd;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int tftp_write(void* handle, struct pbuf* p)
|
|
||||||
{
|
|
||||||
int fd = (int) handle;
|
|
||||||
|
|
||||||
return write(fd, p->payload, p->len);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(RT_USING_FINSH)
|
|
||||||
#include <finsh.h>
|
|
||||||
|
|
||||||
static void tftp_server(uint8_t argc, char **argv)
|
|
||||||
{
|
|
||||||
ctx.open = tftp_open;
|
|
||||||
ctx.close = (void (*)(void *)) close;
|
|
||||||
ctx.read = (int (*)(void *, void *, int)) read;
|
|
||||||
ctx.write = tftp_write;
|
|
||||||
|
|
||||||
if (tftp_init(&ctx) == ERR_OK)
|
|
||||||
{
|
|
||||||
rt_kprintf("TFTP server start successfully.\n");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
rt_kprintf("TFTP server start failed.\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FINSH_FUNCTION_EXPORT(tftp_server, start tftp server.);
|
|
||||||
|
|
||||||
#if defined(FINSH_USING_MSH)
|
|
||||||
MSH_CMD_EXPORT(tftp_server, start tftp server.);
|
|
||||||
#endif /* defined(FINSH_USING_MSH) */
|
|
||||||
|
|
||||||
#endif /* defined(RT_USING_FINSH) */
|
|
@@ -721,29 +721,31 @@ void mem_init(void)
|
|||||||
|
|
||||||
void *mem_calloc(mem_size_t count, mem_size_t size)
|
void *mem_calloc(mem_size_t count, mem_size_t size)
|
||||||
{
|
{
|
||||||
// return rt_calloc(count, size);
|
|
||||||
void *r = mymalloc_exm(size * count);
|
void *r = mymalloc_exm(size * count);
|
||||||
memset(r, 0, size * count);
|
memset(r, 0, size * count);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// lwip ֻ֧<D6BB>ִ<EFBFBD>bufתС<D7AA><D0A1><EFBFBD><EFBFBD>תС<D7AA><D0A1><EFBFBD><EFBFBD>ֱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD>ԭ<EFBFBD><D4AD>ַ
|
||||||
|
// <20><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>realloc<6F><63><EFBFBD>·<EFBFBD><C2B7>䣬<EFBFBD><E4A3AC>pbuf<75><66><EFBFBD>µ<EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>ݲ<EFBFBD><DDB2><EFBFBD>ȥ
|
||||||
|
// <20><><EFBFBD>ڼ<EFBFBD><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
void *mem_trim(void *mem, mem_size_t size)
|
void *mem_trim(void *mem, mem_size_t size)
|
||||||
{
|
{
|
||||||
// return rt_realloc(mem, size);
|
|
||||||
/* not support trim yet */
|
/* not support trim yet */
|
||||||
mem = myrealloc(mem, size);
|
|
||||||
return mem;
|
return mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// static void *p_last;
|
||||||
void *mem_malloc(mem_size_t size)
|
void *mem_malloc(mem_size_t size)
|
||||||
{
|
{
|
||||||
// return rt_malloc(size);
|
void *p = 0;
|
||||||
return mymalloc_exm(size);
|
p = mymalloc_exm(size);
|
||||||
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
void mem_free(void *mem)
|
void mem_free(void *mem)
|
||||||
{
|
{
|
||||||
// rt_free(mem);
|
|
||||||
myfree(mem);
|
myfree(mem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -218,16 +218,17 @@
|
|||||||
#define RT_LWIP_TCP
|
#define RT_LWIP_TCP
|
||||||
#define RT_LWIP_UDP
|
#define RT_LWIP_UDP
|
||||||
#define RT_LWIP_ICMP
|
#define RT_LWIP_ICMP
|
||||||
// #define RT_LWIP_DEBUG
|
|
||||||
#define RT_LWIP_TCPIP_DEBUG
|
|
||||||
#define RT_LWIP_NETIF_DEBUG
|
|
||||||
#define RT_LWIP_ETHARP_DEBUG
|
|
||||||
#define RT_LWIP_IP_DEBUG
|
|
||||||
#define RT_LWIP_UDP_DEBUG
|
|
||||||
#define RT_LWIP_DHCP
|
#define RT_LWIP_DHCP
|
||||||
#define RT_LWIP_IGMP
|
#define RT_LWIP_IGMP
|
||||||
#define RT_LWIP_RAW
|
#define RT_LWIP_RAW
|
||||||
|
|
||||||
|
// #define RT_LWIP_DEBUG
|
||||||
|
// #define RT_LWIP_TCPIP_DEBUG
|
||||||
|
// #define RT_LWIP_NETIF_DEBUG
|
||||||
|
// #define RT_LWIP_ETHARP_DEBUG
|
||||||
|
// #define RT_LWIP_IP_DEBUG
|
||||||
|
// #define RT_LWIP_UDP_DEBUG
|
||||||
|
#define RT_LWIP_PBUF_DEBUG
|
||||||
// <<< end of configuration section >>>
|
// <<< end of configuration section >>>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user