Changeset a721f6a in mainline


Ignore:
Timestamp:
2010-04-23T15:15:09Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
80badbe
Parents:
9efff92
Message:

tiny cstyle modifications (no change in functionality)

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r9efff92 ra721f6a  
    351351
    352352$(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)
    353         $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
     353        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
    354354
    355355$(LINK): $(LINK).in $(DEPEND)
    … …  
    394394$(REAL_MAP).bin: $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
    395395        echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o $(EMPTY_MAP)
    396         $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
     396        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
    397397        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    398398        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    … …  
    402402       
    403403        echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o $(SIZEOK_MAP)
    404         $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
     404        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
    405405        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    406406        $(GENMAP) $(MAP_PREV) $(DUMP) $@

  • kernel/arch/mips32/include/arch.h

    r9efff92 ra721f6a  
    3636#define KERN_mips32_ARCH_H_
    3737
    38 #define TASKMAP_MAX_RECORDS  32
    39 #define CPUMAP_MAX_RECORDS   32
     38#include <typedefs.h>
    4039
    41 #define BOOTINFO_TASK_NAME_BUFLEN 32
    42 
    43 #include <typedefs.h>
     40#define TASKMAP_MAX_RECORDS        32
     41#define CPUMAP_MAX_RECORDS         32
     42#define BOOTINFO_TASK_NAME_BUFLEN  32
    4443
    4544extern size_t cpu_count;
    … …  
    4746typedef struct {
    4847        uintptr_t addr;
    49         uint32_t size;
     48        size_t size;
    5049        char name[BOOTINFO_TASK_NAME_BUFLEN];
    5150} utask_t;
    … …  
    5352typedef struct {
    5453        uint32_t cpumap;
    55         uint32_t cnt;
     54        size_t cnt;
    5655        utask_t tasks[TASKMAP_MAX_RECORDS];
    5756} bootinfo_t;

  • kernel/arch/mips32/include/asm/boot.h

    r9efff92 ra721f6a  
    3636#define KERN_mips32_BOOT_H_
    3737
    38 
    3938/* Temporary stack size for boot process */
    40 #define TEMP_STACK_SIZE 0x100
     39#define TEMP_STACK_SIZE  0x100
    4140
    4241#endif

  • kernel/arch/mips32/include/asm/regname.h

    r9efff92 ra721f6a  
    2727 */
    2828
    29 /** @addtogroup mips32 
     29/** @addtogroup mips32
    3030 * @{
    3131 */
    … …  
    6969#define ra      31
    7070
    71 #define rindex          0
    72 #define rrandom         1
    73 #define entrylo0        2
    74 #define entrylo1        3
    75 #define context         4
    76 #define pagemask        5
    77 #define wired           6
    78 #define badvaddr        8
    79 #define count           9
    80 #define entryhi         10
    81 #define compare         11
    82 #define status          12
    83 #define cause           13
    84 #define epc             14
    85 #define rconfig         16
    86 #define lladdr          17
    87 #define watchlo         18
    88 #define watchhi         19
    89 #define xcontext        20
    90 #define rdebug          23
    91 #define depc            24
    92 #define eepc            30
     71#define rindex    0
     72#define rrandom   1
     73#define entrylo0  2
     74#define entrylo1  3
     75#define context   4
     76#define pagemask  5
     77#define wired     6
     78#define badvaddr  8
     79#define count     9
     80#define entryhi   10
     81#define compare   11
     82#define status    12
     83#define cause     13
     84#define epc       14
     85#define rconfig   16
     86#define lladdr    17
     87#define watchlo   18
     88#define watchhi   19
     89#define xcontext  20
     90#define rdebug    23
     91#define depc      24
     92#define eepc      30
    9393
    94 #endif /* KERN_mips32_REGNAME_H_ */
     94#endif
    9595
    9696/** @}

  • kernel/generic/include/print.h

    r9efff92 ra721f6a  
    3939#include <stdarg.h>
    4040
    41 #define EOF (-1)
     41#define EOF  (-1)
    4242
    4343extern int puts(const char *s);

  • kernel/generic/include/printf/printf_core.h

    r9efff92 ra721f6a  
    5151} printf_spec_t;
    5252
    53 int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
     53extern int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
    5454
    5555#endif

  • kernel/generic/src/main/version.c

    r9efff92 ra721f6a  
    5959{
    6060        printf("%s, release %s (%s)%s\nBuilt%s for %s\n%s\n",
    61                 project, release, name, revision, timestamp, arch, copyright);
     61            project, release, name, revision, timestamp, arch, copyright);
    6262}
    6363

  • kernel/generic/src/printf/printf.c

    r9efff92 ra721f6a  
    3434
    3535#include <print.h>
     36#include <stdarg.h>
    3637
    3738int printf(const char *fmt, ...)

  • kernel/generic/src/printf/printf_core.c

    r9efff92 ra721f6a  
    4646/** show prefixes 0x or 0 */
    4747#define __PRINTF_FLAG_PREFIX       0x00000001
     48
    4849/** signed / unsigned number */
    4950#define __PRINTF_FLAG_SIGNED       0x00000002
     51
    5052/** print leading zeroes */
    5153#define __PRINTF_FLAG_ZEROPADDED   0x00000004
     54
    5255/** align to left */
    5356#define __PRINTF_FLAG_LEFTALIGNED  0x00000010
     57
    5458/** always show + sign */
    5559#define __PRINTF_FLAG_SHOWPLUS     0x00000020
     60
    5661/** print space instead of plus */
    5762#define __PRINTF_FLAG_SPACESIGN    0x00000040
     63
    5864/** show big characters */
    5965#define __PRINTF_FLAG_BIGCHARS     0x00000080
     66
    6067/** number has - sign */
    6168#define __PRINTF_FLAG_NEGATIVE     0x00000100
    … …  
    7986} qualifier_t;
    8087
    81 static char nullstr[] = "(NULL)";
    82 static char digits_small[] = "0123456789abcdef";
    83 static char digits_big[] = "0123456789ABCDEF";
    84 static char invalch = U_SPECIAL;
     88static const char *nullstr = "(NULL)";
     89static const char *digits_small = "0123456789abcdef";
     90static const char *digits_big = "0123456789ABCDEF";
     91static const char invalch = U_SPECIAL;
    8592
    8693/** Print one or more characters without adding newline.
    … …  
    351358    uint32_t flags, printf_spec_t *ps)
    352359{
    353         char *digits;
     360        const char *digits;
    354361        if (flags & __PRINTF_FLAG_BIGCHARS)
    355362                digits = digits_big;

  • uspace/lib/c/generic/io/printf_core.c

    r9efff92 ra721f6a  
    4545/** show prefixes 0x or 0 */
    4646#define __PRINTF_FLAG_PREFIX       0x00000001
     47
    4748/** signed / unsigned number */
    4849#define __PRINTF_FLAG_SIGNED       0x00000002
     50
    4951/** print leading zeroes */
    5052#define __PRINTF_FLAG_ZEROPADDED   0x00000004
     53
    5154/** align to left */
    5255#define __PRINTF_FLAG_LEFTALIGNED  0x00000010
     56
    5357/** always show + sign */
    5458#define __PRINTF_FLAG_SHOWPLUS     0x00000020
     59
    5560/** print space instead of plus */
    5661#define __PRINTF_FLAG_SPACESIGN    0x00000040
     62
    5763/** show big characters */
    5864#define __PRINTF_FLAG_BIGCHARS     0x00000080
     65
    5966/** number has - sign */
    6067#define __PRINTF_FLAG_NEGATIVE     0x00000100
    … …  
    7885} qualifier_t;
    7986
    80 static char nullstr[] = "(NULL)";
    81 static char digits_small[] = "0123456789abcdef";
    82 static char digits_big[] = "0123456789ABCDEF";
    83 static char invalch = U_SPECIAL;
     87static const char *nullstr = "(NULL)";
     88static const char *digits_small = "0123456789abcdef";
     89static const char *digits_big = "0123456789ABCDEF";
     90static const char invalch = U_SPECIAL;
    8491
    8592/** Print one or more characters without adding newline.
    … …  
    350357    uint32_t flags, printf_spec_t *ps)
    351358{
    352         char *digits;
     359        const char *digits;
    353360        if (flags & __PRINTF_FLAG_BIGCHARS)
    354361                digits = digits_big;
Note: See TracChangeset for help on using the changeset viewer.