diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-05-26 08:25:27 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-05-26 08:25:27 +0000 |
| commit | d1cad4edb86a9a4bd70bb9eb232c21f9540bbb0d (patch) | |
| tree | 593182dbbe2a1d616ef103a694e8f118185243fb | |
| parent | 49254d5eb3163415e19b6ef85b1be1205a9dd465 (diff) | |
| download | ChibiOS-d1cad4edb86a9a4bd70bb9eb232c21f9540bbb0d.tar.gz ChibiOS-d1cad4edb86a9a4bd70bb9eb232c21f9540bbb0d.tar.bz2 ChibiOS-d1cad4edb86a9a4bd70bb9eb232c21f9540bbb0d.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@306 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARM7-AT91SAM7X-WEB-GCC/main.c | 4 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-WEB-GCC/web/uip-conf.h | 7 | ||||
| -rw-r--r-- | ports/ARM7-AT91SAM7X/sam7x_emac.c | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/main.c b/demos/ARM7-AT91SAM7X-WEB-GCC/main.c index e53bd5b7c..296ec7f67 100644 --- a/demos/ARM7-AT91SAM7X-WEB-GCC/main.c +++ b/demos/ARM7-AT91SAM7X-WEB-GCC/main.c @@ -26,8 +26,8 @@ #include "web/webthread.h"
-static WorkingArea(waWebThread, 256);
-static WorkingArea(waThread1, 64);
+static WorkingArea(waWebThread, 512);
+static WorkingArea(waThread1, 128);
static msg_t Thread1(void *arg) {
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/web/uip-conf.h b/demos/ARM7-AT91SAM7X-WEB-GCC/web/uip-conf.h index 289d4a150..273b7cb71 100644 --- a/demos/ARM7-AT91SAM7X-WEB-GCC/web/uip-conf.h +++ b/demos/ARM7-AT91SAM7X-WEB-GCC/web/uip-conf.h @@ -86,6 +86,13 @@ typedef uint16_t u16_t; typedef unsigned short uip_stats_t;
/**
+ * Modifier for packed structures.
+ *
+ * \hideinitializer
+ */
+#define UIP_CONF_PACKED __attribute__((packed))
+
+/**
* Maximum number of TCP connections.
*
* \hideinitializer
diff --git a/ports/ARM7-AT91SAM7X/sam7x_emac.c b/ports/ARM7-AT91SAM7X/sam7x_emac.c index e55c6fcd6..a1d1e1d0f 100644 --- a/ports/ARM7-AT91SAM7X/sam7x_emac.c +++ b/ports/ARM7-AT91SAM7X/sam7x_emac.c @@ -199,7 +199,8 @@ void InitEMAC(int prio) { AT91C_BASE_EMAC->EMAC_RSR = AT91C_EMAC_OVR |
AT91C_EMAC_REC |
AT91C_EMAC_BNA; // Clears RSR
- AT91C_BASE_EMAC->EMAC_NCFGR |= AT91C_EMAC_NBC |
+ AT91C_BASE_EMAC->EMAC_NCFGR |= AT91C_EMAC_CAF |
+ AT91C_EMAC_NBC |
AT91C_EMAC_DRFCS; // Initial NCFGR settings
AT91C_BASE_EMAC->EMAC_NCR |= AT91C_EMAC_TE |
AT91C_EMAC_RE |
|