diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-07-11 19:14:39 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-07-11 19:14:39 +0000 |
| commit | f6559799c3dc0571509427ecd43c7c1dbc8dba27 (patch) | |
| tree | 179d2ec3966b631f4f5d5a2fd9fcf798015f6511 | |
| parent | 7f1472585fc6378167e784175d7060430ac64fee (diff) | |
2007-07-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Make slightly smarter on LD arguments. Do not pick
up CVS files in tarball.
* init.c: Turn off tracing on GoAhead. More debug.
* rootfs/etc/hosts: Match OAR setup for EP5200.
* rootfs/index.html: Cleanup and use RTEMS Logo.
* rootfs/rtems_logo.jpg: New files.
* rootfs/web/index.html: Removed.
| -rw-r--r-- | http/ChangeLog | 10 | ||||
| -rw-r--r-- | http/Makefile | 11 | ||||
| -rw-r--r-- | http/init.c | 14 | ||||
| -rw-r--r-- | http/rootfs/etc/hosts | 2 | ||||
| -rw-r--r-- | http/rootfs/index.html | 12 | ||||
| -rw-r--r-- | http/rootfs/rtems_logo.jpg | bin | 0 -> 14586 bytes | |||
| -rw-r--r-- | http/rootfs/web/index.html | 15 |
7 files changed, 43 insertions, 21 deletions
diff --git a/http/ChangeLog b/http/ChangeLog index cdc4fb0..991fd24 100644 --- a/http/ChangeLog +++ b/http/ChangeLog @@ -1,3 +1,13 @@ +2007-07-11 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile: Make slightly smarter on LD arguments. Do not pick + up CVS files in tarball. + * init.c: Turn off tracing on GoAhead. More debug. + * rootfs/etc/hosts: Match OAR setup for EP5200. + * rootfs/index.html: Cleanup and use RTEMS Logo. + * rootfs/rtems_logo.jpg: New files. + * rootfs/web/index.html: Removed. + 2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile, init.c: Clean up. Make name of TARFILE related symbols diff --git a/http/Makefile b/http/Makefile index bd60575..0c092f1 100644 --- a/http/Makefile +++ b/http/Makefile @@ -5,7 +5,7 @@ SAMPLE=http PGM=${ARCH}/$(SAMPLE).exe -MANAGERS=io event semaphore timer rate_monotonic +MANAGERS=all # C source names, if any, go here -- minus the .c C_PIECES=init @@ -34,7 +34,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -DWEBS -DUEMF CFLAGS_LD += -Wl,--defsym -Wl,HeapSize=0xC0000 CFLAGS_OPTIMIZE_V += CFLAGS_DEBUG_V += -v -qrtems_debug @@ -55,6 +55,9 @@ OBJDUMP=$(OBJCOPY:copy=dump) CLEAN_ADDITIONS += tarfile obj_format CLOBBER_ADDITIONS += +# strip out flags gcc knows but LD doesn't like -- add as needed +LD_CPU_CFLAGS=$(CPU_CFLAGS:-mstrict-align:) + all: ${ARCH} $(SRCS) $(PGM) obj_format: @@ -62,10 +65,10 @@ obj_format: sed -e 's/^.*format //' >obj_format ${PGM}: $(OBJS) obj_format $(LINK_FILES) - cd rootfs ; tar cf ../$(ARCH)/tarfile web etc + cd rootfs ; tar cf ../$(ARCH)/tarfile --exclude CVS . cp $(ARCH)/tarfile . $(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o - $(LD) $(CPU_CFLAGS) -r -o $(ARCH)/temp.o \ + $(LD) $(LD_CPU_CFLAGS) -r -o $(ARCH)/temp.o \ $(ARCH)/init.o $(ARCH)/tarfile.o $(MV) $(ARCH)/temp.o $(ARCH)/init.o $(RM) $(ARCH)/temp.o diff --git a/http/init.c b/http/init.c index 9185078..f70cfee 100644 --- a/http/init.c +++ b/http/init.c @@ -31,6 +31,7 @@ #define CONFIGURE_INIT #include "system.h" +#include <bsp.h> #include <errno.h> #include <time.h> @@ -78,6 +79,14 @@ struct rtems_ftpd_configuration rtems_ftpd_configuration = { NULL /* List of hooks */ }; #endif + +/* GoAhead Trace Handler */ +#include <goahead/uemf.h> +void quietTraceHandler(int level, char *buf) +{ + /* do nothing */ +} + rtems_task Init( rtems_task_argument argument ) @@ -94,7 +103,10 @@ rtems_task Init( #endif #if defined(USE_HTTPD) - rtems_initialize_webserver(); + if ( rtems_initialize_webserver() ) + printf( "ERROR -- failed to initialize webserver\n" ); + + traceSetHandler( quietTraceHandler ); #endif status = rtems_task_delete( RTEMS_SELF ); diff --git a/http/rootfs/etc/hosts b/http/rootfs/etc/hosts index 0027f9d..0baa64f 100644 --- a/http/rootfs/etc/hosts +++ b/http/rootfs/etc/hosts @@ -1,2 +1,2 @@ 127.0.0.0 localhost -192.168.1.2 rtems # ip address of webserver +192.168.1.244 rtems # ip address of webserver diff --git a/http/rootfs/index.html b/http/rootfs/index.html new file mode 100644 index 0000000..2642b58 --- /dev/null +++ b/http/rootfs/index.html @@ -0,0 +1,12 @@ +<HTML> +<HEAD><TITLE>RTEMS GoAhead Test Page</TITLE></HEAD> +<BODY BGCOLOR="FFFFFF"> +<center> +<H1>RTEMS GoAhead Web Server Test Page</H1> +<A HREF="http://www.rtems.org"> + <IMG align=center BORDER=0 SRC="rtems_logo.jpg" ALT="RTEMS"> </A> + +<P><big>Congratulations, you have successfully loaded your first page +from the GoAhead Web Server running on RTEMS.</big></P> +</center> +</BODY></HTML> diff --git a/http/rootfs/rtems_logo.jpg b/http/rootfs/rtems_logo.jpg Binary files differnew file mode 100644 index 0000000..485b80b --- /dev/null +++ b/http/rootfs/rtems_logo.jpg diff --git a/http/rootfs/web/index.html b/http/rootfs/web/index.html deleted file mode 100644 index 15e5c9f..0000000 --- a/http/rootfs/web/index.html +++ /dev/null @@ -1,15 +0,0 @@ -<HTML> -<HEAD><TITLE>RTEMS GoAhead Test Page</TITLE></HEAD> -<BODY BGCOLOR="FFFFFF"> -<A HREF="http://www.oarcorp.com" target="Text Frame"> - <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A> -<H1>RTEMS GoAhead Test Page</H1> -<HR> -<BODY> - -<P>Congratulations, you have successfully loaded your first page -from the GoAhead Web Server running on RTEMS.</P> - -<HR> -Copyright © 1988-1999 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A> -</BODY></HTML> |
