summaryrefslogtreecommitdiffstats
path: root/main/common/chario.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/common/chario.c')
-rw-r--r--main/common/chario.c611
1 files changed, 315 insertions, 296 deletions
diff --git a/main/common/chario.c b/main/common/chario.c
index fb8fbae..d187e22 100644
--- a/main/common/chario.c
+++ b/main/common/chario.c
@@ -1,7 +1,7 @@
/**************************************************************************
*
* Copyright (c) 2013 Alcatel-Lucent
- *
+ *
* Alcatel Lucent licenses this file to You under the Apache License,
* Version 2.0 (the "License"); you may not use this file except in
* compliance with the License. A copy of the License is contained the
@@ -32,7 +32,7 @@
#include "ether.h"
#include "fbi.h"
-#define CTLC 0x03 /* control-c */
+#define CTLC 0x03 /* control-c */
int rawmode, ConsoleBaudRate;
@@ -50,9 +50,9 @@ int (*remoteWatchDog)(void);
* override the monitor's default putchar/getchar/gotachar functions.
* See comments above InitRemoteIO() function below for more info.
*/
-int (*remoterawon)(void);
+int (*remoterawon)(void);
int (*remoterawoff)(void);
-int (*remoteputchar)(int);
+int (*remoteputchar)(int);
int (*remotegetchar)(void);
int (*remotegotachar)(void);
@@ -64,101 +64,107 @@ static char console_echo_off;
void
console_echo(int enable)
{
- if (enable)
- console_echo_off = 0;
- else
- console_echo_off = 1;
+ if(enable) {
+ console_echo_off = 0;
+ } else {
+ console_echo_off = 1;
+ }
}
/* putchar():
- * Output a character to the stdout RS232 port.
+ * Output a character to the stdout RS232 port.
* If console_echo_off is set, then we DON'T send the
* character to the console.
*/
int
putchar(char c)
{
- /* If the remoteputchar function pointer is non-zero, then we
- * assume that the default putchar function has been overridden
- * by some overlaying application using mon_com(CHARFUNC_PUTCHAR,),
- * so we use that redefined function instead...
- */
- if (remoteputchar) {
- remoteputchar(c);
- return((int)c);
- }
-
- if (rawmode) {
- if (!console_echo_off)
- target_putchar(c);
- fbi_putchar(c);
- return((int)c);
- }
-
- /* If redirection is active, the redirect the character to a file
- * in TFS. Note that if INCLUDE_REDIRECT is 0, then this function
- * is NULL (see genlib.h).
- */
- RedirectCharacter(c);
-
- /* Call the target-specific function that puts the character out on
- * the console port (precede '\n' with '\r').
- * For each call to target_putchar(), call SendIPMonChar so that if
- * this output is generated by moncmd, it will be sent back to the
- * moncmd client. Note that if INCLUDE_ETHERNET is 0, then the
- * function SendIPMonChar is NULL (see ether.h).
- */
- if (c == '\n') {
- SendIPMonChar('\r',0);
- fbi_putchar('\r');
- if (!console_echo_off)
- target_putchar('\r');
- }
- SendIPMonChar(c,0);
- if (!console_echo_off)
- target_putchar(c);
- fbi_putchar(c);
- WATCHDOG_MACRO;
- return((int)c);
+ /* If the remoteputchar function pointer is non-zero, then we
+ * assume that the default putchar function has been overridden
+ * by some overlaying application using mon_com(CHARFUNC_PUTCHAR,),
+ * so we use that redefined function instead...
+ */
+ if(remoteputchar) {
+ remoteputchar(c);
+ return((int)c);
+ }
+
+ if(rawmode) {
+ if(!console_echo_off) {
+ target_putchar(c);
+ }
+ fbi_putchar(c);
+ return((int)c);
+ }
+
+ /* If redirection is active, the redirect the character to a file
+ * in TFS. Note that if INCLUDE_REDIRECT is 0, then this function
+ * is NULL (see genlib.h).
+ */
+ RedirectCharacter(c);
+
+ /* Call the target-specific function that puts the character out on
+ * the console port (precede '\n' with '\r').
+ * For each call to target_putchar(), call SendIPMonChar so that if
+ * this output is generated by moncmd, it will be sent back to the
+ * moncmd client. Note that if INCLUDE_ETHERNET is 0, then the
+ * function SendIPMonChar is NULL (see ether.h).
+ */
+ if(c == '\n') {
+ SendIPMonChar('\r',0);
+ fbi_putchar('\r');
+ if(!console_echo_off) {
+ target_putchar('\r');
+ }
+ }
+ SendIPMonChar(c,0);
+ if(!console_echo_off) {
+ target_putchar(c);
+ }
+ fbi_putchar(c);
+ WATCHDOG_MACRO;
+ return((int)c);
}
-int
+int
getchar(void)
{
- /* If the remotegetchar function pointer is non-zero, then we
- * assume that the default getchar function has been overridden
- * by some overlaying application using mon_com(CHARFUNC_GETCHAR,),
- * so we use that redefined function instead...
- */
- if (remotegetchar)
+ /* If the remotegetchar function pointer is non-zero, then we
+ * assume that the default getchar function has been overridden
+ * by some overlaying application using mon_com(CHARFUNC_GETCHAR,),
+ * so we use that redefined function instead...
+ */
+ if(remotegetchar) {
return(remotegetchar());
-
- while(!gotachar()) {
- /* While waiting for an incoming character, call pollethernet()
- * to process any incoming packets. Note that if INCLUDE_ETHERNET
- * is 0 in config.h, then this function is NULL (see ether.h).
- */
- WATCHDOG_MACRO;
- pollethernet();
- }
-
- return(target_getchar());
+ }
+
+ while(!gotachar()) {
+ /* While waiting for an incoming character, call pollethernet()
+ * to process any incoming packets. Note that if INCLUDE_ETHERNET
+ * is 0 in config.h, then this function is NULL (see ether.h).
+ */
+ WATCHDOG_MACRO;
+ pollethernet();
+ }
+
+ return(target_getchar());
}
int
gotachar(void)
{
- /* If the remotegotachar function pointer is non-zero, then we
- * assume that the default gotachar function has been overridden
- * by some overlaying application using mon_com(CHARFUNC_GOTACHAR,),
- * so we use that redefined function instead...
- */
- if (remotegotachar)
+ /* If the remotegotachar function pointer is non-zero, then we
+ * assume that the default gotachar function has been overridden
+ * by some overlaying application using mon_com(CHARFUNC_GOTACHAR,),
+ * so we use that redefined function instead...
+ */
+ if(remotegotachar) {
return(remotegotachar());
-
- fbi_cursor();
- WATCHDOG_MACRO;
- return(target_gotachar());
+ }
+
+ fbi_cursor();
+ WATCHDOG_MACRO;
+ return(target_gotachar());
}
/* flush_console_out():
@@ -168,28 +174,30 @@ gotachar(void)
void
flush_console_out(void)
{
- int timeout = 0;
+ int timeout = 0;
- if (remoteputchar)
+ if(remoteputchar) {
return;
-
- while(timeout++ < 50000) {
- if (target_console_empty()) {
- monDelay(10);
- break;
- }
- }
+ }
+
+ while(timeout++ < 50000) {
+ if(target_console_empty()) {
+ monDelay(10);
+ break;
+ }
+ }
}
/* flush_console_in(void):
- * While there is input queued up from the console,
+ * While there is input queued up from the console,
* flush it to the bit bucket...
*/
void
flush_console_in(void)
{
- while(gotachar())
- getchar();
+ while(gotachar()) {
+ getchar();
+ }
}
@@ -204,21 +212,23 @@ flush_console_in(void)
void
rawon(void)
{
- if (remoterawon)
+ if(remoterawon) {
remoterawon();
- rawmode = 1;
+ }
+ rawmode = 1;
}
void
rawoff(void)
{
- if (remoterawoff)
+ if(remoterawoff) {
remoterawoff();
- rawmode = 0;
+ }
+ rawmode = 0;
}
/* puts() & putstr():
- * Two string-output functions.
+ * Two string-output functions.
* puts: normal "puts" as is available in standard c libs.
* putstr: same as "puts", but no ending newline.
*/
@@ -226,17 +236,17 @@ rawoff(void)
void
putstr(char *string)
{
- while(*string) {
- putchar(*string);
- string++;
- }
+ while(*string) {
+ putchar(*string);
+ string++;
+ }
}
void
puts(char *string)
{
- putstr(string);
- putchar('\n');
+ putstr(string);
+ putchar('\n');
}
@@ -245,9 +255,9 @@ puts(char *string)
* This function is accessed through the getline_xx functions
* below.
* Args...
- * buf: pointer to buffer to be used to place the incoming characters.
- * max: size of the buffer.
- * ledit: if set, then allow the line-editor to be used if ESC is input.
+ * buf: pointer to buffer to be used to place the incoming characters.
+ * max: size of the buffer.
+ * ledit: if set, then allow the line-editor to be used if ESC is input.
* timeout: if positive, then after 'timeout' number of seconds waiting
* per character, giveup.
* if negative, then after 'timeout' number of seconds waiting
@@ -259,132 +269,135 @@ puts(char *string)
int
getfullline(char *buf,int max,int ledit, int timeout,char *prefill, int echo)
{
- char *base;
- struct elapsed_tmr tmr;
- static unsigned char crlf;
- int tot, idx, cumulativetimeout;
-
- cumulativetimeout = 0;
- tot = idx = 0;
- base = buf;
- max -= 1; /* Make sure there is space for the null terminator. */
-
- if (prefill) {
- strcpy(base,prefill);
- tot = strlen(prefill);
- putstr(prefill);
- buf += tot;
- idx = tot;
- }
-
- /* If the timeout parameter is negative, then assume that this is
- * to be run with a cumulative timeout rather than a timeout that
- * is re-started after each character...
- */
- if (timeout < 0) {
- cumulativetimeout = 1;
- timeout = abs(timeout);
- }
-
- for(;idx<max;idx++) {
- if (timeout > 0) {
- startElapsedTimer(&tmr,timeout);
- while(!msecElapsed(&tmr)) {
- if (gotachar())
- break;
- pollethernet();
- }
- if (cumulativetimeout)
- timeout = msecRemaining(&tmr);
-
- if (ELAPSED_TIMEOUT(&tmr)) {
- *buf = 0;
- return(-1); /* Return negative to indicate timeout */
- }
- }
- if (cumulativetimeout && timeout == 0) {
- *buf = 0;
- return(-1);
- }
-
- *buf = (char)getchar();
-
- if (getenv("CLI_HEXOUT"))
- printf("<%02x>",*buf);
-
- if (!*buf) {
- idx--;
- continue;
- }
+ char *base;
+ struct elapsed_tmr tmr;
+ static unsigned char crlf;
+ int tot, idx, cumulativetimeout;
+
+ cumulativetimeout = 0;
+ tot = idx = 0;
+ base = buf;
+ max -= 1; /* Make sure there is space for the null terminator. */
+
+ if(prefill) {
+ strcpy(base,prefill);
+ tot = strlen(prefill);
+ putstr(prefill);
+ buf += tot;
+ idx = tot;
+ }
+
+ /* If the timeout parameter is negative, then assume that this is
+ * to be run with a cumulative timeout rather than a timeout that
+ * is re-started after each character...
+ */
+ if(timeout < 0) {
+ cumulativetimeout = 1;
+ timeout = abs(timeout);
+ }
+
+ for(; idx<max; idx++) {
+ if(timeout > 0) {
+ startElapsedTimer(&tmr,timeout);
+ while(!msecElapsed(&tmr)) {
+ if(gotachar()) {
+ break;
+ }
+ pollethernet();
+ }
+ if(cumulativetimeout) {
+ timeout = msecRemaining(&tmr);
+ }
+
+ if(ELAPSED_TIMEOUT(&tmr)) {
+ *buf = 0;
+ return(-1); /* Return negative to indicate timeout */
+ }
+ }
+ if(cumulativetimeout && timeout == 0) {
+ *buf = 0;
+ return(-1);
+ }
+
+ *buf = (char)getchar();
+
+ if(getenv("CLI_HEXOUT")) {
+ printf("<%02x>",*buf);
+ }
+
+ if(!*buf) {
+ idx--;
+ continue;
+ }
#if INCLUDE_LINEEDIT
- if ((*buf == 0x1b) && (ledit)) {
- (void)line_edit(base);
- break;
- }
- else
+ if((*buf == 0x1b) && (ledit)) {
+ (void)line_edit(base);
+ break;
+ } else
#endif
- {
- if ((*buf == '\r') || (*buf == '\n')) {
- if ((crlf) && (*buf != crlf)) {
- crlf = 0;
- continue;
- }
- puts("\r");
- crlf = *buf;
- *buf = 0;
- break;
- }
- if (*buf == '\b' || *buf == 0x7f) {
- if (tot) {
- idx -= 2;
- buf--;
- tot--;
- if (echo)
- putstr("\b \b");
- }
- }
- else if (*buf == CTLC) {
- puts("^C");
- *base = 0;
- return(0);
- }
- else {
- if (echo)
- putchar(*buf);
- tot++;
- buf++;
- }
- crlf = 0;
- }
- }
- if (idx == max) {
- printf((char *)"\007\nInput too long (exceeds %d bytes).\n",max);
- *buf = 0;
- return(0);
- }
+ {
+ if((*buf == '\r') || (*buf == '\n')) {
+ if((crlf) && (*buf != crlf)) {
+ crlf = 0;
+ continue;
+ }
+ puts("\r");
+ crlf = *buf;
+ *buf = 0;
+ break;
+ }
+ if(*buf == '\b' || *buf == 0x7f) {
+ if(tot) {
+ idx -= 2;
+ buf--;
+ tot--;
+ if(echo) {
+ putstr("\b \b");
+ }
+ }
+ } else if(*buf == CTLC) {
+ puts("^C");
+ *base = 0;
+ return(0);
+ } else {
+ if(echo) {
+ putchar(*buf);
+ }
+ tot++;
+ buf++;
+ }
+ crlf = 0;
+ }
+ }
+ if(idx == max) {
+ printf((char *)"\007\nInput too long (exceeds %d bytes).\n",max);
+ *buf = 0;
+ return(0);
+ }
#if INCLUDE_LINEEDIT
- if (ledit)
- historylog(base);
+ if(ledit) {
+ historylog(base);
+ }
#endif
- return(strlen(base));
+ return(strlen(base));
}
int
getline(char *buf, int max, int ledit)
{
- return(getfullline(buf,max,ledit,0,0,1));
+ return(getfullline(buf,max,ledit,0,0,1));
}
int
getline_t(char *buf, int max, int timeout)
{
- return(getfullline(buf,max,0,timeout,0,1));
+ return(getfullline(buf,max,0,timeout,0,1));
}
int
getline_p(char *buf, int max, int ledit, char *prefill)
{
- return(getfullline(buf,max,ledit,0,prefill,1));
+ return(getfullline(buf,max,ledit,0,prefill,1));
}
/* getpass():
@@ -393,16 +406,17 @@ getline_p(char *buf, int max, int ledit, char *prefill)
char *
getpass(char *prompt,char *buf,int max, int timeout)
{
- putstr(prompt);
- if (getfullline(buf,max,0,timeout*1000,0,0) == -1)
- putchar('\n');
- return(buf);
+ putstr(prompt);
+ if(getfullline(buf,max,0,timeout*1000,0,0) == -1) {
+ putchar('\n');
+ }
+ return(buf);
}
#endif
/* getbytes():
- * Similar to gets() except that the caller specifies the number
- * of characters and whether or not to block.
+ * Similar to gets() except that the caller specifies the number
+ * of characters and whether or not to block.
* If the copy to the buffer fails, abort and return the current
* count.
*/
@@ -410,119 +424,124 @@ getpass(char *prompt,char *buf,int max, int timeout)
int
getbytes(char *buf,int cnt,int block)
{
- int i;
- volatile char *bp;
- char c;
-
- bp = (volatile char *)buf;
-
- for(i=0;i<cnt;i++) {
- if (!block && !gotachar())
- break;
- c = (char)getchar();
- *bp = c;
- if (*bp != c)
- break;
- bp++;
- }
- return(i);
+ int i;
+ volatile char *bp;
+ char c;
+
+ bp = (volatile char *)buf;
+
+ for(i=0; i<cnt; i++) {
+ if(!block && !gotachar()) {
+ break;
+ }
+ c = (char)getchar();
+ *bp = c;
+ if(*bp != c) {
+ break;
+ }
+ bp++;
+ }
+ return(i);
}
/* getbytes_t():
- * Similar to getbytes() except that the caller specifies the allowed
+ * Similar to getbytes() except that the caller specifies the allowed
* timeout between two consecutive bytes received.
* If the copy to the buffer fails, or timeout occures, abort and return
- * the current count.
+ * the current count.
*/
int
getbytes_t(char *buf,int cnt,int timeout)
{
- int i;
- struct elapsed_tmr tmr;
- volatile char *bp;
- char c;
-
- bp = (volatile char *)buf;
-
- for(i=0;i<cnt;i++) {
- if (!gotachar()) {
- startElapsedTimer(&tmr,timeout);
- while(!gotachar() && !msecElapsed(&tmr));
- if (!gotachar())
- break;
- }
- c = (char)getchar();
- *bp = c;
- if (*bp != c)
- break;
- bp++;
- }
- return(i);
+ int i;
+ struct elapsed_tmr tmr;
+ volatile char *bp;
+ char c;
+
+ bp = (volatile char *)buf;
+
+ for(i=0; i<cnt; i++) {
+ if(!gotachar()) {
+ startElapsedTimer(&tmr,timeout);
+ while(!gotachar() && !msecElapsed(&tmr));
+ if(!gotachar()) {
+ break;
+ }
+ }
+ c = (char)getchar();
+ *bp = c;
+ if(*bp != c) {
+ break;
+ }
+ bp++;
+ }
+ return(i);
}
int
putbytes(char *buf, int cnt)
{
- char *end;
+ char *end;
- end = buf + cnt;
+ end = buf + cnt;
- while(buf < end) {
- putchar(*buf++);
- }
- return(cnt);
+ while(buf < end) {
+ putchar(*buf++);
+ }
+ return(cnt);
}
int
askuser(char *msg)
{
- int yes, len;
+ int yes, len;
#if INCLUDE_MONCMD
- /* If command was issued from UDP (i.e. moncmd), then
- * immediately return 1...
- */
- if (IPMonCmdActive)
- return(1);
+ /* If command was issued from UDP (i.e. moncmd), then
+ * immediately return 1...
+ */
+ if(IPMonCmdActive) {
+ return(1);
+ }
#endif
- putstr(msg);
- len = strlen(msg);
- switch((char)getchar()) {
- case ' ':
- case 'y':
- case '\r':
- case '\n':
- yes = 1;
- break;
- default:
- yes = 0;
- break;
- }
- while(len) {
- putstr("\b \b");
- len--;
- }
- return(yes);
+ putstr(msg);
+ len = strlen(msg);
+ switch((char)getchar()) {
+ case ' ':
+ case 'y':
+ case '\r':
+ case '\n':
+ yes = 1;
+ break;
+ default:
+ yes = 0;
+ break;
+ }
+ while(len) {
+ putstr("\b \b");
+ len--;
+ }
+ return(yes);
}
int
More(void)
{
- return(askuser((char *)"more?"));
+ return(askuser((char *)"more?"));
}
int
hitakey(void)
{
- return(askuser((char *)"hit any key to continue..."));
+ return(askuser((char *)"hit any key to continue..."));
}
/* RemoteIO functions:
* The idea of "remote io" is to allow the monitor commands to still
* run when the application has taken over the system. The monitor's
- * connection to the serial port is a simple polled interface. When
+ * connection to the serial port is a simple polled interface. When
* the application comes up, it is very likely that it will overlay a
* new driver onto the serial port. If this happens, and the user at
* the console interface of the application wants to execute a monitor
@@ -534,10 +553,10 @@ hitakey(void)
void
InitRemoteIO(void)
{
- /* Null out the remote put/getchar functions. */
- remoterawon = 0;
- remoterawoff = 0;
- remoteputchar = 0;
- remotegetchar = 0;
- remotegotachar = 0;
+ /* Null out the remote put/getchar functions. */
+ remoterawon = 0;
+ remoterawoff = 0;
+ remoteputchar = 0;
+ remotegetchar = 0;
+ remotegotachar = 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 08:24:43 +0000