Mercurial > flash_v2

annotate packages/redboot/current/src/io.c @ 1734:6aedf0a683e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/flash.c (do_flash_init): We need info independent of CYGNUM_REDBOOT_FLASH_BASE being set or not.
author asl
date Wed, 06 Oct 2004 09:49:55 +0000
parents fa9edbd9ccaa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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.
1122
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
12 // Copyright (C) 2002, 2003 Gary Thomas
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
13 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
14 // 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
15 // 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
16 // 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
17 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
18 // 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
19 // 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
20 // 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
21 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
22 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
23 // 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
24 // 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
25 // 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
26 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
27 // 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
28 // 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
29 // 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
30 // 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
31 // 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
32 // 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
33 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
34 // 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
35 // 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
36 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
37 // 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
38 // 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
39 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
40 //####ECOSGPLCOPYRIGHTEND####
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
41 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
42 //#####DESCRIPTIONBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
43 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
44 // Author(s): gthomas
165
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
45 // Contributors: gthomas,hmt,jlarmour
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
46 // Date: 2000-07-14
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
47 // Purpose:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
48 // Description:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
49 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
50 // 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
51 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
52 //####DESCRIPTIONEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
53 //
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 #include "redboot.h"
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
57
162
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents: 161
diff changeset
58 #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
59 // GDB interface functions
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
60 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
61 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
62
165
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
63 static void
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
64 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
65
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
66 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
67 RedBoot_cmd("channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
68 "Display/switch console channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
69 "[-1|<channel number>]",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
70 do_channel
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
71 );
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
72 #else
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
73 RedBoot_cmd("channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
74 "Display/switch console channel",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
75 "[<channel number>]",
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
76 do_channel
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
77 );
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
78 #endif
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
79
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
80 static void
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
81 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
82 {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
83 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
84
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
85 if (argc == 2) {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
86 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
87 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
88 console_selected = false;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
89 console_echo = true;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
90 } else
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
91 #endif
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
92 {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
93 unsigned long chan;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
94 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
95 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
96 } else {
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
97 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
98 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
99 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
100 if (chan != cur)
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
101 console_echo = true;
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
102 }
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
103 else {
182
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents: 179
diff changeset
104 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
105 }
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 /* else display */
d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST
jlarmour
parents: 162
diff changeset
110 else {
182
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents: 179
diff changeset
111 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
112 #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
113 if (!console_selected)
182
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents: 179
diff changeset
114 diag_printf("-1\n");
169
11b54a94cf58 Merge from eCos master repository on 2001-07-06-06:43:02-BST
jlarmour
parents: 165
diff changeset
115 else
11b54a94cf58 Merge from eCos master repository on 2001-07-06-06:43:02-BST
jlarmour
parents: 165
diff changeset
116 #endif
182
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents: 179
diff changeset
117 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
118 }
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
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
121 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
122 mon_write_char(char c)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
123 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
124 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
125
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
126 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
127 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
128 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
129 int i;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
130 // Send output to all channels
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
131 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
132 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
133 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
134 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
135 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
136 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
137 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
138 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
139 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
140 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
141 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
142 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
143 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
144 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
145 CYGACC_COMM_IF_PUTC(*__chan, c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
146 }
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 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
151 mon_read_char(char *c)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
152 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
153 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
154
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
155 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
156 *c = CYGACC_COMM_IF_GETC(*__chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
157 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
158 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
159 *c = CYGACC_COMM_IF_GETC(*__chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
160 }
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
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
163 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
164 static int _mon_timeout;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
165 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
166
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
167 static bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
168 mon_read_char_with_timeout(char *c)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
169 {
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
170 bool res = false;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
171 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
172
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
173 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
174 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
175 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
176 int i, j, tot;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
177 // 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
178 tot = 0;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
179 while (tot < _mon_timeout) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
180 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
181 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
182 __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
183 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
184 if (res) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
185 // 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
186 if (*c != '\0') {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
187 // 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
188 console_selected = true;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
189 CYGACC_CALL_IF_SET_DEBUG_COMM(i);
238
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
190 // Disable interrupts on all channels but this one
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
191 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
192 if (i != j) {
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
193 CYGACC_CALL_IF_SET_CONSOLE_COMM(j);
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
194 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
195 CYGACC_COMM_IF_CONTROL(*__chan, __COMMCTL_IRQ_DISABLE);
ee09240e2d36 Disable interrupts on all but the console port.
gthomas
parents: 210
diff changeset
196 }
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 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
199 return res;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
200 }
126
518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST
jlarmour
parents: 115
diff changeset
201 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
202 }
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 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
205 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
206 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
207 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
208 __chan = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
209 if (__chan)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
210 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
211 else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
212 __chan = CYGACC_CALL_IF_DEBUG_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
213 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
214 }
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 return res;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
217 }
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 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
220 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
221 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
222 hal_virtual_comm_table_t *__chan;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
223
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
224 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
225 if (!console_selected) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
226 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
227 int i;
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
228 // 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
229 _mon_timeout = ms;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
230 ms = 1;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
231 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
232 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
233 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
234 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
235 }
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 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
238 } else
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
239 #endif
172
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents: 169
diff changeset
240 {
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents: 169
diff changeset
241 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
242 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
243 }
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents: 169
diff changeset
244 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
245 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
246 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
247 }
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
1122
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
250 //
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
251 // 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
252 //
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
253 bool
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
254 _rb_break(int timeout)
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
255 {
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
256 char c;
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
257 mon_set_read_char_timeout(timeout);
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
258 if (mon_read_char_with_timeout(&c)) {
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
259 if (c == 0x03) { // Test for ^C
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
260 return true;
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
261 }
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 return false;
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
264 }
92e31da869cc Add ^C abort functionality to BOOTP and PING operations.
gthomas
parents: 1032
diff changeset
265
179
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
266 #ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
267 #define __STRINGIFY(x) #x
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
268 #define _STRINGIFY(x) __STRINGIFY(x)
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
269 #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
270
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 // Read a character from script.
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
273 // 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
274 //
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
275 static int
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
276 getc_script(char *cp)
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
277 {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
278 static bool newline = true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
279 bool skip;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
280
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
281 while (script && *script) {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
282 if (newline && *script == '{') {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
283 skip = false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
284 ++script;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
285
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
286 // 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
287 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
288 skip = true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
289
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
290 // skip past "{...}"
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
291 while (*script && *script++ != '}')
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
292 ;
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 // skip script line if neccessary
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
295 if (skip) {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
296 while (*script && *script++ != '\n')
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
297 ;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
298 } else
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
299 newline = false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
300
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
301 } else {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
302 *cp = *script++;
264
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts.
gthomas
parents: 239
diff changeset
303 if (*cp == '\n') {
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts.
gthomas
parents: 239
diff changeset
304 newline = true;
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts.
gthomas
parents: 239
diff changeset
305 } else {
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts.
gthomas
parents: 239
diff changeset
306 newline = false;
57f3c72256bb Reorg CLI functions into separate files. Update CDL. Fix macros in scripts.
gthomas
parents: 239
diff changeset
307 }
179
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
308 return true;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
309 }
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 return false;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
312 }
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
313 #endif
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
314
1032
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
315 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
316 #define _CL_NUM_LINES CYGNUM_REDBOOT_CMD_LINE_EDITING // Number of lines to keep
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
317 static char _cl_lines[_CL_NUM_LINES][CYGPKG_REDBOOT_MAX_CMD_LINE];
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
318 static int _cl_index = -1; // Last known command line
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
319 static int _cl_max_index = -1; // Last command in buffers
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
320
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
321 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
322 static void expand_history(char *);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
323 #endif
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
324 #endif
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
325
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
326 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
327 // 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
328 // Return:
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
329 // _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
330 // _GETS_GDB: '$' (GDB lead-in)
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
331 // _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
332 // _GETS_CTRLC: ^C typed
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
333 //
1032
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
334 // if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
335 // Command line history support
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
336 // ^P - Select previous line from history
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
337 // ^N - Select next line from history
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
338 // ^A - Move insertion [cursor] to start of line
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
339 // ^E - Move cursor to end of line
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
340 // ^B - Move cursor back [previous character]
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
341 // ^F - Move cursor forward [next character]
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
342 //
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
343 int
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
344 _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
345 {
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
346 char *ip = buf; // Insertion point
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
347 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
348 char c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
349 bool res = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
350 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
351 int _timeout;
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
352 #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
353 int _index = _cl_index; // Last saved line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
354 char *xp;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
355 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
356
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
357 // Display current buffer data
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
358 while (*eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
359 mon_write_char(*eol++);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
360 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
361 ip = eol;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
362
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
363 while (true) {
159
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST
jlarmour
parents: 158
diff changeset
364 #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
365 if (getc_script(&c))
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
366 do_idle(false);
179
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents: 178
diff changeset
367 else
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
368 #endif
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
369 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
370 #define MIN_TIMEOUT 50
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents: 195
diff changeset
371 _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
372 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
373 while (timeout > 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
374 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
375 if (res) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
376 // Got a character
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
377 do_idle(false);
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
378 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
379 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents: 195
diff changeset
380 timeout -= _timeout;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
381 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
382 if (res == false) {
156
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents: 149
diff changeset
383 do_idle(true);
143
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents: 128
diff changeset
384 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
385 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
386 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
387 mon_read_char(&c);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
388 }
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
389 *eol = '\0';
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
390 switch (c) {
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
391 #define CTRL(c) ((c)&0x1F)
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
392 #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
393 case CTRL('P'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
394 // 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
395 if (_index >= 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
396 // Erase the previous line [crude]
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
397 while (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
398 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
399 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
400 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
401 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
402 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
403 strcpy(buf, _cl_lines[_index]);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
404 while (*ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
405 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
406 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
407 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
408 // Move to previous line
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
409 _index--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
410 if (_index < 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
411 _index = _cl_max_index;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
412 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
413 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
414 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
415 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
416 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
417 case CTRL('N'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
418 // 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
419 if (_index >= 0) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
420 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
421 // Erase the previous line [crude]
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
422 while (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
423 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
424 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
425 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
426 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
427 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
428 strcpy(buf, _cl_lines[_index]);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
429 while (*ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
430 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
431 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
432 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
433 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
434 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
435 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
436 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
437 case CTRL('B'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
438 // Move insertion point backwards
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
439 if (ip != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
440 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
441 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
442 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
443 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
444 case CTRL('F'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
445 // Move insertion point forwards
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
446 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
447 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
448 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
449 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
450 case CTRL('E'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
451 // 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
452 while (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
453 mon_write_char(*ip++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
454 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
455 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
456 case CTRL('A'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
457 // 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
458 if (ip != buf) {
1419
fa9edbd9ccaa Fix ^A handling
gthomas
parents: 1122
diff changeset
459 xp = ip;
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
460 while (xp-- != buf) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
461 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
462 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
463 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
464 ip = buf;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
465 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
466 case CTRL('K'):
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
467 // 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
468 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
469 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
470 while (xp++ != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
471 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
472 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
473 while (--xp != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
474 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
475 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
476 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
477 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
478 break;
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
479 case CTRL('D'):
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
480 // 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
481 if (ip != eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
482 xp = ip;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
483 eol--;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
484 while (xp != eol) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
485 *xp = *(xp+1);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
486 mon_write_char(*xp++);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
487 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
488 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
489 mon_write_char('\b');
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
490 while (xp-- != ip) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
491 mon_write_char('\b');
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
492 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
493 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
494 break;
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
495 #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
496 case CTRL('C'): // ^C
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
497 // Abort current input
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
498 diag_printf("^C\n");
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents: 195
diff changeset
499 *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
500 return _GETS_CTRLC;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
501 case '\n':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
502 case '\r':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
503 // 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
504 if (((c == '\n') && (last_ch == '\r')) ||
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
505 ((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
506 c = '\0';
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
507 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
508 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
509 // End of line
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
510 if (console_echo) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
511 mon_write_char('\r');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
512 mon_write_char('\n');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
513 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
514 last_ch = c;
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
515 #if CYGNUM_REDBOOT_CMD_LINE_EDITING != 0
1032
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
516 if (cmd_history) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
517 // History handling - only when enabled
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
518 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
519 expand_history(buf);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
520 #endif
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
521 if (*buf != '\0') {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
522 if (++_cl_index == _CL_NUM_LINES) _cl_index = 0;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
523 if (_cl_index > _cl_max_index) _cl_max_index = _cl_index;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
524 strcpy(_cl_lines[_cl_index], buf);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
525 }
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
526 }
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
527 #endif
143
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents: 128
diff changeset
528 return _GETS_OK;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
529 case '\b':
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
530 case 0x7F: // DEL
194
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 #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
533 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
534 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
535 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
536 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
537 while (xp != (eol-1)) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
538 *xp = *(xp+1);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
539 mon_write_char(*xp++);
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 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
542 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
543 while (xp-- != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
544 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
545 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
546 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
547 if (console_echo) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
548 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
549 mon_write_char(' ');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
550 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
551 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
552 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
553 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
554 eol--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
555 #else
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
556 if (console_echo) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
557 mon_write_char('\b');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
558 mon_write_char(' ');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
559 mon_write_char('\b');
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
560 }
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
561 ip--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
562 eol--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
563 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
564 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
565 break;
182
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents: 179
diff changeset
566 #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
567 case '+': // fall through
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
568 case '$':
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
569 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
570 {
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
571 // Give up and try GDB protocol
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
572 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
573 return _GETS_GDB;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
574 }
191
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents: 182
diff changeset
575 if (last_ch == '\\') {
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
576 #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
577 if (ip == eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
578 // Just save \$ as $
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
579 eol = --ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
580 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
581 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
582 *--ip = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
583 mon_write_char(c);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
584 break;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
585 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
586 #else
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
587 ip--; // Save \$ as $
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
588 #endif
191
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents: 182
diff changeset
589 }
178
aa8364213009 Merge from eCos master repository on 2001-08-15-01:50:29-BST
jlarmour
parents: 177
diff changeset
590 // else fall through
162
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents: 161
diff changeset
591 #endif
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
592 default:
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
593 #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
594 // 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
595 if (ip != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
596 xp = eol;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
597 *++eol = '\0';
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
598 while (xp != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
599 *xp = *(xp-1);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
600 xp--;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
601 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
602 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
603 #endif
128
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
604 if (console_echo) {
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
605 mon_write_char(c);
0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST
jlarmour
parents: 126
diff changeset
606 }
194
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
607 if (ip == eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
608 // Advance both pointers
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
609 *ip++ = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
610 eol = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
611 #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
612 } else {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
613 // Just insert the character
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
614 *ip++ = c;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
615 xp = ip;
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
616 while (xp != eol) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
617 mon_write_char(*xp++);
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
618 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
619 while (xp-- != ip) {
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
620 mon_write_char('\b');
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
621 }
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
622 #endif
feb0fcf83327 Merge from eCos master repository on 2001-10-26-06:43:03-BST
jlarmour
parents: 191
diff changeset
623 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
624 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
625 last_ch = c;
406
7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full.
jlarmour
parents: 299
diff changeset
626 if (ip == buf + buflen - 1) { // Buffer full
7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full.
jlarmour
parents: 299
diff changeset
627 *ip = '\0';
158
f2545e5de153 Merge from eCos master repository on 2001-04-24-11:22:42-BST
jlarmour
parents: 156
diff changeset
628 return buflen;
406
7f858e6dff42 * src/io.c (_rb_gets_preloaded): Null terminate when buffer full.
jlarmour
parents: 299
diff changeset
629 }
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
630 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
631 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
632
195
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
633 int
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
634 _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
635 {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
636 *buf = '\0'; // Empty buffer
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
637 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
638 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents: 194
diff changeset
639
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
640 static bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
641 _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
642 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
643 char ans[8];
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
644 int ret;
159
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST
jlarmour
parents: 158
diff changeset
645 #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
646 // 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
647 if (script && *script)
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST
jlarmour
parents: 159
diff changeset
648 return 1;
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
649 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
650
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
651 diag_vprintf(fmt, ap);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
652 diag_printf(" - continue (y/n)? ");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
653 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
654 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
655 } else {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
656 if (ret == _GETS_TIMEOUT) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
657 diag_printf(" ** Timed out!\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
658 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
659 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
660 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
661 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
662
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
663 bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
664 verify_action(char *fmt, ...)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
665 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
666 va_list ap;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
667
115
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff changeset
668 va_start(ap, fmt);
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
669 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
670 }
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
671
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
672 bool
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
673 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
674 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
675 va_list ap;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
676
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
677 va_start(ap, fmt);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 196
diff changeset
678 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
679 }
1032
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
680
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
681
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
682 #ifdef CYGBLD_REDBOOT_CMD_LINE_HISTORY
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
683 // parse for history index number. Return number or -1 if not
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
684 // an index number.
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
685 static int
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
686 parse_history_index(char *s)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
687 {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
688 int val = 0;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
689
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
690 while ('0' <= *s && *s <= '9')
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
691 val = (val * 10) + (*s++ - '0');
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
692
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
693 if (*s)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
694 return -1;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
695
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
696 return val;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
697 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
698
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
699 // Check input line to see if it needs history expansion. If so,
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
700 // try to find matching command and replace buffer as appropriate.
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
701 static void
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
702 expand_history(char *buf)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
703 {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
704 int ncmds = _cl_max_index + 1;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
705 int i, index, len;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
706
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
707 if (buf[0] != '!' || buf[1] == '\0')
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
708 return;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
709
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
710 if (ncmds > 0) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
711 if (!strcmp(buf, "!!")) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
712 strcpy(buf, _cl_lines[_cl_index]);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
713 return;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
714 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
715 if ((index = parse_history_index(buf + 1)) >= 0) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
716 if (index <= _cl_max_index) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
717 strcpy(buf, _cl_lines[index]);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
718 return;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
719 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
720 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
721 len = strlen(buf + 1);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
722 for (i = 0, index = _cl_index; i < ncmds; i++) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
723 if (!strncmp(_cl_lines[index], buf+1, len)) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
724 strcpy(buf, _cl_lines[index]);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
725 return;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
726 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
727 if (--index < 0)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
728 index = _cl_max_index;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
729 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
730 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
731
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
732 diag_printf("%s: event not found\n", buf);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
733 *buf = '\0';
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
734 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
735
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
736 static void
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
737 do_history(int argc, char *argv[])
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
738 {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
739 int ncmds = _cl_max_index + 1;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
740 int i, index;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
741
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
742 if (_cl_index == _cl_max_index) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
743 // history has not wrapped around
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
744 for (i = 0; i < ncmds; i++)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
745 diag_printf("%3d %s\n", i, _cl_lines[i]);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
746 } else {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
747 for (i = 0, index = _cl_index + 1; i < ncmds; i++) {
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
748 diag_printf("%3d %s\n", i, _cl_lines[index++]);
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
749 if (index > _cl_max_index)
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
750 index = 0;
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
751 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
752 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
753 }
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
754
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
755 RedBoot_cmd("history",
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
756 "Display command history",
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
757 "",
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
758 do_history
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
759 );
f5fa0e095f5e Add RedBoot command history
msalter
parents: 406
diff changeset
760 #endif // CYGBLD_REDBOOT_CMD_LINE_HISTORY