add http mp3 file to play; add MMC card support in sdcard driver (by gzhuli)
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@100 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong
parent
0be4d1d5dd
commit
7ac09ece24
|
|
@ -21,6 +21,7 @@
|
|||
#include <finsh.h>
|
||||
|
||||
#include <stm32f10x.h>
|
||||
#include "board.h"
|
||||
|
||||
#ifdef RT_USING_DFS
|
||||
/* dfs init */
|
||||
|
|
@ -140,6 +141,11 @@ void rt_init_thread_entry(void *parameter)
|
|||
rt_kprintf("TCP/IP initialized!\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
#if STM32_EXT_SRAM
|
||||
/* init netbuf worker */
|
||||
net_buf_init(320 * 1024);
|
||||
#endif
|
||||
}
|
||||
|
||||
int rt_application_init()
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
/* whether use board external SRAM memory */
|
||||
// <e>Use external SRAM memory on the board
|
||||
// <i>Enable External SRAM memory
|
||||
#define STM32_EXT_SRAM 0
|
||||
#define STM32_EXT_SRAM 1
|
||||
// <o>Begin Address of External SRAM
|
||||
// <i>Default: 0x68000000
|
||||
#define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */
|
||||
|
|
|
|||
|
|
@ -530,6 +530,8 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
|
|||
if ((rx_status & 0xbf00) || (rx_len < 0x40)
|
||||
|| (rx_len > DM9000_PKT_MAX))
|
||||
{
|
||||
rt_kprintf("rx error: status %04x\n", rx_status);
|
||||
|
||||
if (rx_status & 0x100)
|
||||
{
|
||||
rt_kprintf("rx fifo error\n");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/*
|
||||
* http client for RT-Thread
|
||||
*/
|
||||
#include <rtthread.h>
|
||||
#include "http.h"
|
||||
|
||||
#include <dfs_posix.h>
|
||||
|
||||
#include <lwip/sockets.h>
|
||||
|
|
@ -13,19 +14,6 @@ const char _http_getend[] = " HTTP/1.0\r\n";
|
|||
const char _http_user_agent[] = "User-Agent: RT-Thread HTTP Agent\r\n";
|
||||
const char _http_endheader[] = "\r\n";
|
||||
|
||||
struct http_session
|
||||
{
|
||||
char* host;
|
||||
int port;
|
||||
|
||||
char* user_agent;
|
||||
int socket;
|
||||
|
||||
/* size of http file */
|
||||
rt_size_t size;
|
||||
rt_off_t position;
|
||||
};
|
||||
|
||||
extern long int strtol(const char *nptr, char **endptr, int base);
|
||||
|
||||
//
|
||||
|
|
@ -204,16 +192,50 @@ static int http_connect(struct http_session* session,
|
|||
}
|
||||
|
||||
// Needs more error checking here.....
|
||||
#if 0
|
||||
rc = send( peer_handle, _http_get, sizeof( _http_get ) - 1, 0 );
|
||||
rc = send( peer_handle, (void*) url, strlen( url ), 0 );
|
||||
rc = send( peer_handle, _http_getend, sizeof( _http_getend ) - 1, 0 );
|
||||
|
||||
rc = send( peer_handle, _http_host, sizeof( _http_host ) - 1, 0 );
|
||||
rc = send( peer_handle, host_addr, strlen( url ), 0 );
|
||||
rc = send( peer_handle, host_addr, strlen( host_addr ), 0 );
|
||||
rc = send( peer_handle, _http_endheader, sizeof( _http_endheader ) - 1, 0 ); // "\r\n"
|
||||
|
||||
rc = send( peer_handle, _http_user_agent, sizeof( _http_user_agent ) - 1, 0 );
|
||||
rc = send( peer_handle, _http_endheader, sizeof( _http_endheader ) - 1, 0 );
|
||||
#else
|
||||
{
|
||||
rt_uint8_t *ptr, *buf;
|
||||
|
||||
buf = rt_malloc (512);
|
||||
ptr = buf;
|
||||
rt_memcpy(ptr, _http_get, sizeof(_http_get) - 1);
|
||||
ptr += sizeof(_http_get) - 1;
|
||||
|
||||
rt_memcpy(ptr, url, strlen(url));
|
||||
ptr += strlen(url);
|
||||
|
||||
rt_memcpy(ptr, _http_getend, sizeof(_http_getend) - 1);
|
||||
ptr += sizeof(_http_getend) - 1;
|
||||
|
||||
rt_memcpy(ptr, _http_host, sizeof(_http_host) - 1);
|
||||
ptr += sizeof(_http_host) - 1;
|
||||
|
||||
rt_memcpy(ptr, host_addr, strlen(host_addr));
|
||||
ptr += strlen(host_addr);
|
||||
|
||||
rt_memcpy(ptr, _http_endheader, sizeof(_http_endheader) - 1);
|
||||
ptr += sizeof(_http_endheader) - 1;
|
||||
|
||||
rt_memcpy(ptr, _http_user_agent, sizeof(_http_user_agent) - 1);
|
||||
ptr += sizeof(_http_user_agent) - 1;
|
||||
|
||||
rt_memcpy(ptr, _http_endheader, sizeof(_http_endheader) - 1);
|
||||
ptr += sizeof(_http_endheader) - 1;
|
||||
rc = send(peer_handle, buf,
|
||||
(rt_uint32_t)ptr - (rt_uint32_t)buf, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
// We now need to read the header information
|
||||
while ( 1 )
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
#ifndef __HTTP_H__
|
||||
#define __HTTP_H__
|
||||
|
||||
#include <rtthread.h>
|
||||
|
||||
struct http_session
|
||||
{
|
||||
char* host;
|
||||
int port;
|
||||
|
||||
char* user_agent;
|
||||
int socket;
|
||||
|
||||
/* size of http file */
|
||||
rt_size_t size;
|
||||
rt_off_t position;
|
||||
};
|
||||
|
||||
struct http_session* http_session_open(char* url);
|
||||
rt_size_t http_session_read(struct http_session* session, rt_uint8_t *buffer, rt_size_t length);
|
||||
rt_off_t http_session_seek(struct http_session* session, rt_off_t offset, int mode);
|
||||
int http_session_close(struct http_session* session);
|
||||
|
||||
#endif
|
||||
|
|
@ -2,15 +2,12 @@
|
|||
#include <dfs_posix.h>
|
||||
#include <mp3/pub/mp3dec.h>
|
||||
|
||||
#define MP3_AUDIO_BUF_SZ 4096
|
||||
#define MP3_DECODE_MP_CNT 2
|
||||
#define MP3_DECODE_MP_SZ 2560
|
||||
#include "board.h"
|
||||
#include "netbuffer.h"
|
||||
|
||||
#define STATIC_MEMORY_POOL
|
||||
#ifdef STATIC_MEMORY_POOL
|
||||
static rt_uint8_t mempool[(MP3_DECODE_MP_SZ * 2 + 4)* 2]; // 5k x 2
|
||||
static struct rt_mempool _mp;
|
||||
#endif
|
||||
#define MP3_AUDIO_BUF_SZ 4096
|
||||
|
||||
rt_uint8_t mp3_fd_buffer[MP3_AUDIO_BUF_SZ];
|
||||
|
||||
struct mp3_decoder
|
||||
{
|
||||
|
|
@ -20,7 +17,8 @@ struct mp3_decoder
|
|||
rt_uint32_t frames;
|
||||
|
||||
/* mp3 file descriptor */
|
||||
int fd;
|
||||
rt_size_t (*fetch_data)(void* parameter, rt_uint8_t *buffer, rt_size_t length);
|
||||
void* fetch_parameter;
|
||||
|
||||
/* mp3 read session */
|
||||
rt_uint8_t *read_buffer;
|
||||
|
|
@ -28,22 +26,18 @@ struct mp3_decoder
|
|||
rt_int32_t read_offset;
|
||||
rt_uint32_t bytes_left, bytes_left_before_decoding;
|
||||
|
||||
/* mp3 decode memory pool */
|
||||
rt_mp_t mp;
|
||||
|
||||
/* audio device */
|
||||
rt_device_t snd_device;
|
||||
};
|
||||
|
||||
static rt_err_t mp3_decoder_tx_done(rt_device_t dev, void *buffer)
|
||||
{
|
||||
/* release memory block to memory pool */
|
||||
rt_mp_free(buffer);
|
||||
/* release memory block */
|
||||
sbuf_release(buffer);
|
||||
|
||||
return RT_EOK;
|
||||
}
|
||||
|
||||
rt_uint8_t mp3_fd_buffer[MP3_AUDIO_BUF_SZ];
|
||||
void mp3_decoder_init(struct mp3_decoder* decoder)
|
||||
{
|
||||
RT_ASSERT(decoder != RT_NULL);
|
||||
|
|
@ -57,14 +51,6 @@ void mp3_decoder_init(struct mp3_decoder* decoder)
|
|||
decoder->read_buffer = &mp3_fd_buffer[0];
|
||||
if (decoder->read_buffer == RT_NULL) return;
|
||||
|
||||
/* create memory pool for decoding */
|
||||
#ifdef STATIC_MEMORY_POOL
|
||||
rt_mp_init(&_mp, "mp3", &mempool[0], sizeof(mempool), MP3_DECODE_MP_SZ * 2);
|
||||
decoder->mp = &_mp;
|
||||
#else
|
||||
decoder->mp = rt_mp_create("mp3dec", MP3_DECODE_MP_CNT, MP3_DECODE_MP_SZ * 2);
|
||||
#endif
|
||||
|
||||
decoder->decoder = MP3InitDecoder();
|
||||
|
||||
/* open audio device */
|
||||
|
|
@ -87,13 +73,6 @@ void mp3_decoder_detach(struct mp3_decoder* decoder)
|
|||
|
||||
/* release mp3 decoder */
|
||||
MP3FreeDecoder(decoder->decoder);
|
||||
|
||||
#ifdef STATIC_MEMORY_POOL
|
||||
rt_mp_detach(decoder->mp);
|
||||
#else
|
||||
/* delete memory pool for decoding */
|
||||
rt_mp_delete(decoder->mp);
|
||||
#endif
|
||||
}
|
||||
|
||||
struct mp3_decoder* mp3_decoder_create()
|
||||
|
|
@ -140,7 +119,8 @@ static rt_int32_t mp3_decoder_fill_buffer(struct mp3_decoder* decoder)
|
|||
if (is_first) is_first = 0;
|
||||
else current_offset += MP3_AUDIO_BUF_SZ - decoder->bytes_left;
|
||||
|
||||
bytes_read = read(decoder->fd, (char *)(decoder->read_buffer + decoder->bytes_left),
|
||||
bytes_read = decoder->fetch_data(decoder->fetch_parameter,
|
||||
(rt_uint8_t *)(decoder->read_buffer + decoder->bytes_left),
|
||||
bytes_to_read);
|
||||
|
||||
if (bytes_read == bytes_to_read)
|
||||
|
|
@ -210,7 +190,7 @@ int mp3_decoder_run(struct mp3_decoder* decoder)
|
|||
#endif
|
||||
|
||||
/* get a decoder buffer */
|
||||
buffer = (rt_uint16_t*)rt_mp_alloc(decoder->mp, RT_WAITING_FOREVER);
|
||||
buffer = (rt_uint16_t*)sbuf_alloc();
|
||||
|
||||
// rt_kprintf("bytes left before decode: %d\n", decoder->bytes_left);
|
||||
|
||||
|
|
@ -278,7 +258,7 @@ int mp3_decoder_run(struct mp3_decoder* decoder)
|
|||
}
|
||||
|
||||
/* release this memory block */
|
||||
rt_mp_free(buffer);
|
||||
sbuf_release(buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -304,6 +284,11 @@ int mp3_decoder_run(struct mp3_decoder* decoder)
|
|||
}
|
||||
|
||||
#include <finsh.h>
|
||||
rt_size_t fd_fetch(void* parameter, rt_uint8_t *buffer, rt_size_t length)
|
||||
{
|
||||
int fd = (int)parameter;
|
||||
return read(fd, (char*)buffer, length);
|
||||
}
|
||||
void mp3(char* filename)
|
||||
{
|
||||
int fd;
|
||||
|
|
@ -315,7 +300,9 @@ void mp3(char* filename)
|
|||
decoder = mp3_decoder_create();
|
||||
if (decoder != RT_NULL)
|
||||
{
|
||||
decoder->fd = fd;
|
||||
decoder->fetch_data = fd_fetch;
|
||||
decoder->fetch_parameter = (void*)fd;
|
||||
|
||||
while (mp3_decoder_run(decoder) != -1);
|
||||
close(fd);
|
||||
|
||||
|
|
@ -324,4 +311,55 @@ void mp3(char* filename)
|
|||
}
|
||||
}
|
||||
}
|
||||
FINSH_FUNCTION_EXPORT(mp3, mp3 decode test)
|
||||
FINSH_FUNCTION_EXPORT(mp3, mp3 decode test);
|
||||
|
||||
#if STM32_EXT_SRAM
|
||||
/* http mp3 */
|
||||
#include "http.h"
|
||||
static rt_size_t http_fetch(rt_uint8_t* ptr, rt_size_t len, void* parameter)
|
||||
{
|
||||
struct http_session* session = (struct http_session*)parameter;
|
||||
RT_ASSERT(session != RT_NULL);
|
||||
|
||||
return http_session_read(session, ptr, len);
|
||||
}
|
||||
|
||||
static void http_close(void* parameter)
|
||||
{
|
||||
struct http_session* session = (struct http_session*)parameter;
|
||||
RT_ASSERT(session != RT_NULL);
|
||||
|
||||
http_session_close(session);
|
||||
}
|
||||
|
||||
rt_size_t http_data_fetch(void* parameter, rt_uint8_t *buffer, rt_size_t length)
|
||||
{
|
||||
return net_buf_read(buffer, length);
|
||||
}
|
||||
void http_mp3(char* url)
|
||||
{
|
||||
struct http_session* session;
|
||||
struct mp3_decoder* decoder;
|
||||
|
||||
session = http_session_open(url);
|
||||
if (session != RT_NULL)
|
||||
{
|
||||
/* add a job to netbuf worker */
|
||||
net_buf_add_job(http_fetch, http_close, (void*)session);
|
||||
|
||||
decoder = mp3_decoder_create();
|
||||
if (decoder != RT_NULL)
|
||||
{
|
||||
decoder->fetch_data = http_data_fetch;
|
||||
decoder->fetch_parameter = RT_NULL;
|
||||
|
||||
while (mp3_decoder_run(decoder) != -1);
|
||||
|
||||
/* delete decoder object */
|
||||
mp3_decoder_delete(decoder);
|
||||
}
|
||||
session = RT_NULL;
|
||||
}
|
||||
}
|
||||
FINSH_FUNCTION_EXPORT(http_mp3, http mp3 decode test);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,345 @@
|
|||
#include <rthw.h>
|
||||
#include <rtthread.h>
|
||||
|
||||
#include "netbuffer.h"
|
||||
|
||||
#define MP3_DECODE_MP_CNT 2
|
||||
#define MP3_DECODE_MP_SZ 2560
|
||||
|
||||
static rt_uint8_t mempool[(MP3_DECODE_MP_SZ * 2 + 4)* 2]; // 5k x 2
|
||||
static struct rt_mempool _mp;
|
||||
static rt_bool_t is_inited = RT_FALSE;
|
||||
|
||||
rt_size_t sbuf_get_size()
|
||||
{
|
||||
return MP3_DECODE_MP_SZ * 2;
|
||||
}
|
||||
|
||||
void sbuf_init()
|
||||
{
|
||||
rt_mp_init(&_mp, "mp3", &mempool[0], sizeof(mempool), MP3_DECODE_MP_SZ * 2);
|
||||
}
|
||||
|
||||
void* sbuf_alloc()
|
||||
{
|
||||
if (is_inited == RT_FALSE)
|
||||
{
|
||||
sbuf_init();
|
||||
is_inited = RT_TRUE;
|
||||
}
|
||||
|
||||
return (rt_uint16_t*)rt_mp_alloc(&_mp, RT_WAITING_FOREVER);
|
||||
}
|
||||
|
||||
void sbuf_release(void* ptr)
|
||||
{
|
||||
rt_mp_free(ptr);
|
||||
}
|
||||
|
||||
#if STM32_EXT_SRAM
|
||||
/* netbuf worker stat */
|
||||
#define NETBUF_STAT_FREE 0
|
||||
#define NETBUF_STAT_BUFFERING 1
|
||||
#define NETBUF_STAT_BUSY 2
|
||||
#define NETBUF_STAT_STOPPING 3
|
||||
#define NETBUF_STAT_STOPPED 4
|
||||
|
||||
/* net buffer module */
|
||||
struct net_buffer
|
||||
{
|
||||
/* read index and save index in the buffer */
|
||||
rt_size_t read_index, save_index;
|
||||
|
||||
/* buffer data and size of buffer */
|
||||
rt_uint8_t* buffer_data;
|
||||
rt_size_t data_length;
|
||||
rt_size_t size;
|
||||
|
||||
/* buffer ready water mater */
|
||||
rt_uint32_t ready_wm, resume_wm;
|
||||
rt_bool_t is_wait_ready, is_wait_resume;
|
||||
rt_sem_t wait_ready, wait_resume;
|
||||
|
||||
/* netbuf worker stat */
|
||||
rt_uint8_t stat;
|
||||
};
|
||||
struct net_buffer_job
|
||||
{
|
||||
rt_size_t (*fetch)(rt_uint8_t* ptr, rt_size_t len, void* parameter);
|
||||
void (*close)(void* parameter);
|
||||
|
||||
void* parameter;
|
||||
};
|
||||
|
||||
static struct net_buffer _netbuf;
|
||||
static rt_mq_t _netbuf_mq = RT_NULL;
|
||||
|
||||
rt_size_t net_buf_read(rt_uint8_t* buffer, rt_size_t length)
|
||||
{
|
||||
rt_size_t data_length, read_index;
|
||||
rt_uint32_t level;
|
||||
|
||||
data_length = _netbuf.data_length;
|
||||
|
||||
if ((data_length == 0) &&
|
||||
(_netbuf.stat != NETBUF_STAT_STOPPED && _netbuf.stat != NETBUF_STAT_STOPPING))
|
||||
{
|
||||
/* set stat */
|
||||
_netbuf.stat = NETBUF_STAT_BUFFERING;
|
||||
rt_kprintf("stat -> buffering\n");
|
||||
|
||||
/* buffer is not ready. */
|
||||
_netbuf.is_wait_ready = RT_TRUE;
|
||||
rt_kprintf("wait ready, data len: %d, stat %d\n", data_length, _netbuf.stat);
|
||||
rt_sem_take(_netbuf.wait_ready, RT_WAITING_FOREVER);
|
||||
}
|
||||
|
||||
if ((data_length <= _netbuf.ready_wm) &&
|
||||
(_netbuf.stat == NETBUF_STAT_BUFFERING))
|
||||
{
|
||||
/* buffer is not ready. */
|
||||
_netbuf.is_wait_ready = RT_TRUE;
|
||||
rt_kprintf("wait ready, data len: %d, stat %d\n", data_length, _netbuf.stat);
|
||||
rt_sem_take(_netbuf.wait_ready, RT_WAITING_FOREVER);
|
||||
}
|
||||
|
||||
/* get read and save index */
|
||||
read_index = _netbuf.read_index;
|
||||
|
||||
/* re-get data legnth */
|
||||
data_length = _netbuf.data_length;
|
||||
|
||||
/* set the length */
|
||||
if (length > data_length) length = data_length;
|
||||
|
||||
// rt_kprintf("data len: %d, read idx %d\n", data_length, read_index);
|
||||
if (data_length > 0)
|
||||
{
|
||||
/* copy buffer */
|
||||
if (_netbuf.size - read_index > length)
|
||||
{
|
||||
rt_memcpy(buffer, &_netbuf.buffer_data[read_index],
|
||||
length);
|
||||
_netbuf.read_index += length;
|
||||
}
|
||||
else
|
||||
{
|
||||
rt_memcpy(buffer, &_netbuf.buffer_data[read_index],
|
||||
_netbuf.size - read_index);
|
||||
rt_memcpy(&buffer[_netbuf.size - read_index],
|
||||
&_netbuf.buffer_data[0],
|
||||
length - (_netbuf.size - read_index));
|
||||
_netbuf.read_index = length - (_netbuf.size - read_index);
|
||||
}
|
||||
|
||||
level = rt_hw_interrupt_disable();
|
||||
_netbuf.data_length -= length;
|
||||
data_length = _netbuf.data_length;
|
||||
|
||||
if ((_netbuf.is_wait_resume == RT_TRUE) && data_length < _netbuf.resume_wm)
|
||||
{
|
||||
_netbuf.is_wait_resume = RT_FALSE;
|
||||
rt_hw_interrupt_enable(level);
|
||||
|
||||
rt_kprintf("resume netbuf worker\n");
|
||||
rt_sem_release(_netbuf.wait_resume);
|
||||
}
|
||||
else
|
||||
{
|
||||
rt_hw_interrupt_enable(level);
|
||||
}
|
||||
}
|
||||
|
||||
return length;
|
||||
}
|
||||
|
||||
void net_buf_add_job(rt_size_t (*fetch)(rt_uint8_t* ptr, rt_size_t len, void* parameter),
|
||||
void (*close)(void* parameter),
|
||||
void* parameter)
|
||||
{
|
||||
struct net_buffer_job job;
|
||||
|
||||
job.fetch = fetch;
|
||||
job.close = close;
|
||||
job.parameter = parameter;
|
||||
|
||||
rt_mq_send(_netbuf_mq, (void*)&job, sizeof(struct net_buffer_job));
|
||||
}
|
||||
|
||||
void net_buf_stop_job()
|
||||
{
|
||||
rt_uint32_t level;
|
||||
|
||||
level = rt_hw_interrupt_disable();
|
||||
_netbuf.stat = NETBUF_STAT_STOPPING;
|
||||
rt_kprintf("stat -> stopping\n");
|
||||
rt_hw_interrupt_enable(level);
|
||||
}
|
||||
|
||||
static void net_buf_do_stop(struct net_buffer_job* job)
|
||||
{
|
||||
/* source closed */
|
||||
job->close(job->parameter);
|
||||
_netbuf.stat = NETBUF_STAT_STOPPED;
|
||||
rt_kprintf("stat -> stopped\n");
|
||||
if (_netbuf.is_wait_ready == RT_TRUE)
|
||||
{
|
||||
/* resume the wait for buffer task */
|
||||
_netbuf.is_wait_ready = RT_FALSE;
|
||||
rt_sem_release(_netbuf.wait_ready);
|
||||
}
|
||||
|
||||
rt_kprintf("job done, stat %d\n", _netbuf.stat);
|
||||
}
|
||||
|
||||
#define NETBUF_BLOCK_SIZE 1024
|
||||
static void net_buf_do_job(struct net_buffer_job* job)
|
||||
{
|
||||
rt_uint32_t level;
|
||||
rt_size_t read_length, data_length;
|
||||
rt_uint8_t *ptr;
|
||||
|
||||
ptr = rt_malloc(NETBUF_BLOCK_SIZE);
|
||||
|
||||
while (1)
|
||||
{
|
||||
if (_netbuf.stat == NETBUF_STAT_STOPPING)
|
||||
{
|
||||
net_buf_do_stop(job);
|
||||
break;
|
||||
}
|
||||
|
||||
/* fetch data buffer */
|
||||
read_length = job->fetch(ptr, NETBUF_BLOCK_SIZE, job->parameter);
|
||||
if (read_length <= 0)
|
||||
{
|
||||
net_buf_do_stop(job);
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* got data length in the buffer */
|
||||
data_length = _netbuf.data_length;
|
||||
|
||||
/* check avaible buffer to save */
|
||||
if ((_netbuf.size - data_length) < read_length)
|
||||
{
|
||||
rt_err_t result;
|
||||
|
||||
_netbuf.is_wait_resume = RT_TRUE;
|
||||
rt_kprintf("netbuf suspend, avaible room %d\n", data_length);
|
||||
result = rt_sem_take(_netbuf.wait_resume, RT_WAITING_FOREVER);
|
||||
if (result != RT_EOK)
|
||||
{
|
||||
/* stop net buffer worker */
|
||||
net_buf_do_stop(job);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* there are free space to fetch data */
|
||||
if ((_netbuf.size - _netbuf.save_index) < read_length)
|
||||
{
|
||||
rt_memcpy(&_netbuf.buffer_data[_netbuf.save_index],
|
||||
ptr, _netbuf.size - _netbuf.save_index);
|
||||
rt_memcpy(&_netbuf.buffer_data[0],
|
||||
ptr + (_netbuf.size - _netbuf.save_index),
|
||||
read_length - (_netbuf.size - _netbuf.save_index));
|
||||
|
||||
/* move save index */
|
||||
_netbuf.save_index = read_length - (_netbuf.size - _netbuf.save_index);
|
||||
}
|
||||
else
|
||||
{
|
||||
rt_memcpy(&_netbuf.buffer_data[_netbuf.save_index],
|
||||
ptr, read_length);
|
||||
|
||||
/* move save index */
|
||||
_netbuf.save_index += read_length;
|
||||
if (_netbuf.save_index >= _netbuf.size) _netbuf.save_index = 0;
|
||||
}
|
||||
|
||||
level = rt_hw_interrupt_disable();
|
||||
_netbuf.data_length += read_length;
|
||||
data_length = _netbuf.data_length;
|
||||
rt_hw_interrupt_enable(level);
|
||||
}
|
||||
|
||||
rt_kprintf("buffering ... %d %c\n", (data_length * 100) / _netbuf.size, '%');
|
||||
|
||||
if ((_netbuf.stat == NETBUF_STAT_BUFFERING) && (data_length >= _netbuf.ready_wm))
|
||||
{
|
||||
_netbuf.stat = NETBUF_STAT_BUSY;
|
||||
rt_kprintf("stat -> busy\n");
|
||||
|
||||
/* notify the thread for waitting buffer ready */
|
||||
rt_kprintf("resume wait buffer\n");
|
||||
if (_netbuf.is_wait_ready == RT_TRUE)
|
||||
{
|
||||
_netbuf.is_wait_ready = RT_FALSE;
|
||||
rt_sem_release(_netbuf.wait_ready);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* release fetch buffer */
|
||||
rt_free(ptr);
|
||||
}
|
||||
|
||||
static void net_buf_thread_entry(void* parameter)
|
||||
{
|
||||
rt_err_t result;
|
||||
struct net_buffer_job job;
|
||||
|
||||
while (1)
|
||||
{
|
||||
/* get a job */
|
||||
result = rt_mq_recv(_netbuf_mq, (void*)&job, sizeof(struct net_buffer_job), RT_WAITING_FOREVER);
|
||||
if (result == RT_EOK)
|
||||
{
|
||||
_netbuf.stat = NETBUF_STAT_BUFFERING;
|
||||
rt_kprintf("stat -> buffering\n");
|
||||
|
||||
/* perform the job */
|
||||
net_buf_do_job(&job);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void net_buf_init(rt_size_t size)
|
||||
{
|
||||
rt_thread_t tid;
|
||||
|
||||
/* init net buffer structure */
|
||||
_netbuf.read_index = _netbuf.save_index = 0;
|
||||
_netbuf.size = size; /* net buffer size */
|
||||
|
||||
/* allocate buffer */
|
||||
_netbuf.buffer_data = rt_malloc(_netbuf.size);
|
||||
_netbuf.data_length = 0;
|
||||
|
||||
/* set ready and resume water mater */
|
||||
_netbuf.ready_wm = _netbuf.size * 90/100;
|
||||
_netbuf.resume_wm = _netbuf.size * 80/100;
|
||||
|
||||
/* set init stat */
|
||||
_netbuf.stat = NETBUF_STAT_FREE;
|
||||
rt_kprintf("stat -> free\n");
|
||||
|
||||
_netbuf.wait_ready = rt_sem_create("nready", 0, RT_IPC_FLAG_FIFO);
|
||||
_netbuf.wait_resume = rt_sem_create("nresum", 0, RT_IPC_FLAG_FIFO);
|
||||
_netbuf.is_wait_ready = RT_FALSE;
|
||||
_netbuf.is_wait_resume = RT_FALSE;
|
||||
|
||||
/* crate message queue */
|
||||
_netbuf_mq = rt_mq_create("njob", sizeof(struct net_buffer_job),
|
||||
4, RT_IPC_FLAG_FIFO);
|
||||
|
||||
/* create net buffer thread */
|
||||
tid = rt_thread_create("nbuf",
|
||||
net_buf_thread_entry, RT_NULL,
|
||||
1024, 22, 5);
|
||||
if (tid != RT_NULL)
|
||||
rt_thread_startup(tid);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
#ifndef __NET_BUF_H__
|
||||
#define __NET_BUF_H__
|
||||
|
||||
#include <rtthread.h>
|
||||
#include "board.h"
|
||||
|
||||
/* SRAM buffer pool routine */
|
||||
rt_size_t sbuf_get_size(void);
|
||||
void* sbuf_alloc(void);
|
||||
void sbuf_release(void* ptr);
|
||||
|
||||
#if STM32_EXT_SRAM
|
||||
/* net buffer routine */
|
||||
void net_buf_init(rt_size_t size);
|
||||
|
||||
rt_size_t net_buf_read(rt_uint8_t* buffer, rt_size_t length);
|
||||
void net_buf_add_job(rt_size_t (*fetch)(rt_uint8_t* ptr, rt_size_t len, void* parameter),
|
||||
void (*close)(void* parameter),
|
||||
void* parameter);
|
||||
void net_buf_stop_job(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -21,151 +21,155 @@ GRPOPT 7,(Filesystem),0,0,0
|
|||
GRPOPT 8,(LwIP),0,0,0
|
||||
GRPOPT 9,(mp3),0,0,0
|
||||
|
||||
OPTFFF 1,1,1,0,0,0,0,0,<.\application.c><application.c>
|
||||
OPTFFF 1,2,1,0,0,0,0,0,<.\board.c><board.c>
|
||||
OPTFFF 1,3,1,0,0,0,0,0,<.\startup.c><startup.c>
|
||||
OPTFFF 1,4,1,0,0,0,0,0,<.\stm32f10x_it.c><stm32f10x_it.c>
|
||||
OPTFFF 1,5,5,0,0,0,0,0,<.\stm32f10x_conf.h><stm32f10x_conf.h>
|
||||
OPTFFF 1,6,5,0,0,0,0,0,<.\rtconfig.h><rtconfig.h>
|
||||
OPTFFF 1,7,1,0,0,0,0,0,<.\usart.c><usart.c>
|
||||
OPTFFF 1,8,1,0,0,0,0,0,<.\sdcard.c><sdcard.c>
|
||||
OPTFFF 1,9,1,0,0,0,0,0,<.\rtc.c><rtc.c>
|
||||
OPTFFF 1,10,1,0,0,0,0,0,<.\mp3.c><mp3.c>
|
||||
OPTFFF 1,1,5,469762048,0,0,0,0,<.\rtconfig.h><rtconfig.h>
|
||||
OPTFFF 1,2,5,0,0,0,0,0,<.\board.h><board.h>
|
||||
OPTFFF 1,3,5,0,0,0,0,0,<.\stm32f10x_conf.h><stm32f10x_conf.h>
|
||||
OPTFFF 1,4,1,0,0,0,0,0,<.\application.c><application.c>
|
||||
OPTFFF 1,5,1,0,0,0,0,0,<.\board.c><board.c>
|
||||
OPTFFF 1,6,1,0,0,0,0,0,<.\startup.c><startup.c>
|
||||
OPTFFF 1,7,1,0,0,0,0,0,<.\stm32f10x_it.c><stm32f10x_it.c>
|
||||
OPTFFF 1,8,1,0,0,0,0,0,<.\usart.c><usart.c>
|
||||
OPTFFF 1,9,1,33554432,0,0,0,0,<.\sdcard.c><sdcard.c>
|
||||
OPTFFF 1,10,1,0,0,0,0,0,<.\rtc.c><rtc.c>
|
||||
OPTFFF 1,11,1,0,0,0,0,0,<.\wm8753.c><wm8753.c>
|
||||
OPTFFF 1,12,1,0,0,0,0,0,<.\wav.c><wav.c>
|
||||
OPTFFF 1,13,1,0,0,0,0,0,<.\dm9000.c><dm9000.c>
|
||||
OPTFFF 1,14,1,0,0,0,0,0,<.\fsmc_nand.c><fsmc_nand.c>
|
||||
OPTFFF 1,15,1,0,0,0,0,0,<.\fsmc_sram.c><fsmc_sram.c>
|
||||
OPTFFF 1,16,1,0,0,0,0,0,<.\fmt0371\fmt0371.c><fmt0371.c>
|
||||
OPTFFF 1,17,1,150994944,0,0,0,0,<.\http.c><http.c>
|
||||
OPTFFF 1,18,1,0,0,0,0,0,<.\lcd.c><lcd.c>
|
||||
OPTFFF 2,19,1,0,0,0,0,0,<..\..\src\clock.c><clock.c>
|
||||
OPTFFF 2,20,1,0,0,0,0,0,<..\..\src\idle.c><idle.c>
|
||||
OPTFFF 2,21,1,0,0,0,0,0,<..\..\src\ipc.c><ipc.c>
|
||||
OPTFFF 2,22,1,0,0,0,0,0,<..\..\src\mempool.c><mempool.c>
|
||||
OPTFFF 2,23,1,0,0,0,0,0,<..\..\src\mem.c><mem.c>
|
||||
OPTFFF 2,24,1,0,0,0,0,0,<..\..\src\object.c><object.c>
|
||||
OPTFFF 2,25,1,0,0,0,0,0,<..\..\src\scheduler.c><scheduler.c>
|
||||
OPTFFF 2,26,1,0,0,0,0,0,<..\..\src\thread.c><thread.c>
|
||||
OPTFFF 2,27,1,0,0,0,0,0,<..\..\src\timer.c><timer.c>
|
||||
OPTFFF 2,28,1,0,0,0,0,0,<..\..\src\irq.c><irq.c>
|
||||
OPTFFF 2,29,1,0,0,0,0,0,<..\..\src\kservice.c><kservice.c>
|
||||
OPTFFF 2,30,1,0,0,0,0,0,<..\..\src\device.c><device.c>
|
||||
OPTFFF 2,31,1,0,0,0,0,0,<..\..\src\slab.c><slab.c>
|
||||
OPTFFF 3,32,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\stack.c><stack.c>
|
||||
OPTFFF 3,33,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\interrupt.c><interrupt.c>
|
||||
OPTFFF 3,34,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\cpu.c><cpu.c>
|
||||
OPTFFF 3,35,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\serial.c><serial.c>
|
||||
OPTFFF 3,36,2,0,0,0,0,0,<..\..\libcpu\arm\stm32\context_rvds.S><context_rvds.S>
|
||||
OPTFFF 3,37,2,0,0,0,0,0,<..\..\libcpu\arm\stm32\start_rvds.s><start_rvds.s>
|
||||
OPTFFF 3,38,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\fault.c><fault.c>
|
||||
OPTFFF 3,39,2,0,0,0,0,0,<..\..\libcpu\arm\stm32\fault_rvds.S><fault_rvds.S>
|
||||
OPTFFF 4,40,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c><misc.c>
|
||||
OPTFFF 4,41,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c><stm32f10x_adc.c>
|
||||
OPTFFF 4,42,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c><stm32f10x_bkp.c>
|
||||
OPTFFF 4,43,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c><stm32f10x_can.c>
|
||||
OPTFFF 4,44,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c><stm32f10x_crc.c>
|
||||
OPTFFF 4,45,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c><stm32f10x_dac.c>
|
||||
OPTFFF 4,46,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c><stm32f10x_dbgmcu.c>
|
||||
OPTFFF 4,47,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c><stm32f10x_dma.c>
|
||||
OPTFFF 4,48,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c><stm32f10x_exti.c>
|
||||
OPTFFF 4,49,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c><stm32f10x_flash.c>
|
||||
OPTFFF 4,50,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c><stm32f10x_fsmc.c>
|
||||
OPTFFF 4,51,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c><stm32f10x_gpio.c>
|
||||
OPTFFF 4,52,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c><stm32f10x_i2c.c>
|
||||
OPTFFF 4,53,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c><stm32f10x_iwdg.c>
|
||||
OPTFFF 4,54,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c><stm32f10x_pwr.c>
|
||||
OPTFFF 4,55,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c><stm32f10x_rcc.c>
|
||||
OPTFFF 4,56,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c><stm32f10x_rtc.c>
|
||||
OPTFFF 4,57,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c><stm32f10x_sdio.c>
|
||||
OPTFFF 4,58,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c><stm32f10x_spi.c>
|
||||
OPTFFF 4,59,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c><stm32f10x_tim.c>
|
||||
OPTFFF 4,60,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c><stm32f10x_usart.c>
|
||||
OPTFFF 4,61,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c><stm32f10x_wwdg.c>
|
||||
OPTFFF 5,62,1,0,0,0,0,0,<.\Libraries\CMSIS\Core\CM3\core_cm3.c><core_cm3.c>
|
||||
OPTFFF 5,63,1,0,0,0,0,0,<.\Libraries\CMSIS\Core\CM3\system_stm32f10x.c><system_stm32f10x.c>
|
||||
OPTFFF 6,64,1,0,0,0,0,0,<..\..\finsh\finsh_compiler.c><finsh_compiler.c>
|
||||
OPTFFF 6,65,1,0,0,0,0,0,<..\..\finsh\finsh_error.c><finsh_error.c>
|
||||
OPTFFF 6,66,1,0,0,0,0,0,<..\..\finsh\finsh_heap.c><finsh_heap.c>
|
||||
OPTFFF 6,67,1,0,0,0,0,0,<..\..\finsh\finsh_init.c><finsh_init.c>
|
||||
OPTFFF 6,68,1,0,0,0,0,0,<..\..\finsh\finsh_node.c><finsh_node.c>
|
||||
OPTFFF 6,69,1,0,0,0,0,0,<..\..\finsh\finsh_ops.c><finsh_ops.c>
|
||||
OPTFFF 6,70,1,0,0,0,0,0,<..\..\finsh\finsh_parser.c><finsh_parser.c>
|
||||
OPTFFF 6,71,1,0,0,0,0,0,<..\..\finsh\finsh_token.c><finsh_token.c>
|
||||
OPTFFF 6,72,1,0,0,0,0,0,<..\..\finsh\finsh_var.c><finsh_var.c>
|
||||
OPTFFF 6,73,1,0,0,0,0,0,<..\..\finsh\finsh_vm.c><finsh_vm.c>
|
||||
OPTFFF 6,74,1,0,0,0,0,0,<..\..\finsh\shell.c><shell.c>
|
||||
OPTFFF 6,75,1,0,0,0,0,0,<..\..\finsh\symbol.c><symbol.c>
|
||||
OPTFFF 6,76,1,0,0,0,0,0,<..\..\finsh\cmd.c><cmd.c>
|
||||
OPTFFF 7,77,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_init.c><dfs_init.c>
|
||||
OPTFFF 7,78,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_fs.c><dfs_fs.c>
|
||||
OPTFFF 7,79,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_raw.c><dfs_raw.c>
|
||||
OPTFFF 7,80,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_util.c><dfs_util.c>
|
||||
OPTFFF 7,81,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_cache.c><dfs_cache.c>
|
||||
OPTFFF 7,82,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_posix.c><dfs_posix.c>
|
||||
OPTFFF 7,83,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c><efs.c>
|
||||
OPTFFF 7,84,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c><extract.c>
|
||||
OPTFFF 7,85,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c><partition.c>
|
||||
OPTFFF 7,86,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c><plibc.c>
|
||||
OPTFFF 7,87,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\dir.c><dir.c>
|
||||
OPTFFF 7,88,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fat.c><fat.c>
|
||||
OPTFFF 7,89,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\file.c><file.c>
|
||||
OPTFFF 7,90,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c><fs.c>
|
||||
OPTFFF 7,91,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c><ls.c>
|
||||
OPTFFF 7,92,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c><time.c>
|
||||
OPTFFF 7,93,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c><ui.c>
|
||||
OPTFFF 8,94,1,0,0,0,0,0,<..\..\net\lwip\src\core\dhcp.c><dhcp.c>
|
||||
OPTFFF 8,95,1,0,0,0,0,0,<..\..\net\lwip\src\core\dns.c><dns.c>
|
||||
OPTFFF 8,96,1,0,0,0,0,0,<..\..\net\lwip\src\core\init.c><init.c>
|
||||
OPTFFF 8,97,1,0,0,0,0,0,<..\..\net\lwip\src\core\netif.c><netif.c>
|
||||
OPTFFF 8,98,1,0,0,0,0,0,<..\..\net\lwip\src\core\pbuf.c><pbuf.c>
|
||||
OPTFFF 8,99,1,0,0,0,0,0,<..\..\net\lwip\src\core\raw.c><raw.c>
|
||||
OPTFFF 8,100,1,0,0,0,0,0,<..\..\net\lwip\src\core\stats.c><stats.c>
|
||||
OPTFFF 8,101,1,0,0,0,0,0,<..\..\net\lwip\src\core\sys.c><sys.c>
|
||||
OPTFFF 8,102,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp.c><tcp.c>
|
||||
OPTFFF 8,103,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp_in.c><tcp_in.c>
|
||||
OPTFFF 8,104,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp_out.c><tcp_out.c>
|
||||
OPTFFF 8,105,1,0,0,0,0,0,<..\..\net\lwip\src\core\udp.c><udp.c>
|
||||
OPTFFF 8,106,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\autoip.c><autoip.c>
|
||||
OPTFFF 8,107,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\icmp.c><icmp.c>
|
||||
OPTFFF 8,108,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\igmp.c><igmp.c>
|
||||
OPTFFF 8,109,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\inet.c><inet.c>
|
||||
OPTFFF 8,110,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\inet_chksum.c><inet_chksum.c>
|
||||
OPTFFF 8,111,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip.c><ip.c>
|
||||
OPTFFF 8,112,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip_addr.c><ip_addr.c>
|
||||
OPTFFF 8,113,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip_frag.c><ip_frag.c>
|
||||
OPTFFF 8,114,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\msg_in.c><msg_in.c>
|
||||
OPTFFF 8,115,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\msg_out.c><msg_out.c>
|
||||
OPTFFF 8,116,1,0,0,0,0,0,<..\..\net\lwip\src\api\api_lib.c><api_lib.c>
|
||||
OPTFFF 8,117,1,0,0,0,0,0,<..\..\net\lwip\src\api\api_msg.c><api_msg.c>
|
||||
OPTFFF 8,118,1,0,0,0,0,0,<..\..\net\lwip\src\api\err.c><err.c>
|
||||
OPTFFF 8,119,1,0,0,0,0,0,<..\..\net\lwip\src\api\netbuf.c><netbuf.c>
|
||||
OPTFFF 8,120,1,0,0,0,0,0,<..\..\net\lwip\src\api\netdb.c><netdb.c>
|
||||
OPTFFF 8,121,1,0,0,0,0,0,<..\..\net\lwip\src\api\netifapi.c><netifapi.c>
|
||||
OPTFFF 8,122,1,0,0,0,0,0,<..\..\net\lwip\src\api\tcpip.c><tcpip.c>
|
||||
OPTFFF 8,123,1,0,0,0,0,0,<..\..\net\lwip\src\netif\etharp.c><etharp.c>
|
||||
OPTFFF 8,124,1,0,0,0,0,0,<..\..\net\lwip\src\netif\ethernetif.c><ethernetif.c>
|
||||
OPTFFF 8,125,1,0,0,0,0,0,<..\..\net\lwip\src\netif\loopif.c><loopif.c>
|
||||
OPTFFF 8,126,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch_init.c><sys_arch_init.c>
|
||||
OPTFFF 8,127,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch.c><sys_arch.c>
|
||||
OPTFFF 8,128,1,0,0,0,0,0,<..\..\net\lwip\src\api\sockets.c><sockets.c>
|
||||
OPTFFF 8,129,1,0,0,0,0,0,<..\..\net\lwip\src\core\memp_tiny.c><memp_tiny.c>
|
||||
OPTFFF 9,130,1,0,0,0,0,0,<.\mp3\mp3dec.c><mp3dec.c>
|
||||
OPTFFF 9,131,1,0,0,0,0,0,<.\mp3\mp3tabs.c><mp3tabs.c>
|
||||
OPTFFF 9,132,1,0,0,0,0,0,<.\mp3\real\bitstream.c><bitstream.c>
|
||||
OPTFFF 9,133,1,0,0,0,0,0,<.\mp3\real\buffers.c><buffers.c>
|
||||
OPTFFF 9,134,1,0,0,0,0,0,<.\mp3\real\dct32.c><dct32.c>
|
||||
OPTFFF 9,135,1,0,0,0,0,0,<.\mp3\real\dequant.c><dequant.c>
|
||||
OPTFFF 9,136,1,0,0,0,0,0,<.\mp3\real\dqchan.c><dqchan.c>
|
||||
OPTFFF 9,137,1,0,0,0,0,0,<.\mp3\real\huffman.c><huffman.c>
|
||||
OPTFFF 9,138,1,0,0,0,0,0,<.\mp3\real\hufftabs.c><hufftabs.c>
|
||||
OPTFFF 9,139,1,0,0,0,0,0,<.\mp3\real\imdct.c><imdct.c>
|
||||
OPTFFF 9,140,1,0,0,0,0,0,<.\mp3\real\scalfact.c><scalfact.c>
|
||||
OPTFFF 9,141,1,0,0,0,0,0,<.\mp3\real\stproc.c><stproc.c>
|
||||
OPTFFF 9,142,1,0,0,0,0,0,<.\mp3\real\subband.c><subband.c>
|
||||
OPTFFF 9,143,1,0,0,0,0,0,<.\mp3\real\trigtabs.c><trigtabs.c>
|
||||
OPTFFF 9,144,2,0,0,0,0,0,<.\mp3\real\arm\asmpoly_thumb2.s><asmpoly_thumb2.s>
|
||||
OPTFFF 9,145,2,0,0,0,0,0,<.\mp3\real\arm\asmmisc.s><asmmisc.s>
|
||||
OPTFFF 1,12,1,100663296,0,0,0,0,<.\dm9000.c><dm9000.c>
|
||||
OPTFFF 1,13,1,0,0,0,0,0,<.\fsmc_nand.c><fsmc_nand.c>
|
||||
OPTFFF 1,14,1,0,0,0,0,0,<.\fsmc_sram.c><fsmc_sram.c>
|
||||
OPTFFF 1,15,1,0,0,0,0,0,<.\fmt0371\fmt0371.c><fmt0371.c>
|
||||
OPTFFF 1,16,1,234881024,0,0,0,0,<.\http.c><http.c>
|
||||
OPTFFF 1,17,1,0,0,0,0,0,<.\lcd.c><lcd.c>
|
||||
OPTFFF 1,18,1,0,0,0,0,0,<..\..\net\apps\tcpecho.c><tcpecho.c>
|
||||
OPTFFF 1,19,1,268435456,0,0,0,0,<..\..\net\apps\udpecho.c><udpecho.c>
|
||||
OPTFFF 1,20,1,620756992,0,0,0,0,<.\mp3.c><mp3.c>
|
||||
OPTFFF 1,21,1,369098752,0,0,0,0,<.\wav.c><wav.c>
|
||||
OPTFFF 1,22,1,620756992,0,0,0,0,<.\netbuffer.c><netbuffer.c>
|
||||
OPTFFF 2,23,1,0,0,0,0,0,<..\..\src\clock.c><clock.c>
|
||||
OPTFFF 2,24,1,0,0,0,0,0,<..\..\src\idle.c><idle.c>
|
||||
OPTFFF 2,25,1,0,0,0,0,0,<..\..\src\ipc.c><ipc.c>
|
||||
OPTFFF 2,26,1,0,0,0,0,0,<..\..\src\mempool.c><mempool.c>
|
||||
OPTFFF 2,27,1,0,0,0,0,0,<..\..\src\mem.c><mem.c>
|
||||
OPTFFF 2,28,1,0,0,0,0,0,<..\..\src\object.c><object.c>
|
||||
OPTFFF 2,29,1,0,0,0,0,0,<..\..\src\scheduler.c><scheduler.c>
|
||||
OPTFFF 2,30,1,0,0,0,0,0,<..\..\src\thread.c><thread.c>
|
||||
OPTFFF 2,31,1,0,0,0,0,0,<..\..\src\timer.c><timer.c>
|
||||
OPTFFF 2,32,1,0,0,0,0,0,<..\..\src\irq.c><irq.c>
|
||||
OPTFFF 2,33,1,0,0,0,0,0,<..\..\src\kservice.c><kservice.c>
|
||||
OPTFFF 2,34,1,0,0,0,0,0,<..\..\src\device.c><device.c>
|
||||
OPTFFF 2,35,1,0,0,0,0,0,<..\..\src\slab.c><slab.c>
|
||||
OPTFFF 3,36,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\stack.c><stack.c>
|
||||
OPTFFF 3,37,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\interrupt.c><interrupt.c>
|
||||
OPTFFF 3,38,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\cpu.c><cpu.c>
|
||||
OPTFFF 3,39,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\serial.c><serial.c>
|
||||
OPTFFF 3,40,2,0,0,0,0,0,<..\..\libcpu\arm\stm32\context_rvds.S><context_rvds.S>
|
||||
OPTFFF 3,41,2,335544320,0,0,0,0,<..\..\libcpu\arm\stm32\start_rvds.s><start_rvds.s>
|
||||
OPTFFF 3,42,1,0,0,0,0,0,<..\..\libcpu\arm\stm32\fault.c><fault.c>
|
||||
OPTFFF 3,43,2,0,0,0,0,0,<..\..\libcpu\arm\stm32\fault_rvds.S><fault_rvds.S>
|
||||
OPTFFF 4,44,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c><misc.c>
|
||||
OPTFFF 4,45,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c><stm32f10x_adc.c>
|
||||
OPTFFF 4,46,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c><stm32f10x_bkp.c>
|
||||
OPTFFF 4,47,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c><stm32f10x_can.c>
|
||||
OPTFFF 4,48,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c><stm32f10x_crc.c>
|
||||
OPTFFF 4,49,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c><stm32f10x_dac.c>
|
||||
OPTFFF 4,50,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c><stm32f10x_dbgmcu.c>
|
||||
OPTFFF 4,51,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c><stm32f10x_dma.c>
|
||||
OPTFFF 4,52,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c><stm32f10x_exti.c>
|
||||
OPTFFF 4,53,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c><stm32f10x_flash.c>
|
||||
OPTFFF 4,54,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c><stm32f10x_fsmc.c>
|
||||
OPTFFF 4,55,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c><stm32f10x_gpio.c>
|
||||
OPTFFF 4,56,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c><stm32f10x_i2c.c>
|
||||
OPTFFF 4,57,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c><stm32f10x_iwdg.c>
|
||||
OPTFFF 4,58,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c><stm32f10x_pwr.c>
|
||||
OPTFFF 4,59,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c><stm32f10x_rcc.c>
|
||||
OPTFFF 4,60,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c><stm32f10x_rtc.c>
|
||||
OPTFFF 4,61,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c><stm32f10x_sdio.c>
|
||||
OPTFFF 4,62,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c><stm32f10x_spi.c>
|
||||
OPTFFF 4,63,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c><stm32f10x_tim.c>
|
||||
OPTFFF 4,64,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c><stm32f10x_usart.c>
|
||||
OPTFFF 4,65,1,0,0,0,0,0,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c><stm32f10x_wwdg.c>
|
||||
OPTFFF 5,66,1,0,0,0,0,0,<.\Libraries\CMSIS\Core\CM3\core_cm3.c><core_cm3.c>
|
||||
OPTFFF 5,67,1,0,0,0,0,0,<.\Libraries\CMSIS\Core\CM3\system_stm32f10x.c><system_stm32f10x.c>
|
||||
OPTFFF 6,68,1,0,0,0,0,0,<..\..\finsh\finsh_compiler.c><finsh_compiler.c>
|
||||
OPTFFF 6,69,1,0,0,0,0,0,<..\..\finsh\finsh_error.c><finsh_error.c>
|
||||
OPTFFF 6,70,1,0,0,0,0,0,<..\..\finsh\finsh_heap.c><finsh_heap.c>
|
||||
OPTFFF 6,71,1,0,0,0,0,0,<..\..\finsh\finsh_init.c><finsh_init.c>
|
||||
OPTFFF 6,72,1,0,0,0,0,0,<..\..\finsh\finsh_node.c><finsh_node.c>
|
||||
OPTFFF 6,73,1,0,0,0,0,0,<..\..\finsh\finsh_ops.c><finsh_ops.c>
|
||||
OPTFFF 6,74,1,0,0,0,0,0,<..\..\finsh\finsh_parser.c><finsh_parser.c>
|
||||
OPTFFF 6,75,1,0,0,0,0,0,<..\..\finsh\finsh_token.c><finsh_token.c>
|
||||
OPTFFF 6,76,1,0,0,0,0,0,<..\..\finsh\finsh_var.c><finsh_var.c>
|
||||
OPTFFF 6,77,1,0,0,0,0,0,<..\..\finsh\finsh_vm.c><finsh_vm.c>
|
||||
OPTFFF 6,78,1,0,0,0,0,0,<..\..\finsh\shell.c><shell.c>
|
||||
OPTFFF 6,79,1,0,0,0,0,0,<..\..\finsh\symbol.c><symbol.c>
|
||||
OPTFFF 6,80,1,0,0,0,0,0,<..\..\finsh\cmd.c><cmd.c>
|
||||
OPTFFF 7,81,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_init.c><dfs_init.c>
|
||||
OPTFFF 7,82,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_fs.c><dfs_fs.c>
|
||||
OPTFFF 7,83,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_raw.c><dfs_raw.c>
|
||||
OPTFFF 7,84,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_util.c><dfs_util.c>
|
||||
OPTFFF 7,85,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_cache.c><dfs_cache.c>
|
||||
OPTFFF 7,86,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_posix.c><dfs_posix.c>
|
||||
OPTFFF 7,87,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c><efs.c>
|
||||
OPTFFF 7,88,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c><extract.c>
|
||||
OPTFFF 7,89,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c><partition.c>
|
||||
OPTFFF 7,90,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c><plibc.c>
|
||||
OPTFFF 7,91,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\dir.c><dir.c>
|
||||
OPTFFF 7,92,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fat.c><fat.c>
|
||||
OPTFFF 7,93,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\file.c><file.c>
|
||||
OPTFFF 7,94,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c><fs.c>
|
||||
OPTFFF 7,95,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c><ls.c>
|
||||
OPTFFF 7,96,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c><time.c>
|
||||
OPTFFF 7,97,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c><ui.c>
|
||||
OPTFFF 8,98,1,0,0,0,0,0,<..\..\net\lwip\src\core\dhcp.c><dhcp.c>
|
||||
OPTFFF 8,99,1,0,0,0,0,0,<..\..\net\lwip\src\core\dns.c><dns.c>
|
||||
OPTFFF 8,100,1,0,0,0,0,0,<..\..\net\lwip\src\core\init.c><init.c>
|
||||
OPTFFF 8,101,1,0,0,0,0,0,<..\..\net\lwip\src\core\netif.c><netif.c>
|
||||
OPTFFF 8,102,1,0,0,0,0,0,<..\..\net\lwip\src\core\pbuf.c><pbuf.c>
|
||||
OPTFFF 8,103,1,0,0,0,0,0,<..\..\net\lwip\src\core\raw.c><raw.c>
|
||||
OPTFFF 8,104,1,0,0,0,0,0,<..\..\net\lwip\src\core\stats.c><stats.c>
|
||||
OPTFFF 8,105,1,0,0,0,0,0,<..\..\net\lwip\src\core\sys.c><sys.c>
|
||||
OPTFFF 8,106,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp.c><tcp.c>
|
||||
OPTFFF 8,107,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp_in.c><tcp_in.c>
|
||||
OPTFFF 8,108,1,0,0,0,0,0,<..\..\net\lwip\src\core\tcp_out.c><tcp_out.c>
|
||||
OPTFFF 8,109,1,0,0,0,0,0,<..\..\net\lwip\src\core\udp.c><udp.c>
|
||||
OPTFFF 8,110,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\autoip.c><autoip.c>
|
||||
OPTFFF 8,111,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\icmp.c><icmp.c>
|
||||
OPTFFF 8,112,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\igmp.c><igmp.c>
|
||||
OPTFFF 8,113,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\inet.c><inet.c>
|
||||
OPTFFF 8,114,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\inet_chksum.c><inet_chksum.c>
|
||||
OPTFFF 8,115,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip.c><ip.c>
|
||||
OPTFFF 8,116,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip_addr.c><ip_addr.c>
|
||||
OPTFFF 8,117,1,0,0,0,0,0,<..\..\net\lwip\src\core\ipv4\ip_frag.c><ip_frag.c>
|
||||
OPTFFF 8,118,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\msg_in.c><msg_in.c>
|
||||
OPTFFF 8,119,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\msg_out.c><msg_out.c>
|
||||
OPTFFF 8,120,1,0,0,0,0,0,<..\..\net\lwip\src\api\api_lib.c><api_lib.c>
|
||||
OPTFFF 8,121,1,0,0,0,0,0,<..\..\net\lwip\src\api\api_msg.c><api_msg.c>
|
||||
OPTFFF 8,122,1,0,0,0,0,0,<..\..\net\lwip\src\api\err.c><err.c>
|
||||
OPTFFF 8,123,1,0,0,0,0,0,<..\..\net\lwip\src\api\netbuf.c><netbuf.c>
|
||||
OPTFFF 8,124,1,0,0,0,0,0,<..\..\net\lwip\src\api\netdb.c><netdb.c>
|
||||
OPTFFF 8,125,1,0,0,0,0,0,<..\..\net\lwip\src\api\netifapi.c><netifapi.c>
|
||||
OPTFFF 8,126,1,0,0,0,0,0,<..\..\net\lwip\src\api\tcpip.c><tcpip.c>
|
||||
OPTFFF 8,127,1,0,0,0,0,0,<..\..\net\lwip\src\netif\etharp.c><etharp.c>
|
||||
OPTFFF 8,128,1,150994944,0,0,0,0,<..\..\net\lwip\src\netif\ethernetif.c><ethernetif.c>
|
||||
OPTFFF 8,129,1,0,0,0,0,0,<..\..\net\lwip\src\netif\loopif.c><loopif.c>
|
||||
OPTFFF 8,130,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch_init.c><sys_arch_init.c>
|
||||
OPTFFF 8,131,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch.c><sys_arch.c>
|
||||
OPTFFF 8,132,1,0,0,0,0,0,<..\..\net\lwip\src\api\sockets.c><sockets.c>
|
||||
OPTFFF 8,133,1,0,0,0,0,0,<..\..\net\lwip\src\core\memp_tiny.c><memp_tiny.c>
|
||||
OPTFFF 9,134,1,268435456,0,0,0,0,<.\mp3\mp3dec.c><mp3dec.c>
|
||||
OPTFFF 9,135,1,0,0,0,0,0,<.\mp3\mp3tabs.c><mp3tabs.c>
|
||||
OPTFFF 9,136,1,0,0,0,0,0,<.\mp3\real\bitstream.c><bitstream.c>
|
||||
OPTFFF 9,137,1,83886080,0,0,0,0,<.\mp3\real\buffers.c><buffers.c>
|
||||
OPTFFF 9,138,1,0,0,0,0,0,<.\mp3\real\dct32.c><dct32.c>
|
||||
OPTFFF 9,139,1,0,0,0,0,0,<.\mp3\real\dequant.c><dequant.c>
|
||||
OPTFFF 9,140,1,0,0,0,0,0,<.\mp3\real\dqchan.c><dqchan.c>
|
||||
OPTFFF 9,141,1,0,0,0,0,0,<.\mp3\real\huffman.c><huffman.c>
|
||||
OPTFFF 9,142,1,0,0,0,0,0,<.\mp3\real\hufftabs.c><hufftabs.c>
|
||||
OPTFFF 9,143,1,0,0,0,0,0,<.\mp3\real\imdct.c><imdct.c>
|
||||
OPTFFF 9,144,1,0,0,0,0,0,<.\mp3\real\scalfact.c><scalfact.c>
|
||||
OPTFFF 9,145,1,0,0,0,0,0,<.\mp3\real\stproc.c><stproc.c>
|
||||
OPTFFF 9,146,1,0,0,0,0,0,<.\mp3\real\subband.c><subband.c>
|
||||
OPTFFF 9,147,1,0,0,0,0,0,<.\mp3\real\trigtabs.c><trigtabs.c>
|
||||
OPTFFF 9,148,2,0,0,0,0,0,<.\mp3\real\arm\asmpoly_thumb2.s><asmpoly_thumb2.s>
|
||||
OPTFFF 9,149,2,0,0,0,0,0,<.\mp3\real\arm\asmmisc.s><asmmisc.s>
|
||||
|
||||
|
||||
TARGOPT 1, (RT-Thread STM32 Radio)
|
||||
|
|
@ -183,8 +187,11 @@ TARGOPT 1, (RT-Thread STM32 Radio)
|
|||
OPTKEY 0,(DLGTARM)((1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(124=-1,-1,-1,-1,0)(125=-1,-1,-1,-1,0)(126=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0))
|
||||
OPTKEY 0,(ARMDBGFLAGS)()
|
||||
OPTKEY 0,(DLGUARM)((105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0))
|
||||
OPTKEY 0,(JL2CM3)(-U11111117 -O718 -S8 -C0 -JU1 -JI127.0.0.1 -JP0 -N00("ARM CoreSight SW-DP") -D00(00000000) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO27 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000)
|
||||
OPTDF 0x80
|
||||
OPTKEY 0,(JL2CM3)(-U20090110 -O206 -S0 -C0 -JU1 -JI127.0.0.1 -JP0 -N00("ARM CoreSight SW-DP") -D00(00000000) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000)
|
||||
OPTWA 0,1,(addr)
|
||||
OPTMM 1,2,(mp3_fd_buffer)
|
||||
OPTMM 2,8,(mimeBuffer)
|
||||
OPTDF 0x86
|
||||
OPTLE <>
|
||||
OPTLC <>
|
||||
EndOpt
|
||||
|
|
|
|||
|
|
@ -13,24 +13,28 @@ Group (Filesystem)
|
|||
Group (LwIP)
|
||||
Group (mp3)
|
||||
|
||||
File 1,5,<.\rtconfig.h><rtconfig.h>
|
||||
File 1,5,<.\board.h><board.h>
|
||||
File 1,5,<.\stm32f10x_conf.h><stm32f10x_conf.h>
|
||||
File 1,1,<.\application.c><application.c>
|
||||
File 1,1,<.\board.c><board.c>
|
||||
File 1,1,<.\startup.c><startup.c>
|
||||
File 1,1,<.\stm32f10x_it.c><stm32f10x_it.c>
|
||||
File 1,5,<.\stm32f10x_conf.h><stm32f10x_conf.h>
|
||||
File 1,5,<.\rtconfig.h><rtconfig.h>
|
||||
File 1,1,<.\usart.c><usart.c>
|
||||
File 1,1,<.\sdcard.c><sdcard.c>
|
||||
File 1,1,<.\rtc.c><rtc.c>
|
||||
File 1,1,<.\mp3.c><mp3.c>
|
||||
File 1,1,<.\wm8753.c><wm8753.c>
|
||||
File 1,1,<.\wav.c><wav.c>
|
||||
File 1,1,<.\dm9000.c><dm9000.c>
|
||||
File 1,1,<.\fsmc_nand.c><fsmc_nand.c>
|
||||
File 1,1,<.\fsmc_sram.c><fsmc_sram.c>
|
||||
File 1,1,<.\fmt0371\fmt0371.c><fmt0371.c>
|
||||
File 1,1,<.\http.c><http.c>
|
||||
File 1,1,<.\lcd.c><lcd.c>
|
||||
File 1,1,<..\..\net\apps\tcpecho.c><tcpecho.c>
|
||||
File 1,1,<..\..\net\apps\udpecho.c><udpecho.c>
|
||||
File 1,1,<.\mp3.c><mp3.c>
|
||||
File 1,1,<.\wav.c><wav.c>
|
||||
File 1,1,<.\netbuffer.c><netbuffer.c>
|
||||
File 2,1,<..\..\src\clock.c><clock.c>
|
||||
File 2,1,<..\..\src\idle.c><idle.c>
|
||||
File 2,1,<..\..\src\ipc.c><ipc.c>
|
||||
|
|
@ -260,7 +264,7 @@ Options 1,9,0 // Group 'mp3'
|
|||
StopCode=11
|
||||
CustArgs ()
|
||||
LibMods ()
|
||||
ADSCCFLG { 6,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSCCFLG { 18,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSCMISC ()
|
||||
ADSCDEFN ()
|
||||
ADSCUDEF ()
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
#define SD_HIGH_CAPACITY ((u32)0x40000000)
|
||||
#define SD_STD_CAPACITY ((u32)0x00000000)
|
||||
#define SD_CHECK_PATTERN ((u32)0x000001AA)
|
||||
#define SD_VOLTAGE_WINDOW_MMC ((u32)0x80FF8000)
|
||||
|
||||
#define SD_MAX_VOLT_TRIAL ((u32)0x0000FFFF)
|
||||
#define SD_ALLZERO ((u32)0x00000000)
|
||||
|
|
@ -310,8 +311,40 @@ SD_Error SD_PowerON(void)
|
|||
}
|
||||
|
||||
}/* else MMC Card */
|
||||
else
|
||||
{
|
||||
CardType = SDIO_MULTIMEDIA_CARD;
|
||||
|
||||
/* Send CMD1 SEND_OP_COND with Argument 0x80FF8000 */
|
||||
while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
|
||||
{
|
||||
|
||||
/* SEND CMD55 APP_CMD with RCA as 0 */
|
||||
SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_MMC;
|
||||
SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_OP_COND;
|
||||
SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
|
||||
SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
|
||||
SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
|
||||
SDIO_SendCommand(&SDIO_CmdInitStructure);
|
||||
|
||||
errorstatus = CmdResp3Error();
|
||||
if (errorstatus != SD_OK)
|
||||
{
|
||||
return(errorstatus);
|
||||
}
|
||||
|
||||
response = SDIO_GetResponse(SDIO_RESP1);
|
||||
validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
|
||||
count++;
|
||||
}
|
||||
if (count >= SD_MAX_VOLT_TRIAL)
|
||||
{
|
||||
errorstatus = SD_INVALID_VOLTRANGE;
|
||||
return(errorstatus);
|
||||
}
|
||||
}
|
||||
|
||||
return(SD_OK);
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
|
|
@ -343,6 +376,7 @@ SD_Error SD_InitializeCards(void)
|
|||
{
|
||||
SD_Error errorstatus = SD_OK;
|
||||
u16 rca = 0x01;
|
||||
// u32 count = 0;
|
||||
|
||||
if (SDIO_GetPowerState() == SDIO_PowerState_OFF)
|
||||
{
|
||||
|
|
@ -391,6 +425,24 @@ SD_Error SD_InitializeCards(void)
|
|||
return(errorstatus);
|
||||
}
|
||||
}
|
||||
if (SDIO_MULTIMEDIA_CARD == CardType)
|
||||
{
|
||||
/* Send CMD3 SET_REL_ADDR with argument 0 */
|
||||
/* SD Card publishes its RCA. */
|
||||
SDIO_CmdInitStructure.SDIO_Argument = (u32)(rca << 16);
|
||||
SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_REL_ADDR;
|
||||
SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
|
||||
SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
|
||||
SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
|
||||
SDIO_SendCommand(&SDIO_CmdInitStructure);
|
||||
|
||||
errorstatus = CmdResp2Error();
|
||||
|
||||
if (SD_OK != errorstatus)
|
||||
{
|
||||
return(errorstatus);
|
||||
}
|
||||
}
|
||||
|
||||
if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,23 +1,12 @@
|
|||
#include <finsh.h>
|
||||
#include <dfs_posix.h>
|
||||
#include "netbuffer.h"
|
||||
#include "stm32f10x.h"
|
||||
|
||||
rt_uint32_t wav_length;
|
||||
rt_uint8_t* wav_buffer;
|
||||
|
||||
#define WAV_MP_NUM 2
|
||||
#define WAV_MP_BUFSZ (1024 * 1)
|
||||
#define STATIC_MEMPOOL
|
||||
#ifdef STATIC_MEMPOOL
|
||||
static rt_uint8_t mempool[(WAV_MP_BUFSZ + 4)* WAV_MP_NUM]; // 5k x 2
|
||||
static struct rt_mempool _mp;
|
||||
#endif
|
||||
static rt_mp_t mp;
|
||||
|
||||
static rt_err_t wav_tx_done(rt_device_t dev, void *buffer)
|
||||
{
|
||||
/* release memory block to memory pool */
|
||||
rt_mp_free(buffer);
|
||||
/* release memory block */
|
||||
sbuf_release(buffer);
|
||||
|
||||
return RT_EOK;
|
||||
}
|
||||
|
|
@ -25,13 +14,10 @@ static rt_err_t wav_tx_done(rt_device_t dev, void *buffer)
|
|||
void wav(char* filename)
|
||||
{
|
||||
int fd;
|
||||
rt_size_t block_size;
|
||||
|
||||
#ifdef STATIC_MEMPOOL
|
||||
rt_mp_init(&_mp, "wav", &mempool[0], sizeof(mempool), WAV_MP_BUFSZ);
|
||||
mp = &_mp;
|
||||
#else
|
||||
mp = rt_mp_create("wav", WAV_MP_NUM, WAV_MP_BUFSZ);
|
||||
#endif
|
||||
block_size = sbuf_get_size();
|
||||
block_size = (block_size / 512) * 512;
|
||||
|
||||
fd = open(filename, O_RDONLY, 0);
|
||||
if (fd >= 0)
|
||||
|
|
@ -47,21 +33,15 @@ void wav(char* filename)
|
|||
|
||||
do
|
||||
{
|
||||
buf = rt_mp_alloc(mp, RT_WAITING_FOREVER);
|
||||
len = read(fd, (char*)buf, WAV_MP_BUFSZ);
|
||||
buf = sbuf_alloc();
|
||||
len = read(fd, (char*)buf, block_size);
|
||||
if (len > 0) rt_device_write(device, 0, buf, len);
|
||||
} while (len != 0);
|
||||
|
||||
/* close device and file */
|
||||
rt_device_close(device);
|
||||
close(fd);
|
||||
|
||||
/* delete memory pool */
|
||||
#ifdef STATIC_MEMPOOL
|
||||
rt_mp_detach(mp);
|
||||
#else
|
||||
rt_mp_delete(mp);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
FINSH_FUNCTION_EXPORT(wav, wav test)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue