andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1197 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-09-30 19:41:57 +00:00
parent c8d55aeb71
commit a1892b59a9
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/ARM7-AT91SAM7X-WEB-GCC/main.c
View File

@ -21,7 +21,6 @@
#include <pal.h>
#include <test.h>
#include <serial.h>
#include <sam7x_emac.h>
#include "board.h"

24
demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c
View File

@ -33,8 +33,7 @@
#define IPADDR2 1
#define IPADDR3 20
#define SEND_RETRY_MAX 10
#define SEND_RETRY_INTERVAL 2
#define SEND_TIMEOUT 50
static const struct uip_eth_addr macaddr = {
{0xC2, 0xAF, 0x51, 0x03, 0xCF, 0x46}
@ -46,22 +45,17 @@ static const struct uip_eth_addr macaddr = {
* uIP send function wrapping the EMAC functions.
*/
static void network_device_send(void) {
int i;
MACTransmitDescriptor td;
for (i = 0; i < SEND_RETRY_MAX; i++) {
if (macWaitTransmitDescriptor(&ETH1, &td, TIME_IMMEDIATE) == RDY_OK) {
if(uip_len <= UIP_LLH_LEN + UIP_TCPIP_HLEN)
macWriteTransmitDescriptor(&td, uip_buf, uip_len);
else {
macWriteTransmitDescriptor(&td, uip_buf, UIP_LLH_LEN + UIP_TCPIP_HLEN);
macWriteTransmitDescriptor(&td, uip_appdata,
uip_len - (UIP_LLH_LEN + UIP_TCPIP_HLEN));
}
macReleaseTransmitDescriptor(&td);
return;
if (macWaitTransmitDescriptor(&ETH1, &td, MS2ST(SEND_TIMEOUT)) == RDY_OK) {
if(uip_len <= UIP_LLH_LEN + UIP_TCPIP_HLEN)
macWriteTransmitDescriptor(&td, uip_buf, uip_len);
else {
macWriteTransmitDescriptor(&td, uip_buf, UIP_LLH_LEN + UIP_TCPIP_HLEN);
macWriteTransmitDescriptor(&td, uip_appdata,
uip_len - (UIP_LLH_LEN + UIP_TCPIP_HLEN));
}
chThdSleep(SEND_RETRY_INTERVAL);
macReleaseTransmitDescriptor(&td);
}
/* Dropped... */
}