Changeset 76ca3f7 in mainline for kernel/arch/ia32/include


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:
kernel/arch/ia32/include
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/include/asm.h

    rb48ebd19 r76ca3f7  
    3838
    3939#include <arch/pm.h>
    40 #include <arch/types.h>
    4140#include <typedefs.h>
    4241#include <config.h>

  • kernel/arch/ia32/include/atomic.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_ATOMIC_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/barrier.h>
    4040#include <preemption.h>

  • kernel/arch/ia32/include/bios/bios.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_BIOS_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040#define BIOS_EBDA_PTR   0x40e

  • kernel/arch/ia32/include/boot/memmap.h

    rb48ebd19 r76ca3f7  
    6161#ifndef __ASM__
    6262
    63 #include <arch/types.h>
     63#include <typedefs.h>
    6464
    6565typedef struct {

  • kernel/arch/ia32/include/context.h

    rb48ebd19 r76ca3f7  
    3737
    3838#ifdef KERNEL
    39 #include <arch/types.h>
     39
     40#include <typedefs.h>
    4041
    4142#define STACK_ITEM_SIZE 4

  • kernel/arch/ia32/include/cpuid.h

    rb48ebd19 r76ca3f7  
    4343#ifndef __ASM__
    4444
    45 #include <arch/types.h>
     45#include <typedefs.h>
    4646
    4747typedef struct {

  • kernel/arch/ia32/include/drivers/i8254.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_I8254_H_
    3737
    38 #include <arch/types.h>
    39 
    4038extern void i8254_init(void);
    4139extern void i8254_calibrate_delay_loop(void);

  • kernel/arch/ia32/include/drivers/i8259.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_I8259_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/interrupt.h>
    4040

  • kernel/arch/ia32/include/drivers/vesa.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_VESA_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040extern bool vesa_init(void);

  • kernel/arch/ia32/include/faddr.h

    rb48ebd19 r76ca3f7  
    2727 */
    2828
    29 /** @addtogroup ia32   
     29/** @addtogroup ia32
    3030 * @{
    3131 */
    … …  
    3636#define KERN_ia32_FADDR_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    40 #define FADDR(fptr)             ((uintptr_t) (fptr))
     40#define FADDR(fptr)  ((uintptr_t) (fptr))
    4141
    4242#endif

  • kernel/arch/ia32/include/fpu_context.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_FPU_CONTEXT_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040#define FPU_CONTEXT_ALIGN 16

  • kernel/arch/ia32/include/interrupt.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_INTERRUPT_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/pm.h>
    4040

  • kernel/arch/ia32/include/mm/asid.h

    rb48ebd19 r76ca3f7  
    4343#define KERN_ia32_ASID_H_
    4444
    45 #include <arch/types.h>
     45#include <typedefs.h>
    4646
    4747typedef int32_t asid_t;

  • kernel/arch/ia32/include/mm/frame.h

    rb48ebd19 r76ca3f7  
    4242#ifndef __ASM__
    4343
    44 #include <arch/types.h>
     44#include <typedefs.h>
    4545
    4646extern uintptr_t last_frame;

  • kernel/arch/ia32/include/mm/page.h

    rb48ebd19 r76ca3f7  
    127127#include <mm/mm.h>
    128128#include <arch/interrupt.h>
    129 #include <arch/types.h>
    130129#include <typedefs.h>
    131130

  • kernel/arch/ia32/include/pm.h

    rb48ebd19 r76ca3f7  
    8080#ifndef __ASM__
    8181
    82 #include <arch/types.h>
     82#include <typedefs.h>
    8383#include <arch/context.h>
    8484

  • kernel/arch/ia32/include/proc/task.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_TASK_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <adt/bitmap.h>
    4040

  • kernel/arch/ia32/include/proc/thread.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_THREAD_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040typedef struct {
    … …  
    4242} thread_arch_t;
    4343
    44 #define thr_constructor_arch(t)
    45 #define thr_destructor_arch(t)
     44#define thr_constructor_arch(thr)
     45#define thr_destructor_arch(thr)
    4646
    4747#endif

  • kernel/arch/ia32/include/smp/apic.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_APIC_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <cpu.h>
    4040

  • kernel/arch/ia32/include/smp/mps.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_MPS_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/waitq.h>
    4040#include <config.h>

  • kernel/arch/ia32/include/smp/smp.h

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia32_SMP_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040/** SMP config opertaions interface. */

  • kernel/arch/ia32/include/types.h

    rb48ebd19 r76ca3f7  
    2727 */
    2828
    29 /** @addtogroup ia32   
     29/** @addtogroup ia32
    3030 * @{
    3131 */
    … …  
    3535#ifndef KERN_ia32_TYPES_H_
    3636#define KERN_ia32_TYPES_H_
    37 
    38 typedef signed char int8_t;
    39 typedef signed short int16_t;
    40 typedef signed long int32_t;
    41 typedef signed long long int64_t;
    42 
    43 typedef unsigned char uint8_t;
    44 typedef unsigned short uint16_t;
    45 typedef unsigned long uint32_t;
    46 typedef unsigned long long uint64_t;
    4737
    4838typedef uint32_t size_t;
    … …  
    6050} fncptr_t;
    6151
    62 #define PRIp "x"        /**< Format for uintptr_t. */
    63 #define PRIs "u"        /**< Format for size_t. */
     52#define PRIp "x"  /**< Format for uintptr_t. */
     53#define PRIs "u"  /**< Format for size_t. */
    6454
    65 #define PRId8 "d"       /**< Format for int8_t. */
    66 #define PRId16 "d"      /**< Format for int16_t. */
    67 #define PRId32 "d"      /**< Format for int32_t. */
    68 #define PRId64 "lld"    /**< Format for int64_t. */
    69 #define PRIdn "d"       /**< Format for native_t. */
     55#define PRId8 "d"     /**< Format for int8_t. */
     56#define PRId16 "d"    /**< Format for int16_t. */
     57#define PRId32 "d"    /**< Format for int32_t. */
     58#define PRId64 "lld"  /**< Format for int64_t. */
     59#define PRIdn "d"     /**< Format for native_t. */
    7060
    71 #define PRIu8 "u"       /**< Format for uint8_t. */
    72 #define PRIu16 "u"      /**< Format for uint16_t. */
    73 #define PRIu32 "u"      /**< Format for uint32_t. */
    74 #define PRIu64 "llu"    /**< Format for uint64_t. */
    75 #define PRIun "u"       /**< Format for unative_t. */
     61#define PRIu8 "u"     /**< Format for uint8_t. */
     62#define PRIu16 "u"    /**< Format for uint16_t. */
     63#define PRIu32 "u"    /**< Format for uint32_t. */
     64#define PRIu64 "llu"  /**< Format for uint64_t. */
     65#define PRIun "u"     /**< Format for unative_t. */
    7666
    77 #define PRIx8 "x"       /**< Format for hexadecimal (u)int8_t. */
    78 #define PRIx16 "x"      /**< Format for hexadecimal (u)int16_t. */
    79 #define PRIx32 "x"      /**< Format for hexadecimal (u)uint32_t. */
    80 #define PRIx64 "llx"    /**< Format for hexadecimal (u)int64_t. */
    81 #define PRIxn "x"       /**< Format for hexadecimal (u)native_t. */
     67#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
     68#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
     69#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
     70#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
     71#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
    8272
    8373#endif
Note: See TracChangeset for help on using the changeset viewer.