Changeset 3bacee1 in mainline for kernel/generic/src/console
- Timestamp:
- 2018-04-12T16:27:17Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3cf22f9
- Parents:
- 76d0981d
- git-author:
- Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
- Location:
- kernel/generic/src/console
- Files:
-
- 2 edited
-
cmd.c (modified) (5 diffs)
-
kconsole.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/console/cmd.c
r76d0981d r3bacee1 923 923 924 924 printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n", 925 sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);925 sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); 926 926 927 927 return 1; … … 1088 1088 (void *) cmd_call2); 1089 1089 printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", 1090 arg1, arg2, (void *) symaddr, symbol);1090 arg1, arg2, (void *) symaddr, symbol); 1091 1091 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2)); 1092 1092 interrupts_restore(ipl); … … 1125 1125 (void *) cmd_call3); 1126 1126 printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", 1127 arg1, arg2, arg3, (void *) symaddr, symbol);1127 arg1, arg2, arg3, (void *) symaddr, symbol); 1128 1128 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3)); 1129 1129 interrupts_restore(ipl); … … 1188 1188 pointer = true; 1189 1189 } else if (((char *) argv->buffer)[0] >= '0' && 1190 ((char *) argv->buffer)[0] <= '9') {1190 ((char *) argv->buffer)[0] <= '9') { 1191 1191 uint64_t value; 1192 1192 rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value); … … 1206 1206 if (pointer) 1207 1207 addr = *(uintptr_t *) addr; 1208 printf("Writing %#" PRIx32 " -> %p\n", arg1, (void *) addr);1208 printf("Writing %#" PRIx32 " -> %p\n", arg1, (void *) addr); 1209 1209 *(uint32_t *) addr = arg1; 1210 1210 } else -
kernel/generic/src/console/kconsole.c
r76d0981d r3bacee1 86 86 LIST_INITIALIZE(cmd_list); /**< Command list. */ 87 87 88 static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = { };88 static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = { }; 89 89 static size_t history_pos = 0; 90 90 … … 166 166 const char *cmdtab_enum(const char *name, const char **h, void **ctx) 167 167 { 168 link_t **startpos = (link_t **) ctx;168 link_t **startpos = (link_t **) ctx; 169 169 size_t namelen = str_length(name); 170 170 … … 376 376 beg = position - 1; 377 377 while ((beg > 0) && (!isspace(current[beg]))) 378 beg--;378 beg--; 379 379 380 380 if (isspace(current[beg]))
Note:
See TracChangeset
for help on using the changeset viewer.
