ecos: packages/redboot/current/src/main.c comparison

comparison packages/redboot/current/src/main.c @ 2257:467fd46113f3

* src/fs/fileio.c (do_list): Use getcwd for current directory, rather than "." which may not be implemented in the FS. * src/parse.c (redboot_exec): Conditionalise use of __mem_fault_handler to only be when stubs are included. (error_handler): Ditto for this function. * src/main.c (cyg_start): Conditionalise use of __mem_fault_handler to only be when stubs are included. (do_go): Ditto. (error_handler): Ditto for this function. * src/fs/fileio.c (do_mkdir, do_deldir, do_del, do_write): Added some extra argument checking to these functions. * src/fs/fileio.c (do_mount): Only support -f with "legacy" flash block devices. Clear mount table on failure. (do_move): Silence rename undefined warning. (do_write): Silence warnings. (do_info): Support longer device names. * src/decompress.c (ZLIB_COMPRESSION_OVERHEAD): Increase substantially if jffs2 is present. * src/fs/fileio.c: Fixed some bugs in handling of mounts. The strings used in the mount table must be copied, otherwise the mount table is corrupted by later commands. Also toughened up some error testing. * doc/redboot_cmds.sgml: Added file mode documentation to load command. * doc/redboot_cmds.sgml: Added documentation of filesystem access commands. * src/fs/fileio.c (do_write): Added O_TRUNC to the open call to ensure that the file is resized to fit the new data. * src/fs/fileio.c: Significantly reorganized to present an interface similar to the fis commands. Added a variety of command to manipulate files and directories in a filesystem. * src/parse.c: Added redboot_exec() to provide an internal interface for executing RedBoot commands. Added err_printf() which allows an error message to be printed before longjumping out to an enclosing call to redboot_exec(). Where redboot_exec() is not involved, it just behaves like diag_printf(). * src/main.c: Removed unnecessary delay during startup. Changed diag_printf() in do_go() into err_printf(). * src/load.c: Changed some calls to diag_printf() to err_printf(). * src/net/net_io.c: Changed init priority to RedBoot_INIT_NET. * include/redboot.h: Added some extra initialization priorities. Added prototypes for redboot_exec() and err_printf().

author	jlarmour
date	Thu, 20 Jul 2006 20:27:47 +0000
parents	5c5e93c863ac
children	6cbecf3cc2e4

comparison

equal deleted inserted replaced

-:9838a9103c2a
+:467fd46113f3
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
 // Copyright (C) 2002, 2003, 2004 Gary Thomas
+// Copyright (C) 2003, 2004, 2005, 2006 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2 or (at your option) any later version.
 //
 // License. However the source code for this file must still be made available
 // in accordance with section (3) of the GNU General Public License.
 //
 // This exception does not invalidate any other reasons why a work based on
 // this file might be covered by the GNU General Public License.
-//
-// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
-// at http://sources.redhat.com/ecos/ecos-license/
 // -------------------------------------------
 //####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
 // Author(s):    gthomas
-// Contributors: gthomas, tkoeller
+// Contributors: gthomas, tkoeller, eCosCentric
 // Date:         2000-07-14
 // Purpose:
 // Description:
 //
 // This code is part of RedBoot (tm).
 diag_printf(version);
 #ifdef HAL_PLATFORM_CPU
 diag_printf("Platform: %s (%s) %s\n", HAL_PLATFORM_BOARD, HAL_PLATFORM_CPU, HAL_PLATFORM_EXTRA);
 #endif
-diag_printf("Copyright (C) 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.\n\n");
+diag_printf("Copyright (C) 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.\n");
+diag_printf("Copyright (C) 2003, 2004, 2005, 2006 eCosCentric Limited\n\n");
 diag_printf("RAM: %p-%p, ", (void*)ram_start, (void*)ram_end);
 diag_printf("[%p-%p]", mem_segments[0].start, mem_segments[0].end);
 diag_printf(" available\n");
 #if CYGBLD_REDBOOT_MAX_MEM_SEGMENTS > 1
 for (seg = 1;  seg < CYGBLD_REDBOOT_MAX_MEM_SEGMENTS;  seg++) {
 //
 // Handle illegal memory accesses (and other abort conditions)
 //
 static hal_jmp_buf error_jmpbuf;
 #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
-externC
+__externC void* volatile __mem_fault_handler;
-#endif
-void* volatile __mem_fault_handler;
 static void error_handler(void)
 {
 hal_longjmp(error_jmpbuf, 1);
 }
+#endif
 //
 // This is the main entry point for RedBoot
 //
 CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_HAL_VIRTUAL_VECTOR_DEBUG_CHANNEL);
 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
 console_selected = false;
 #endif
 console_echo = true;
-CYGACC_CALL_IF_DELAY_US((cyg_int32)2*100000);
 ram_start = (unsigned char *)CYGMEM_REGION_ram;
 ram_end = (unsigned char *)(CYGMEM_REGION_ram+CYGMEM_REGION_ram_SIZE);
 #ifdef HAL_MEM_REAL_REGION_TOP
 {
 }
 } else {
 while (strlen(command) > 0) {
 if ((cmd = parse(&command, &argc, &argv[0])) != (struct cmd *)0) {
 // Try to handle aborts - messy because of the stack unwinding...
+#ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
 __mem_fault_handler = error_handler;
+#endif
 if (hal_setjmp(error_jmpbuf)) {
 diag_printf("** command abort - illegal memory access?\n");
 } else {
 (cmd->fun)(argc, argv);
 }
+#ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
 __mem_fault_handler = 0;
+#endif
 } else {
 diag_printf("** Error: Illegal command: \"%s\"\n", argv[0]);
 }
 }
 }
 #endif
 struct option_info opts[3];
 char line[8];
 hal_virtual_comm_table_t *__chan;
+#ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
 __mem_fault_handler = 0; // Let GDB handle any faults directly
+#endif
 entry = entry_address;  // Default from last 'load' operation
 init_opts(&opts[0], 'w', true, OPTION_ARG_TYPE_NUM,
 (void *)&wait_time, (bool *)&wait_time_set, "wait timeout");
 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG,
 (void *)&cache_enabled, (bool *)0, "go with caches enabled");
 if (!scan_opts(argc, argv, 1, opts, num_options, (void *)&entry, OPTION_ARG_TYPE_NUM, "starting address"))
 {
 return;
 }
 if (entry == (unsigned long)NO_MEMORY) {
-diag_printf("No entry point known - aborted\n");
+err_printf("No entry point known - aborted\n");
 return;
 }
 if (wait_time_set) {
 int script_timeout_ms = wait_time * 1000;
 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG

Mercurial > ecos

comparison packages/redboot/current/src/main.c @ 2257:467fd46113f3