Index: kernel/generic/include/console/prompt.h =================================================================== --- kernel/generic/include/console/prompt.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) +++ kernel/generic/include/console/prompt.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2012 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genericconsole + * @{ + */ +/** @file + */ + +#ifndef KERN_CONSOLE_PROMPT_H_ +#define KERN_CONSOLE_PROMPT_H_ + +#include + +#define MAX_TAB_HINTS 37 + +extern bool console_prompt_display_all_hints(indev_t *, size_t); +extern bool console_prompt_more_hints(indev_t *, size_t *); + +#endif + +/** @} + */ Index: kernel/generic/include/debug.h =================================================================== --- kernel/generic/include/debug.h (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/include/debug.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -37,5 +37,5 @@ #include -#include +#include #define CALLER ((uintptr_t) __builtin_return_address(0)) Index: kernel/generic/include/interrupt.h =================================================================== --- kernel/generic/include/interrupt.h (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/include/interrupt.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -38,4 +38,5 @@ #include #include +#include #include #include @@ -58,4 +59,5 @@ extern exc_table_t exc_table[]; +extern void fault_from_uspace(istate_t *, const char *, ...); extern void fault_if_from_uspace(istate_t *, const char *, ...) PRINTF_ATTRIBUTE(2, 3); Index: kernel/generic/include/ipc/irq.h =================================================================== --- kernel/generic/include/ipc/irq.h (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/include/ipc/irq.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -37,8 +37,8 @@ /** Maximum number of IPC IRQ programmed I/O ranges. */ -#define IRQ_MAX_RANGE_COUNT 8 +#define IRQ_MAX_RANGE_COUNT 8 /** Maximum length of IPC IRQ program. */ -#define IRQ_MAX_PROG_SIZE 20 +#define IRQ_MAX_PROG_SIZE 256 #include Index: kernel/generic/include/symtab.h =================================================================== --- kernel/generic/include/symtab.h (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/include/symtab.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -36,27 +36,9 @@ #define KERN_SYMTAB_H_ -#include +#include +#include -#define MAX_SYMBOL_NAME 64 - -struct symtab_entry { - uint64_t address_le; - char symbol_name[MAX_SYMBOL_NAME]; -}; - -extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *); -extern const char *symtab_fmt_name_lookup(uintptr_t); -extern int symtab_addr_lookup(const char *, uintptr_t *); extern void symtab_print_search(const char *); -extern int symtab_compl(char *, size_t); - -#ifdef CONFIG_SYMTAB - -/** Symtable linked together by build process - * - */ -extern struct symtab_entry symbol_table[]; - -#endif /* CONFIG_SYMTAB */ +extern int symtab_compl(char *, size_t, indev_t *); #endif Index: kernel/generic/include/symtab_lookup.h =================================================================== --- kernel/generic/include/symtab_lookup.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) +++ kernel/generic/include/symtab_lookup.h (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef KERN_SYMTAB_LOOKUP_H_ +#define KERN_SYMTAB_LOOKUP_H_ + +#include + +#define MAX_SYMBOL_NAME 64 + +struct symtab_entry { + uint64_t address_le; + char symbol_name[MAX_SYMBOL_NAME]; +}; + +extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *); +extern const char *symtab_fmt_name_lookup(uintptr_t); +extern int symtab_addr_lookup(const char *, uintptr_t *); + +#ifdef CONFIG_SYMTAB + +/** Symtable linked together by build process + * + */ +extern struct symtab_entry symbol_table[]; + +#endif /* CONFIG_SYMTAB */ + +#endif + +/** @} + */