Changeset fdf6ef9 in network-demos


Ignore:
Timestamp:
Aug 31, 2001, 6:13:48 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
rtems-4-5-branch
Children:
a630ea3
Parents:
6dba533
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.
  • networkconfig.h: Use bootp_host for tftp tests.
  • netdemo/init.c: Configure more file descriptors.
  • tftpTest/init.c: Configure more file descriptors and full IMFS.
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • http/Makefile

    r6dba533 rfdf6ef9  
    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

    r6dba533 rfdf6ef9  
    66 */
    77
     8#define USE_HTTPD
    89#define TEST_INIT
    910
     
    5859 */
    5960
     61#if defined(USE_FTPD)
     62/*
    6063#if defined(RTEMS_DEBUG)
    6164extern int _binary_o_debug_tarfile_start;
     
    6972#define TARFILE_SIZE _binary_o_optimize_tarfile_size
    7073#endif
     74*/
     75extern int _binary_tarfile_start;
     76extern int _binary_tarfile_size;
     77#define TARFILE_START _binary_tarfile_start
     78#define TARFILE_SIZE _binary_tarfile_size
     79#endif
    7180
     81#if defined(USE_FTPD)
    7282struct rtems_ftpd_configuration rtems_ftpd_configuration = {
    7383   10,                     /* FTPD task priority            */
     
    7686   NULL                    /* List of hooks       */
    7787};
     88#endif
    7889rtems_task Init(
    7990  rtems_task_argument argument
     
    8798
    8899  rtems_bsdnet_initialize_network ();
     100#if defined(USE_FTPD)
    89101  rtems_initialize_ftpd();
    90102
    91103  status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE);
     104#endif
    92105   
     106#if defined(USE_HTTPD)
    93107  rtems_initialize_webserver();
     108#endif
    94109
    95110  status = rtems_task_delete( RTEMS_SELF );
  • netdemo/init.c

    r6dba533 rfdf6ef9  
    1818#include <bsp.h>
    1919
     20#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
    2021#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
    2122#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
  • networkconfig.h

    r6dba533 rfdf6ef9  
    136136 * For TFTP test application
    137137 */
    138 #if (!defined (RTEMS_USE_BOOTP))
     138#if (defined (RTEMS_USE_BOOTP))
     139#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST"
     140#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE"
     141#else
    139142#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ"
    140143#define RTEMS_TFTP_TEST_FILE_NAME "tftptest"
  • tftpTest/init.c

    r6dba533 rfdf6ef9  
    1818#include <bsp.h>
    1919#include <rtems/tftp.h>
     20
     21#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
     22#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
    2023
    2124#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
     
    4750#include "../networkconfig.h"
    4851
     52void testTFTP (const char *hostname, const char *filename);
     53
    4954/*
    5055 * RTEMS Startup Task
Note: See TracChangeset for help on using the changeset viewer.