ecos: packages/redboot/current/src/io.c annotate

annotate packages/redboot/current/src/io.c @ 2614:6cbecf3cc2e4

* src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, src/xyzModem.c, include/redboot.h: more signed vs. unsigned char issues. * src/fs/e2fs.c (e2fs_mount): Avoid compiler strict aliasing problem. * include/fis.h (struct fis_image_desc): Make fis name be signed char to reduce warnings. * include/flash_config.h (struct _config): Make config_data be signed char to reduce warnings. * include/redboot.h: mon_write_char and mon_read_char_with_timeout take unsigned char, to reduce warnings. * src/parse.c: Add const to err_printf format. * src/fconfig.c: Many signed/unsigned warning cleanups. * src/io.c: Ditto. * src/xyzModem.c: Ditto. * src/load.c: Ditto. * src/flash.c: Ditto. * src/fconfig.c (flash_write_config): Warning cleanup. * src/net/net_io.c (do_ip_addr): Warning cleanup. * src/flash.c (fis_create): Warning cleanup. * include/net/net.h: Include redboot.h for tick functions. * include/net/net.h: Pull tick functions into redboot.h as they are used more widely than the net stack. * include/redboot.h: Declare tick functions. * src/main.c (cyg_start): Correctly compute workspace_end so it works even on high RAM values [bug #1000202]. Don't use workspace_end directly for context init - it gets modified. (do_go): Don't use workspace_end directly for context init - it gets modified.

author	jlarmour
date	Tue, 11 Nov 2008 04:32:10 +0000
parents	5d5572c64422
children	74dbf4c3f2e1

rev	line source
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	3 // io.c
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	4 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	5 // RedBoot I/O support
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	6 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	7 //==========================================================================
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	8 //####ECOSGPLCOPYRIGHTBEGIN####
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	9 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	10 // This file is part of eCos, the Embedded Configurable Operating System.
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	11 // Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	12 // Copyright (C) 2002, 2003, 2005 Gary Thomas
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	13 // Copyright (C) 2004, 2008 eCosCentric Limited
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	14 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	15 // eCos is free software; you can redistribute it and/or modify it under
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	16 // the terms of the GNU General Public License as published by the Free
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	17 // Software Foundation; either version 2 or (at your option) any later version.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	18 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	19 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	20 // WARRANTY; without even the implied warranty of MERCHANTABILITY or
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	21 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	22 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	23 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	24 // You should have received a copy of the GNU General Public License along
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	25 // with eCos; if not, write to the Free Software Foundation, Inc.,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	26 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	27 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	28 // As a special exception, if other files instantiate templates or use macros
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	29 // or inline functions from this file, or you compile this file and link it
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	30 // with other works to produce a work based on this file, this file does not
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	31 // by itself cause the resulting work to be covered by the GNU General Public
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	32 // License. However the source code for this file must still be made available
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	33 // in accordance with section (3) of the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	34 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	35 // This exception does not invalidate any other reasons why a work based on
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	36 // this file might be covered by the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	37 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	38 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	39 // at http://sources.redhat.com/ecos/ecos-license/
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	40 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	41 //####ECOSGPLCOPYRIGHTEND####
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	42 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	43 //#####DESCRIPTIONBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	44 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	45 // Author(s): gthomas
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	46 // Contributors: gthomas,hmt,jlarmour
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	47 // Date: 2000-07-14
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	48 // Purpose:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	49 // Description:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	50 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	51 // This code is part of RedBoot (tm).
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	52 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	53 //####DESCRIPTIONEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	54 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	55 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	56
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	57 #include "redboot.h"
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	58
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	59 #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	60 // GDB interface functions
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	61 extern void ungetDebugChar(char c);
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	62 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	63
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	64 static void
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	65 do_channel(int argc, char *argv[]);
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	66
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	67 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	68 RedBoot_cmd("channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	69 "Display/switch console channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	70 "[-1\|<channel number>]",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	71 do_channel
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	72 );
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	73 #else
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	74 RedBoot_cmd("channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	75 "Display/switch console channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	76 "[<channel number>]",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	77 do_channel
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	78 );
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	79 #endif
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	80
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	81 static void
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	82 do_channel(int argc, char *argv[])
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	83 {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	84 int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	85
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	86 if (argc == 2) {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	87 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	88 if (strcmp( argv[1], "-1") == 0) {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	89 console_selected = false;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	90 console_echo = true;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	91 } else
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	92 #endif
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	93 {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	94 unsigned long chan;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	95 if ( !parse_num( argv[1], &chan, NULL, NULL) ) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	96 diag_printf("** Error: invalid channel '%s'\n", argv[1]);
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	97 } else {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	98 if (chan < CYGNUM_HAL_VIRTUAL_VECTOR_NUM_CHANNELS) {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	99 CYGACC_CALL_IF_SET_CONSOLE_COMM(chan);
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	100 CYGACC_CALL_IF_SET_DEBUG_COMM(chan);
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	101 if (chan != cur)
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	102 console_echo = true;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	103 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	104 else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	105 diag_printf("**Error: bad channel number '%s'\n", argv[1]);
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	106 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	107 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	108 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	109 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	110 /* else display */
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	111 else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	112 diag_printf("Current console channel id: ");
169 11b54a94cf58 Merge from eCos master repository on 2001-07-06-06:43:02-BST jlarmour parents: 165 diff changeset	113 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	114 if (!console_selected)
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	115 diag_printf("-1\n");
169 11b54a94cf58 Merge from eCos master repository on 2001-07-06-06:43:02-BST jlarmour parents: 165 diff changeset	116 else
11b54a94cf58 Merge from eCos master repository on 2001-07-06-06:43:02-BST jlarmour parents: 165 diff changeset	117 #endif
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	118 diag_printf("%d\n", cur);
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	119 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	120 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	121
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	122 void
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	123 mon_write_char(unsigned char c)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	124 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	125 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	126
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	127 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	128 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	129 int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	130 int i;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	131 // Send output to all channels
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	132 for (i = 0; i < CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS; i++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	133 CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	134 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	135 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	136 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	137 CYGACC_CALL_IF_SET_CONSOLE_COMM(cur);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	138 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	139 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	140 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	141 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	142 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	143 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	144 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	145 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	146 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	147 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	148 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	149 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	150
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	151 static void
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	152 mon_read_char(unsigned char *c)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	153 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	154 hal_virtual_comm_table_t* __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	155
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	156 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	157 c = CYGACC_COMM_IF_GETC(__chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	158 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	159 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	160 c = CYGACC_COMM_IF_GETC(__chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	161 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	162 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	163
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	164 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	165 static int _mon_timeout;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	166 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	167
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	168 bool
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	169 mon_read_char_with_timeout(unsigned char *c)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	170 {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	171 bool res = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	172 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	173
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	174 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	175 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	176 int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
238 ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	177 int i, j, tot;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	178 // Try input from all channels
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	179 tot = 0;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	180 while (tot < _mon_timeout) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	181 for (i = 0; i < CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS; i++, tot++) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	182 CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	183 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	184 res = CYGACC_COMM_IF_GETC_TIMEOUT(*__chan, c);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	185 if (res) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	186 // Input available on this channel, make it be the console
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	187 if (*c != '\0') {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	188 // Don't chose this unless real data have arrived
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	189 console_selected = true;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	190 CYGACC_CALL_IF_SET_DEBUG_COMM(i);
238 ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	191 // Disable interrupts on all channels but this one
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	192 for (j = 0; j < CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS; j++) {
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	193 if (i != j) {
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	194 CYGACC_CALL_IF_SET_CONSOLE_COMM(j);
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	195 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	196 CYGACC_COMM_IF_CONTROL(*__chan, __COMMCTL_IRQ_DISABLE);
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	197 }
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	198 }
ee09240e2d36 Disable interrupts on all but the console port. gthomas parents: 210 diff changeset	199 CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	200 return res;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	201 }
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 115 diff changeset	202 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	203 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	204 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	205 CYGACC_CALL_IF_SET_CONSOLE_COMM(cur);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	206 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	207 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	208 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	209 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	210 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	211 res = CYGACC_COMM_IF_GETC_TIMEOUT(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	212 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	213 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	214 res = CYGACC_COMM_IF_GETC_TIMEOUT(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	215 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	216 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	217 return res;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	218 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	219
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	220 void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	221 mon_set_read_char_timeout(int ms)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	222 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	223 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	224
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	225 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	226 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	227 int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	228 int i;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	229 // Set timeout to minimum on each channel; total amounts to desired value
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	230 _mon_timeout = ms;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	231 ms = 1;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	232 for (i = 0; i < CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS; i++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	233 CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	234 if ((__chan = CYGACC_CALL_IF_CONSOLE_PROCS()) != 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	235 CYGACC_COMM_IF_CONTROL(*__chan, __COMMCTL_SET_TIMEOUT, ms);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	236 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	237 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	238 CYGACC_CALL_IF_SET_CONSOLE_COMM(cur);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	239 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	240 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	241 {
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	242 if ((__chan = CYGACC_CALL_IF_CONSOLE_PROCS()) != 0) {
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	243 CYGACC_COMM_IF_CONTROL(*__chan, __COMMCTL_SET_TIMEOUT, ms);
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	244 }
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	245 if ((__chan = CYGACC_CALL_IF_DEBUG_PROCS()) != 0) {
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	246 CYGACC_COMM_IF_CONTROL(*__chan, __COMMCTL_SET_TIMEOUT, ms);
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 169 diff changeset	247 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	248 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	249 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	250
1122 92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	251 //
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	252 // Test for ^C on the console. CAUTION! discards all console input
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	253 //
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	254 bool
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	255 _rb_break(int timeout)
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	256 {
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	257 unsigned char c;
1122 92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	258 mon_set_read_char_timeout(timeout);
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	259 if (mon_read_char_with_timeout(&c)) {
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	260 if (c == '\x03') { // Test for ^C
1122 92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	261 return true;
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	262 }
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	263 }
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	264 return false;
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	265 }
92e31da869cc Add ^C abort functionality to BOOTP and PING operations. gthomas parents: 1032 diff changeset	266
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	267 #ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	268 #define __STRINGIFY(x) #x
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	269 #define _STRINGIFY(x) __STRINGIFY(x)
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	270 #define _STARTUP_STR _STRINGIFY(CYG_HAL_STARTUP) "}"
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	271
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	272 //
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	273 // Read a character from script.
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	274 // Return true if script character found, false if not.
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	275 //
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	276 static int
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	277 getc_script(char *cp)
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	278 {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	279 static bool newline = true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	280 bool skip;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	281
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	282 while (script && *script) {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	283 if (newline && *script == '{') {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	284 skip = false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	285 ++script;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	286
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	287 // skip if it isn't for this startup type
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	288 if (strncmp(script, _STARTUP_STR, strlen(_STARTUP_STR)))
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	289 skip = true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	290
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	291 // skip past "{...}"
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	292 while (script && script++ != '}')
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	293 ;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	294
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	295 // skip script line if neccessary
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	296 if (skip) {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	297 while (script && script++ != '\n')
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	298 ;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	299 } else
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	300 newline = false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	301
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	302 } else {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	303 cp = script++;
264 57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts. gthomas parents: 239 diff changeset	304 if (*cp == '\n') {
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts. gthomas parents: 239 diff changeset	305 newline = true;
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts. gthomas parents: 239 diff changeset	306 } else {
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts. gthomas parents: 239 diff changeset	307 newline = false;
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts. gthomas parents: 239 diff changeset	308 }
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	309 return true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	310 }
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	311 }
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	312 return false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	313 }
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	314 #endif
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	315
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	316 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	317 #define _CL_NUM_LINES CYGNUM_REDBOOT_CMD_LINE_EDITING // Number of lines to keep
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	318 static char _cl_lines[_CL_NUM_LINES][CYGPKG_REDBOOT_MAX_CMD_LINE];
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	319 static int _cl_index = -1; // Last known command line
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	320 static int _cl_max_index = -1; // Last command in buffers
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	321
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	322 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	323 static void expand_history(char *);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	324 #endif
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	325 #endif
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	326
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	328 // Read a line of input from the user
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	329 // Return:
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	330 // _GETS_OK: 'n' valid characters received
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	331 // _GETS_GDB: '$' (GDB lead-in)
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	332 // _GETS_TIMEOUT: No input before timeout
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	333 // _GETS_CTRLC: ^C typed
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	334 //
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	335 // if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	336 // Command line history support
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	337 // ^P - Select previous line from history
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	338 // ^N - Select next line from history
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	339 // ^A - Move insertion [cursor] to start of line
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	340 // ^E - Move cursor to end of line
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	341 // ^B - Move cursor back [previous character]
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	342 // ^F - Move cursor forward [next character]
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	343 // "standard" arrow keys work as well
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	344 // left ^[[D == ^B
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	345 // right ^[[C == ^F
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	346 // up ^[[A == ^P
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	347 // down ^[[B == ^N
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	348 // home ^[[H/^[1~ == ^A
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	349 // end ^[[F/^[OF == ^E
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	350 // del ^[3~ == ^D
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	351 //
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	352 int
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	353 _rb_gets_preloaded(char *buf, int buflen, int timeout)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	354 {
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	355 char *ip = buf; // Insertion point
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	356 char *eol = buf; // End of line
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	357 char c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	358 bool res = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	359 static char last_ch = '\0';
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	360 int _timeout;
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	361 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	362 int _index = _cl_index; // Last saved line
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	363 char *xp;
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	364 #ifdef CYGSEM_REDBOOT_CMD_LINE_ANSI_SEQUENCES
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	365 int ansi_state = 0; // Used to drive ANSI parser
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	366 char ansi_char = '\0';
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	367 #endif
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	368 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	369
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	370 // Display current buffer data
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	371 while (*eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	372 mon_write_char(*eol++);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	373 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	374 ip = eol;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	375
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	376 while (true) {
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 158 diff changeset	377 #ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	378 if (getc_script(&c))
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	379 do_idle(false);
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 178 diff changeset	380 else
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	381 #endif
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	382 if ((timeout > 0) && (eol == buf)) {
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 182 diff changeset	383 #define MIN_TIMEOUT 50
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	384 _timeout = timeout > MIN_TIMEOUT ? MIN_TIMEOUT : timeout;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	385 mon_set_read_char_timeout(_timeout);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	386 while (timeout > 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	387 res = mon_read_char_with_timeout(&c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	388 if (res) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	389 // Got a character
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	390 do_idle(false);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	391 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	392 }
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	393 timeout -= _timeout;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	394 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	395 if (res == false) {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 149 diff changeset	396 do_idle(true);
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 128 diff changeset	397 return _GETS_TIMEOUT; // Input timed out
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	398 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	399 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	400 mon_read_char(&c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	401 }
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	402 *eol = '\0';
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	403 #define CTRL(c) ((c)&0x1F)
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	404 #ifdef CYGSEM_REDBOOT_CMD_LINE_ANSI_SEQUENCES
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	405 // Special handling of ANSI keyboard sequences (arrows, etc)
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	406 if (c == '\x1B') {
2066 5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	407 // Leadin for ANSI keyboard sequence
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	408 ansi_state = 1;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	409 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	410 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	411 switch (ansi_state) {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	412 case 0:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	413 // No ANSI sequence in progress
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	414 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	415 case 1:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	416 // ESC seen, look for '['
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	417 if (c == '[') {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	418 ansi_state = 2;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	419 } else if (c == 'O') {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	420 ansi_state = 4;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	421 } else {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	422 // Handle bad sequences?
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	423 ansi_state = 0;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	424 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	425 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	426 case 2:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	427 // ESC+[ seen, process key
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	428 ansi_state = 0;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	429 switch (c) {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	430 case 'A':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	431 c = CTRL('P');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	432 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	433 case 'B':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	434 c = CTRL('N');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	435 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	436 case 'C':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	437 c = CTRL('F');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	438 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	439 case 'D':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	440 c = CTRL('B');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	441 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	442 case 'F':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	443 c = CTRL('E');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	444 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	445 case 'H':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	446 c = CTRL('A');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	447 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	448 case '1':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	449 ansi_char = CTRL('A');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	450 ansi_state = 3;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	451 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	452 case '3':
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	453 ansi_char = CTRL('D');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	454 ansi_state = 3;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	455 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	456 default:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	457 // Handle bad sequences?
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	458 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	459 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	460 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	461 case 3:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	462 // Sequences like ^[[1~ == ^H
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	463 ansi_state = 0;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	464 if (c == '~') {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	465 c = ansi_char;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	466 } else {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	467 // Handle bad sequences?
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	468 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	469 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	470 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	471 case 4:
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	472 // Sequences like ^[OF == ^E
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	473 ansi_state = 0;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	474 if (c == 'F') {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	475 c = CTRL('E');
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	476 } else {
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	477 // Handle bad sequences?
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	478 continue;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	479 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	480 break;
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	481 }
5d5572c64422 FIS fix from Stefan Sommerfeld, ANSI cursor keys from Gary Thomas gthomas parents: 1419 diff changeset	482 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	483 switch (c) {
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	484 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	485 case CTRL('P'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	486 // Fetch the previous line into the buffer
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	487 if (_index >= 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	488 // Erase the previous line [crude]
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	489 while (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	490 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	491 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	492 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	493 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	494 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	495 strcpy(buf, _cl_lines[_index]);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	496 while (*ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	497 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	498 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	499 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	500 // Move to previous line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	501 _index--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	502 if (_index < 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	503 _index = _cl_max_index;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	504 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	505 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	506 mon_write_char(0x07); // Audible bell on most devices
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	507 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	508 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	509 case CTRL('N'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	510 // Fetch the next line into the buffer
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	511 if (_index >= 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	512 if (++_index > _cl_max_index) _index = 0;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	513 // Erase the previous line [crude]
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	514 while (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	515 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	516 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	517 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	518 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	519 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	520 strcpy(buf, _cl_lines[_index]);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	521 while (*ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	522 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	523 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	524 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	525 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	526 mon_write_char(0x07); // Audible bell on most devices
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	527 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	528 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	529 case CTRL('B'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	530 // Move insertion point backwards
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	531 if (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	532 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	533 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	534 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	535 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	536 case CTRL('F'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	537 // Move insertion point forwards
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	538 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	539 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	540 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	541 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	542 case CTRL('E'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	543 // Move insertion point to end of line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	544 while (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	545 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	546 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	547 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	548 case CTRL('A'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	549 // Move insertion point to beginning of line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	550 if (ip != buf) {
1419 fa9edbd9ccaa Fix ^A handling gthomas parents: 1122 diff changeset	551 xp = ip;
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	552 while (xp-- != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	553 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	554 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	555 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	556 ip = buf;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	557 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	558 case CTRL('K'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	559 // Kill to the end of line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	560 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	561 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	562 while (xp++ != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	563 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	564 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	565 while (--xp != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	566 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	567 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	568 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	569 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	570 break;
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	571 case CTRL('D'):
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	572 // Erase the character under the cursor
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	573 if (ip != eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	574 xp = ip;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	575 eol--;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	576 while (xp != eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	577 xp = (xp+1);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	578 mon_write_char(*xp++);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	579 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	580 mon_write_char(' '); // Erases last character
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	581 mon_write_char('\b');
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	582 while (xp-- != ip) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	583 mon_write_char('\b');
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	584 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	585 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	586 break;
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	587 #endif // CYGNUM_REDBOOT_CMD_LINE_EDITING
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	588 case CTRL('C'): // ^C
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	589 // Abort current input
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	590 diag_printf("^C\n");
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	591 *buf = '\0'; // Nothing useful in buffer
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	592 return _GETS_CTRLC;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	593 case '\n':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	594 case '\r':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	595 // If previous character was the "other" end-of-line, ignore this one
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	596 if (((c == '\n') && (last_ch == '\r')) \|\|
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	597 ((c == '\r') && (last_ch == '\n'))) {
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	598 c = '\0';
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	599 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	600 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	601 // End of line
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	602 if (console_echo) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	603 mon_write_char('\r');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	604 mon_write_char('\n');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	605 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	606 last_ch = c;
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	607 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	608 if (cmd_history) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	609 // History handling - only when enabled
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	610 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	611 expand_history(buf);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	612 #endif
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	613 if (*buf != '\0') {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	614 if (++_cl_index == _CL_NUM_LINES) _cl_index = 0;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	615 if (_cl_index > _cl_max_index) _cl_max_index = _cl_index;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	616 strcpy(_cl_lines[_cl_index], buf);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	617 }
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	618 }
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	619 #endif
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 128 diff changeset	620 return _GETS_OK;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	621 case '\b':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	622 case 0x7F: // DEL
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	623 if (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	624 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	625 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	626 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	627 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	628 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	629 while (xp != (eol-1)) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	630 xp = (xp+1);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	631 mon_write_char(*xp++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	632 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	633 mon_write_char(' '); // Erases last character
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	634 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	635 while (xp-- != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	636 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	637 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	638 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	639 if (console_echo) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	640 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	641 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	642 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	643 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	644 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	645 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	646 eol--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	647 #else
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	648 if (console_echo) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	649 mon_write_char('\b');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	650 mon_write_char(' ');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	651 mon_write_char('\b');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	652 }
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	653 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	654 eol--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	655 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	656 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	657 break;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	658 #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
178 aa8364213009 Merge from eCos master repository on 2001-08-15-01:50:29-BST jlarmour parents: 177 diff changeset	659 case '+': // fall through
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	660 case '$':
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	661 if (ip == buf \|\| last_ch != '\\')
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 172 diff changeset	662 {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	663 // Give up and try GDB protocol
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	664 ungetDebugChar(c); // Push back character so stubs will see it
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 128 diff changeset	665 return _GETS_GDB;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	666 }
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 182 diff changeset	667 if (last_ch == '\\') {
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	668 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	669 if (ip == eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	670 // Just save \$ as $
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	671 eol = --ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	672 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	673 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	674 *--ip = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	675 mon_write_char(c);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	676 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	677 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	678 #else
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	679 ip--; // Save \$ as $
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	680 #endif
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 182 diff changeset	681 }
178 aa8364213009 Merge from eCos master repository on 2001-08-15-01:50:29-BST jlarmour parents: 177 diff changeset	682 // else fall through
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	683 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	684 default:
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	685 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	686 // If the insertion point is not at the end of line, make space for it
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	687 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	688 xp = eol;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	689 *++eol = '\0';
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	690 while (xp != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	691 xp = (xp-1);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	692 xp--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	693 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	694 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	695 #endif
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	696 if (console_echo) {
2614 6cbecf3cc2e4 * src/fconfig.c, src/flash.c, src/io.c, src/load.c, src/main.c, jlarmour parents: 2066 diff changeset	697 mon_write_char((unsigned char)c);
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 126 diff changeset	698 }
194 feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	699 if (ip == eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	700 // Advance both pointers
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	701 *ip++ = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	702 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	703 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	704 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	705 // Just insert the character
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	706 *ip++ = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	707 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	708 while (xp != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	709 mon_write_char(*xp++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	710 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	711 while (xp-- != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	712 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	713 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	714 #endif
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST jlarmour parents: 191 diff changeset	715 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	716 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	717 last_ch = c;
406 7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full. jlarmour parents: 299 diff changeset	718 if (ip == buf + buflen - 1) { // Buffer full
7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full. jlarmour parents: 299 diff changeset	719 *ip = '\0';
158 f2545e5de153 Merge from eCos master repository on 2001-04-24-11:22:42-BST jlarmour parents: 156 diff changeset	720 return buflen;
406 7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full. jlarmour parents: 299 diff changeset	721 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	722 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	723 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	724
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	725 int
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	726 _rb_gets(char *buf, int buflen, int timeout)
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	727 {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	728 *buf = '\0'; // Empty buffer
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	729 return _rb_gets_preloaded(buf, buflen, timeout);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	730 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 194 diff changeset	731
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	732 static bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	733 _verify_action(int timeout, char *fmt, va_list ap)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	734 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	735 char ans[8];
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	736 int ret;
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 158 diff changeset	737 #ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	738 // Don't ask if we're executing a script
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	739 if (script && *script)
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	740 return 1;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	741 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	742
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	743 diag_vprintf(fmt, ap);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	744 diag_printf(" - continue (y/n)? ");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	745 if ((ret = _rb_gets(ans, sizeof(ans), timeout)) > 0) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	746 return ((ans[0] == 'y') \|\| (ans[0] == 'Y'));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	747 } else {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	748 if (ret == _GETS_TIMEOUT) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	749 diag_printf(" ** Timed out!\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	750 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	751 return 0; // Timed out or ^C
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	752 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	753 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	754
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	755 bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	756 verify_action(char *fmt, ...)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	757 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	758 va_list ap;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	759
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	760 va_start(ap, fmt);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	761 return _verify_action(0, fmt, ap);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	762 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	763
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	764 bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	765 verify_action_with_timeout(int timeout, char *fmt, ...)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	766 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	767 va_list ap;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	768
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	769 va_start(ap, fmt);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	770 return _verify_action(timeout, fmt, ap);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 196 diff changeset	771 }
1032 f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	772
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	773
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	774 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	775 // parse for history index number. Return number or -1 if not
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	776 // an index number.
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	777 static int
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	778 parse_history_index(char *s)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	779 {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	780 int val = 0;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	781
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	782 while ('0' <= s && s <= '9')
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	783 val = (val * 10) + (*s++ - '0');
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	784
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	785 if (*s)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	786 return -1;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	787
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	788 return val;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	789 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	790
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	791 // Check input line to see if it needs history expansion. If so,
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	792 // try to find matching command and replace buffer as appropriate.
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	793 static void
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	794 expand_history(char *buf)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	795 {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	796 int ncmds = _cl_max_index + 1;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	797 int i, index, len;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	798
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	799 if (buf[0] != '!' \|\| buf[1] == '\0')
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	800 return;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	801
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	802 if (ncmds > 0) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	803 if (!strcmp(buf, "!!")) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	804 strcpy(buf, _cl_lines[_cl_index]);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	805 return;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	806 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	807 if ((index = parse_history_index(buf + 1)) >= 0) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	808 if (index <= _cl_max_index) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	809 strcpy(buf, _cl_lines[index]);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	810 return;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	811 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	812 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	813 len = strlen(buf + 1);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	814 for (i = 0, index = _cl_index; i < ncmds; i++) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	815 if (!strncmp(_cl_lines[index], buf+1, len)) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	816 strcpy(buf, _cl_lines[index]);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	817 return;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	818 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	819 if (--index < 0)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	820 index = _cl_max_index;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	821 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	822 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	823
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	824 diag_printf("%s: event not found\n", buf);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	825 *buf = '\0';
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	826 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	827
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	828 static void
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	829 do_history(int argc, char *argv[])
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	830 {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	831 int ncmds = _cl_max_index + 1;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	832 int i, index;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	833
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	834 if (_cl_index == _cl_max_index) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	835 // history has not wrapped around
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	836 for (i = 0; i < ncmds; i++)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	837 diag_printf("%3d %s\n", i, _cl_lines[i]);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	838 } else {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	839 for (i = 0, index = _cl_index + 1; i < ncmds; i++) {
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	840 diag_printf("%3d %s\n", i, _cl_lines[index++]);
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	841 if (index > _cl_max_index)
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	842 index = 0;
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	843 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	844 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	845 }
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	846
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	847 RedBoot_cmd("history",
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	848 "Display command history",
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	849 "",
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	850 do_history
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	851 );
f5fa0e095f5e Add RedBoot command history msalter parents: 406 diff changeset	852 #endif // CYGBLD_REDBOOT_CMD_LINE_HISTORY

Mercurial > ecos

annotate packages/redboot/current/src/io.c @ 2614:6cbecf3cc2e4