git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6262 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 4 insertions, 4 deletions

diff --git a/os/various/chprintf.c b/os/various/chprintf.c
index d712b98ab..787b6c7ab 100644
--- a/os/various/chprintf.c
+++ b/os/various/chprintf.c
@@ -109,7 +109,7 @@ void chprintf(BaseSequentialStream *chp, const char *fmt, ...) {
   va_list ap;

   char *p, *s, c, filler;

   int i, precision, width;

-  bool_t is_long, left_align;

+  bool is_long, left_align;

   long l;

 #if CHPRINTF_USE_FLOAT

   float f;

diff --git a/os/various/shell.c b/os/various/shell.c
index 907d6c187..62ffc5ce1 100644
--- a/os/various/shell.c
+++ b/os/various/shell.c
@@ -76,7 +76,7 @@ static void cmd_info(BaseSequentialStream *chp, int argc, char *argv[]) {
 #ifdef PORT_COMPILER_NAME

   chprintf(chp, "Compiler:     %s\r\n", PORT_COMPILER_NAME);

 #endif

-  chprintf(chp, "Architecture: %s\r\n", CH_ARCHITECTURE_NAME);

+  chprintf(chp, "Architecture: %s\r\n", PORT_ARCHITECTURE_NAME);

 #ifdef PORT_CORE_VARIANT_NAME

   chprintf(chp, "Core Variant: %s\r\n", PORT_CORE_VARIANT_NAME);

 #endif

@@ -115,7 +115,7 @@ static ShellCommand local_commands[] = {
   {NULL, NULL}

 };

 

-static bool_t cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,

+static bool cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,

                       char *name, int argc, char *argv[]) {

 

   while (scp->sc_name != NULL) {

@@ -248,7 +248,7 @@ thread_t *shellCreateStatic(const ShellConfig *scp, void *wsp,
  * @retval TRUE         the channel was reset or CTRL-D pressed.

  * @retval FALSE        operation successful.

  */

-bool_t shellGetLine(BaseSequentialStream *chp, char *line, unsigned size) {

+bool shellGetLine(BaseSequentialStream *chp, char *line, unsigned size) {

   char *p = line;

 

   while (TRUE) {