Changeset 1a1b41cd in network-demos


Ignore:
Timestamp:
Jul 12, 2000, 4:47:38 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master, network-demos-4-10-branch, network-demos-4-6-branch, network-demos-4-7-branch, network-demos-4-8-branch, network-demos-4-9-branch
Children:
3ba2f22
Parents:
c91972f
Message:

Patch from Andrew Bythell <abythell@…> that should
allow the http demo to build a correct starting filesystem and
run. Formerly, the http demo did not configure the filesystem
as needed or build the tar file such that GoAhead? could find it.

Location:
http
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • http/Makefile

    rc91972f r1a1b41cd  
    5656
    5757${PGM}: $(OBJS) $(LINK_FILES)
    58         tar cf $(ARCH)/tarfile index.html
    59         $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o -b binary $(ARCH)/tarfile
     58        cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
     59        cp $(ARCH)/tarfile .
     60        $(OBJCOPY) -I binary -O elf32-powerpc tarfile $(ARCH)/tarfile.o
     61        $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
    6062        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
    6163        $(RM) $(ARCH)/temp.o
  • http/init.c

    rc91972f r1a1b41cd  
    1111#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
    1212#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
     13#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS        20
     14#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
    1315
    1416#define CONFIGURE_EXECUTIVE_RAM_SIZE    (512*1024)
     
    5153#define ARGUMENT 0
    5254
    53 extern int _binary_tarfile_start;
    54 extern int _binary_tarfile_size;
     55/*
     56 *  The tarfile is built in $(ARCH) so includes whether we were
     57 *  built optimized or debug.
     58 */
     59
     60#if defined(RTEMS_DEBUG)
     61extern int _binary_o_debug_tarfile_start;
     62extern int _binary_o_debug_tarfile_size;
     63#define TARFILE_START _binary_o_debug_tarfile_start
     64#define TARFILE_SIZE _binary_o_debug_tarfile_size
     65#else
     66extern int _binary_o_optimize_tarfile_start;
     67extern int _binary_o_optimize_tarfile_size;
     68#define TARFILE_START _binary_o_optimize_tarfile_start
     69#define TARFILE_SIZE _binary_o_optimize_tarfile_size
     70#endif
    5571
    5672struct rtems_ftpd_configuration rtems_ftpd_configuration = {
    5773   10,                     /* FTPD task priority            */
    5874   1024,                   /* Maximum buffersize for hooks  */
    59    80,                     /* Well-known port     */
     75   21,                     /* Well-known port     */
    6076   NULL                    /* List of hooks       */
    6177};
     
    7187
    7288  rtems_bsdnet_initialize_network ();
    73 
    7489  rtems_initialize_ftpd();
    7590
    76   status = Untar_FromMemory((unsigned char *)(&_binary_tarfile_start),
    77                             &_binary_tarfile_size);
     91  status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
    7892   
    7993  rtems_initialize_webserver();
  • http/rootfs/etc/host.conf

    rc91972f r1a1b41cd  
     1order hosts, bind
  • http/rootfs/etc/hosts

    rc91972f r1a1b41cd  
     1127.0.0.0        localhost
     2192.168.1.2      rtems          # ip address of webserver
  • http/rootfs/web/index.html

    rc91972f r1a1b41cd  
     1<HTML>
     2<HEAD><TITLE>RTEMS GoAhead Test Page</TITLE></HEAD>
     3<BODY BGCOLOR="FFFFFF">
     4<A HREF="http://www.oarcorp.com" target="Text Frame">
     5  <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A>
     6<H1>RTEMS GoAhead Test Page</H1>
     7<HR>
     8<BODY>
     9
     10<P>Congratulations, you have successfully loaded your first page
     11from the GoAhead Web Server running on RTEMS.</P>
     12
     13<HR>
     14Copyright &copy; 1988-1999 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A>
     15</BODY></HTML>
Note: See TracChangeset for help on using the changeset viewer.