Ignore:
Timestamp:
Jan 24, 2010, 10:58:17 PM (10 years ago)
Author:
Sam Hocevar
Message:

Fix the source code to reduce testsuite errors.

Location:
libcaca/trunk/kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/kernel/Makefile.am

    r4298 r4300  
    2121        rm -f bootsect.bin kern.bin kernel.map
    2222
     23echo-sources: ; echo $(SOURCES)
     24
  • libcaca/trunk/kernel/kernel.c

    r4160 r4300  
    11/*
    2  *  libcaca       
     2 *  libcaca
    33 *  libcaca       Colour ASCII-Art library
    44 *  Copyright (c) 2006 Sam Hocevar <sam@hocevar.net>
     
    3535    struct processor_info processor_info;
    3636    struct floppy_info    floppy_info;
    37    
     37
    3838    printf("_start at 0x%x\n", _start);
    3939    printf("kmain() at 0x%x\n", kmain);
    4040    printf("Types : char[%d] short[%d] int[%d] unsigned long long[%d]\n", sizeof(char), sizeof(short), sizeof(int), sizeof(unsigned long long));
    41    
     41
    4242    enable_interrupt(1);  // Enable Keyboard Interrupt (IRQ1)
    4343    enable_interrupt(0);  // Enable IRQ0 (timer)
    4444    enable_interrupt(13);
    4545    timer_phase(100);     // Fire IRQ0 each 1/100s
    46    
    47    
     46
     47
    4848    processor_get_info(&processor_info);
    4949    processor_print_info(&processor_info);
     
    5454    /* Caca is delicious */
    5555    printf("Filling memory with 0xCACA, starting from 0x%x\n", end);
    56    
     56
    5757    char *ptr = end;
    5858    while (1)
  • libcaca/trunk/kernel/kernel.h

    r4159 r4300  
    11/*
    2  *  libcaca       
     2 *  libcaca
    33 *  libcaca       Colour ASCII-Art library
    44 *  Copyright (c) 2006 Sam Hocevar <sam@hocevar.net>
     
    2727void enable_interrupt(char i);
    2828
     29#define cli __asm__("cli" : : )
     30#define sti __asm__("sti" : : )
    2931
    30 #define cli             __asm__("cli"::)
    31 #define sti             __asm__("sti"::)
    32 
    33 #define rdtsc(low,high) \
    34 __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
    35 
     32#define rdtsc(low, high) \
     33    __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
    3634
    3735/* The application's entry point */
  • libcaca/trunk/kernel/klibc.h

    • Property svn:executable deleted
  • libcaca/trunk/kernel/multiboot.h

    r568 r4300  
    11/* multiboot.h - the header for Multiboot */
    22/* Copyright (C) 1999  Free Software Foundation, Inc.
    3    
     3
    44   This program is free software; you can redistribute it and/or modify
    55   it under the terms of the GNU General Public License as published by
    66   the Free Software Foundation; either version 2 of the License, or
    77   (at your option) any later version.
    8    
     8
    99   This program is distributed in the hope that it will be useful,
    1010   but WITHOUT ANY WARRANTY; without even the implied warranty of
    1111   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1212   GNU General Public License for more details.
    13    
     13
    1414   You should have received a copy of the GNU General Public License
    1515   along with this program; if not, write to the Free Software
     
    1919
    2020/* The magic number for the Multiboot header.  */
    21 #define MULTIBOOT_HEADER_MAGIC          0x1BADB002
     21#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
    2222
    2323/* The flags for the Multiboot header.  */
    24 #define MULTIBOOT_HEADER_FLAGS          0x00010003
     24#define MULTIBOOT_HEADER_FLAGS 0x00010003
    2525
    2626/* The magic number passed by a Multiboot-compliant boot loader.  */
    27 #define MULTIBOOT_BOOTLOADER_MAGIC      0x2BADB002
     27#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
    2828
    2929/* The size of our stack (16KB).  */
    30 #define STACK_SIZE                      0x4000
     30#define STACK_SIZE 0x4000
    3131
    3232/* C symbol format. HAVE_ASM_USCORE is defined by configure.  */
    3333#ifdef HAVE_ASM_USCORE
    34 # define EXT_C(sym)                     _ ## sym
     34# define EXT_C(sym) _ ## sym
    3535#else
    36 # define EXT_C(sym)                     sym
     36# define EXT_C(sym) sym
    3737#endif
    3838
Note: See TracChangeset for help on using the changeset viewer.