diff options
Diffstat (limited to 'http/init.c')
| -rw-r--r-- | http/init.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/http/init.c b/http/init.c index d6008b8..eea4873 100644 --- a/http/init.c +++ b/http/init.c @@ -10,6 +10,8 @@ #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER #define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20 +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM #define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024) #define CONFIGURE_MAXIMUM_SEMAPHORES 20 @@ -50,13 +52,27 @@ #define ARGUMENT 0 -extern int _binary_tarfile_start; -extern int _binary_tarfile_size; +/* + * The tarfile is built in $(ARCH) so includes whether we were + * built optimized or debug. + */ + +#if defined(RTEMS_DEBUG) +extern int _binary_o_debug_tarfile_start; +extern int _binary_o_debug_tarfile_size; +#define TARFILE_START _binary_o_debug_tarfile_start +#define TARFILE_SIZE _binary_o_debug_tarfile_size +#else +extern int _binary_o_optimize_tarfile_start; +extern int _binary_o_optimize_tarfile_size; +#define TARFILE_START _binary_o_optimize_tarfile_start +#define TARFILE_SIZE _binary_o_optimize_tarfile_size +#endif struct rtems_ftpd_configuration rtems_ftpd_configuration = { 10, /* FTPD task priority */ 1024, /* Maximum buffersize for hooks */ - 80, /* Well-known port */ + 21, /* Well-known port */ NULL /* List of hooks */ }; rtems_task Init( @@ -70,11 +86,9 @@ rtems_task Init( /* init_paging(); */ rtems_bsdnet_initialize_network (); - rtems_initialize_ftpd(); - status = Untar_FromMemory((unsigned char *)(&_binary_tarfile_start), - &_binary_tarfile_size); + status = Untar_FromMemory((unsigned char *)(&TARFILE_START), &TARFILE_SIZE); rtems_initialize_webserver(); |