Changeset e2b762ec in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2009-03-16T21:58:05Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f36c061

Parents:

d9167a1c

Message:

Make kernel symbol information optional.

File:

• kernel/generic/src/console/kconsole.c (modified) (7 diffs)

kernel/generic/src/console/kconsole.c

@@ -51 +51 @@
 #include <func.h>
 #include <string.h>
-#include <symtab.h>
 #include <macros.h>
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
+
+#ifdef CONFIG_SYMTAB
+#include <symtab.h>
+#endif
 
 /** Simple kernel console.
@@ -259 +262 @@
 static int cmdtab_compl(char *name)
 {
-        static char output[MAX_SYMBOL_NAME + 1];
+        static char output[/*MAX_SYMBOL_NAME*/128 + 1];
         link_t *startpos = NULL;
         const char *foundtxt;
@@ -291 +294 @@
                 }
         }
-        strncpy(name, output, MAX_SYMBOL_NAME);
+        strncpy(name, output, 128/*MAX_SYMBOL_NAME*/);
         return found;
-        
 }
 
@@ -348 +350 @@
                                 found = cmdtab_compl(tmp);
                         } else { /* Symtab completion */
+#ifdef CONFIG_SYMTAB
                                 found = symtab_compl(tmp);
+#else
+                                found = 0;
+#endif
                         }
 
@@ -516 +522 @@
 static int parse_int_arg(char *text, size_t len, unative_t *result)
 {
-        static char symname[MAX_SYMBOL_NAME];
         uintptr_t symaddr;
         bool isaddr = false;
         bool isptr = false;
+
+#ifdef CONFIG_SYMTAB
+        static char symname[MAX_SYMBOL_NAME];
+#endif
         
         /* If we get a name, try to find it in symbol table */
@@ -532 +541 @@
         }
         if (text[0] < '0' || text[0] > '9') {
+#ifdef CONFIG_SYMTAB
                 strncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));
                 symaddr = get_symbol_addr(symname);
@@ -543 +553 @@
                         return -1;
                 }
+#else
+                symaddr = 0;
+#endif
                 if (isaddr)
                         *result = (unative_t)symaddr;