Ignore:
Timestamp:
2010-07-12T10:53:30Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/kconsole.c

    rc40e6ef rbd48f4c  
    160160
    161161/** Print count times a character */
    162 static void print_cc(wchar_t ch, size_t count)
     162NO_TRACE static void print_cc(wchar_t ch, size_t count)
    163163{
    164164        size_t i;
     
    168168
    169169/** Try to find a command beginning with prefix */
    170 static const char *cmdtab_search_one(const char *name, link_t **startpos)
     170NO_TRACE static const char *cmdtab_search_one(const char *name,
     171    link_t **startpos)
    171172{
    172173        size_t namelen = str_length(name);
     
    202203 *
    203204 */
    204 static int cmdtab_compl(char *input, size_t size)
     205NO_TRACE static int cmdtab_compl(char *input, size_t size)
    205206{
    206207        const char *name = input;
     
    237238}
    238239
    239 static wchar_t *clever_readline(const char *prompt, indev_t *indev)
     240NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
    240241{
    241242        printf("%s> ", prompt);
     
    422423}
    423424
    424 static bool parse_int_arg(const char *text, size_t len, unative_t *result)
     425NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     426    unative_t *result)
    425427{
    426428        bool isaddr = false;
     
    507509 *
    508510 */
    509 static bool parse_argument(const char *cmdline, size_t size, size_t *start, size_t *end)
     511NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     512    size_t *start, size_t *end)
    510513{
    511514        ASSERT(start != NULL);
     
    543546 *
    544547 */
    545 static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
     548NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
    546549{
    547550        size_t start = 0;
Note: See TracChangeset for help on using the changeset viewer.