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

5 files changed, 420 insertions, 0 deletions

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/cc-arch.h b/demos/ARM7-AT91SAM7X-UIP-GCC/web/cc-arch.h
new file mode 100644
index 000000000..744cf56ef
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/cc-arch.h
@@ -0,0 +1,9 @@
+#ifndef __CC_ARCH_H__

+#define __CC_ARCH_H__

+

+#define PACK_STRUCT_FIELD(x) x __attribute__((packed))

+#define PACK_STRUCT_STRUCT __attribute__((packed))

+#define PACK_STRUCT_BEGIN

+#define PACK_STRUCT_END

+

+#endif /* __CC_ARCH_H__ */

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/clock-arch.h b/demos/ARM7-AT91SAM7X-UIP-GCC/web/clock-arch.h
new file mode 100644
index 000000000..e205f9c8d
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/clock-arch.h
@@ -0,0 +1,42 @@
+/*

+ * Copyright (c) 2006, Swedish Institute of Computer Science.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ * 3. Neither the name of the Institute nor the names of its contributors

+ *    may be used to endorse or promote products derived from this software

+ *    without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ * This file is part of the uIP TCP/IP stack

+ *

+ * $Id: clock-arch.h,v 1.2 2006/06/12 08:00:31 adam Exp $

+ */

+

+#ifndef __CLOCK_ARCH_H__

+#define __CLOCK_ARCH_H__

+

+#include <ch.h>

+

+typedef systime_t clock_time_t;

+#define CLOCK_CONF_SECOND CH_FREQUENCY

+

+#endif /* __CLOCK_ARCH_H__ */

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/uip-conf.h b/demos/ARM7-AT91SAM7X-UIP-GCC/web/uip-conf.h
new file mode 100644
index 000000000..b6a17c970
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/uip-conf.h
@@ -0,0 +1,159 @@
+/**

+ * \addtogroup uipopt

+ * @{

+ */

+

+/**

+ * \name Project-specific configuration options

+ * @{

+ *

+ * uIP has a number of configuration options that can be overridden

+ * for each project. These are kept in a project-specific uip-conf.h

+ * file and all configuration names have the prefix UIP_CONF.

+ */

+

+/*

+ * Copyright (c) 2006, Swedish Institute of Computer Science.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ * 3. Neither the name of the Institute nor the names of its contributors

+ *    may be used to endorse or promote products derived from this software

+ *    without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ * This file is part of the uIP TCP/IP stack

+ *

+ * $Id: uip-conf.h,v 1.6 2006/06/12 08:00:31 adam Exp $

+ */

+

+/**

+ * \file

+ *         An example uIP configuration file

+ * \author

+ *         Adam Dunkels <adam@sics.se>

+ */

+

+#ifndef __UIP_CONF_H__

+#define __UIP_CONF_H__

+

+#include <stdint.h>

+

+#include <cc-arch.h> /* patched */

+

+/**

+ * 8 bit datatype

+ *

+ * This typedef defines the 8-bit type used throughout uIP.

+ *

+ * \hideinitializer

+ */

+typedef uint8_t u8_t;

+

+/**

+ * 16 bit datatype

+ *

+ * This typedef defines the 16-bit type used throughout uIP.

+ *

+ * \hideinitializer

+ */

+typedef uint16_t u16_t;

+

+/**

+ * Statistics datatype

+ *

+ * This typedef defines the dataype used for keeping statistics in

+ * uIP.

+ *

+ * \hideinitializer

+ */

+typedef unsigned short uip_stats_t;

+

+/**

+ * Maximum number of TCP connections.

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_MAX_CONNECTIONS 40

+

+/**

+ * Maximum number of listening TCP ports.

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_MAX_LISTENPORTS 40

+

+/**

+ * uIP buffer size.

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_BUFFER_SIZE     1518

+

+/**

+ * CPU byte order.

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_BYTE_ORDER      LITTLE_ENDIAN

+

+/**

+ * Logging on or off

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_LOGGING         0

+

+/**

+ * UDP support on or off

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_UDP             0

+

+/**

+ * UDP checksums on or off

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_UDP_CHECKSUMS   1

+

+/**

+ * uIP statistics on or off

+ *

+ * \hideinitializer

+ */

+#define UIP_CONF_STATISTICS      1

+

+/* Here we include the header file for the application(s) we use in

+   our project. */

+/*#include "smtp.h"*/

+/*#include "hello-world.h"*/

+/*#include "telnetd.h"*/

+#include "webserver.h"

+/*#include "dhcpc.h"*/

+/*#include "resolv.h"*/

+/*#include "webclient.h"*/

+

+#endif /* __UIP_CONF_H__ */

+

+/** @} */

+/** @} */

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c
new file mode 100644
index 000000000..12c3b8405
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c
@@ -0,0 +1,179 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT 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 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT 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, see <http://www.gnu.org/licenses/>.

+*/

+

+#include <string.h>

+

+#include <ch.h>

+#include <evtimer.h>

+#include <mac.h>

+

+#include <uip.h>

+#include <uip_arp.h>

+#include <httpd.h>

+#include <clock-arch.h>

+

+#define IPADDR0  192

+#define IPADDR1  168

+#define IPADDR2  1

+#define IPADDR3  20

+

+#define SEND_TIMEOUT 50

+

+static const struct uip_eth_addr macaddr = {

+  {0xC2, 0xAF, 0x51, 0x03, 0xCF, 0x46}

+};

+

+#define BUF ((struct uip_eth_hdr *)&uip_buf[0])

+

+/*

+ * uIP send function wrapping the EMAC functions.

+ */

+static void network_device_send(void) {

+  MACTransmitDescriptor td;

+

+  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));

+    }

+    macReleaseTransmitDescriptor(&td);

+  }

+  /* Dropped... */

+}

+

+/*

+ * uIP receive function wrapping the EMAC function.

+ */

+static size_t network_device_read(void) {

+  MACReceiveDescriptor rd;

+  size_t size;

+

+  if (macWaitReceiveDescriptor(&ETH1, &rd, TIME_IMMEDIATE) != RDY_OK)

+    return 0;

+  size = rd.rd_size;

+  macReadReceiveDescriptor(&rd, uip_buf, size);

+  macReleaseReceiveDescriptor(&rd);

+  return size;

+}

+

+void clock_init(void) {}

+

+clock_time_t clock_time( void )

+{

+  return chTimeNow();

+}

+

+/*

+ * TCP/IP periodic timer.

+ */

+static void PeriodicTimerHandler(eventid_t id) {

+  int i;

+

+  for (i = 0; i < UIP_CONNS; i++) {

+    uip_periodic(i);

+    if (uip_len > 0) {

+      uip_arp_out();

+      network_device_send();

+    }

+  }

+}

+

+/*

+ * ARP periodic timer.

+ */

+static void ARPTimerHandler(eventid_t id) {

+

+  (void)macPollLinkStatus(&ETH1);

+  uip_arp_timer();

+}

+

+/*

+ * Ethernet frame received.

+ */

+static void FrameReceivedHandler(eventid_t id) {

+

+  while ((uip_len = network_device_read()) > 0) {

+    if (BUF->type == HTONS(UIP_ETHTYPE_IP)) {

+      uip_arp_ipin();

+      uip_input();

+      if (uip_len > 0) {

+        uip_arp_out();

+        network_device_send();

+      }

+    }

+    else if (BUF->type == HTONS(UIP_ETHTYPE_ARP)) {

+      uip_arp_arpin();

+      if (uip_len > 0)

+        network_device_send();

+    }

+  }

+}

+

+#define FRAME_RECEIVED_ID       0

+#define PERIODIC_TIMER_ID       1

+#define ARP_TIMER_ID            2

+

+static const evhandler_t evhndl[] = {

+  FrameReceivedHandler,

+  PeriodicTimerHandler,

+  ARPTimerHandler

+};

+

+msg_t WebThread(void *p) {

+  EvTimer evt1, evt2;

+  EventListener el0, el1, el2;

+  uip_ipaddr_t ipaddr;

+

+  /*

+   * Event sources setup.

+   */

+  chEvtRegister(macGetReceiveEventSource(&ETH1), &el0, FRAME_RECEIVED_ID);

+  chEvtPend(EVENT_MASK(FRAME_RECEIVED_ID)); /* In case some frames are already buffered */

+

+  evtInit(&evt1, MS2ST(500));

+  evtStart(&evt1);

+  chEvtRegister(&evt1.et_es, &el1, PERIODIC_TIMER_ID);

+

+  evtInit(&evt2, S2ST(10));

+  evtStart(&evt2);

+  chEvtRegister(&evt2.et_es, &el2, ARP_TIMER_ID);

+

+  /*

+   * EMAC settings.

+   */

+  macSetAddress(&ETH1, &macaddr.addr[0]);

+  (void)macPollLinkStatus(&ETH1);

+

+  /*

+   * uIP initialization.

+   */

+  uip_init();

+  uip_setethaddr(macaddr);

+  uip_ipaddr(ipaddr, IPADDR0, IPADDR1, IPADDR2, IPADDR3);

+  uip_sethostaddr(ipaddr);

+  httpd_init();

+

+  while (TRUE) {

+    chEvtDispatch(evhndl, chEvtWaitOne(ALL_EVENTS));

+  }

+  return 0;

+}

diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.h b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.h
new file mode 100644
index 000000000..bd71b4dc4
--- /dev/null
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.h
@@ -0,0 +1,31 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT 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 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT 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, see <http://www.gnu.org/licenses/>.

+*/

+

+#ifndef _WEBTHREAD_H_

+#define _WEBTHREAD_H_

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  msg_t WebThread(void *p);

+  #ifdef __cplusplus

+}

+#endif

+

+#endif /* _WEBTHREAD_H_ */