Changeset d51d8b5 in network-demos for http


Ignore:
Timestamp:
Aug 31, 2001, 6:11:44 PM (18 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:
f2c5ef8
Parents:
d37a99d
Message:

2001-08-30 Joel Sherrill <joel@…>

  • README, networkconfig.h, netdemo/README, tftpTest/test.c: Merged missing stuff from 4.5 branch.
  • http/Makefile, http/init.c: Minor modifications to improve buildability.
Location:
http
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • http/Makefile

    rd37a99d rd51d8b5  
    4242LD_PATHS  +=
    4343LD_LIBS   +=
     44NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
    4445
    4546#
     
    5657
    5758${PGM}: $(OBJS) $(LINK_FILES)
    58         cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
     59        cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
    5960        cp $(ARCH)/tarfile .
    60         $(OBJCOPY) -I binary -O elf32-powerpc tarfile $(ARCH)/tarfile.o
     61        $(OBJCOPY) -I binary -O $(NATIVE_OBJ) tarfile $(ARCH)/tarfile.o
    6162        $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
    6263        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
  • http/init.c

    rd37a99d rd51d8b5  
    66 */
    77
     8#define USE_HTTPD
     9#define USE_FTPD
    810#define TEST_INIT
    911
     
    5860 */
    5961
     62#if defined(USE_FTPD)
     63/*
    6064#if defined(RTEMS_DEBUG)
    6165extern int _binary_o_debug_tarfile_start;
     
    6973#define TARFILE_SIZE _binary_o_optimize_tarfile_size
    7074#endif
     75*/
     76extern int _binary_tarfile_start;
     77extern int _binary_tarfile_size;
     78#define TARFILE_START _binary_tarfile_start
     79#define TARFILE_SIZE _binary_tarfile_size
     80#endif
    7181
     82#if defined(USE_FTPD)
    7283struct rtems_ftpd_configuration rtems_ftpd_configuration = {
    7384   10,                     /* FTPD task priority            */
     
    7687   NULL                    /* List of hooks       */
    7788};
     89#endif
    7890rtems_task Init(
    7991  rtems_task_argument argument
     
    8799
    88100  rtems_bsdnet_initialize_network ();
     101#if defined(USE_FTPD)
    89102  rtems_initialize_ftpd();
    90103
    91104  status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
     105#endif
    92106   
     107#if defined(USE_HTTPD)
    93108  rtems_initialize_webserver();
     109#endif
    94110
    95111  status = rtems_task_delete( RTEMS_SELF );
Note: See TracChangeset for help on using the changeset viewer.