Changeset 397c77f in mainline


Ignore:
Timestamp:
2005-02-25T23:38:05Z (20 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f5075fa
Parents:
26a8604f
Message:

Clean up (ia32 vs. i386).
Header files reorganization.

Files:
20 edited
5 moved

Legend:

Unmodified
Added
Removed

  • arch/ia32/_link.ld

    r26a8604f r397c77f  
    11/*
    2  *  i386 linker script
     2 *  ia32 linker script
    33 * 
    44 *  kernel text

  • arch/ia32/include/asm.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_ASM_H__
    30 #define __i386_ASM_H__
     29#ifndef __ia32_ASM_H__
     30#define __ia32_ASM_H__
    3131
    3232#include <cpu.h>

  • arch/ia32/include/context.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_CONTEXT_H__
    30 #define __i386_CONTEXT_H__
     29#ifndef __ia32_CONTEXT_H__
     30#define __ia32_CONTEXT_H__
    3131
    3232#include <arch/types.h>

  • arch/ia32/include/cpu.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_CPU_H__
    30 #define __i386_CPU_H__
     29#ifndef __ia32_CPU_H__
     30#define __ia32_CPU_H__
    3131
    3232#include <typedefs.h>

  • arch/ia32/include/i8254.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i8254_H__
    30 #define __i8254_H__
     29#ifndef __I8254_H__
     30#define __I8254_H__
    3131
    3232#include <arch/types.h>

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

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_FRAME_H__
    30 #define __i386_FRAME_H__
     29#ifndef __ia32_FRAME_H__
     30#define __ia32_FRAME_H__
    3131
    3232#include <arch/types.h>

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

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_PAGE_H__
    30 #define __i386_PAGE_H__
     29#ifndef __ia32_PAGE_H__
     30#define __ia32_PAGE_H__
    3131
    3232#include <arch/types.h>

  • arch/ia32/include/mm/vm.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_VM_H__
    30 #define __i386_VM_H__
     29#ifndef __ia32_VM_H__
     30#define __ia32_VM_H__
    3131
    3232#include <arch/types.h>

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

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_ATOMIC_H__
    30 #define __i386_ATOMIC_H__
     29#ifndef __ia32_ATOMIC_H__
     30#define __ia32_ATOMIC_H__
    3131
    3232#include <arch/types.h>

  • arch/ia32/include/thread.h

    r26a8604f r397c77f  
    2727 */
    2828
    29 #ifndef __i386_THREAD_H__
    30 #define __i386_THREAD_H__
     29#ifndef __ia32_THREAD_H__
     30#define __ia32_THREAD_H__
    3131
    3232#define ARCH_THREAD_DATA

  • arch/ia32/src/mm/page.c

    r26a8604f r397c77f  
    3939/*
    4040 * Note.
    41  * This is the preliminary code for controlling paging mechanism on i386. It is
     41 * This is the preliminary code for controlling paging mechanism on ia32. It is
    4242 * needed by other parts of the kernel for its ability to map virtual addresses
    4343 * to physical. SMP code relies on this feature. Other than that, this code is

  • arch/ia32/src/pm.c

    r26a8604f r397c77f  
    3737
    3838/*
    39  * Early i386 configuration functions and data structures.
     39 * Early ia32 configuration functions and data structures.
    4040 */
    4141

  • arch/ia32/src/smp/apic.c

    r26a8604f r397c77f  
    3030
    3131#include <arch/types.h>
    32 #include <arch/apic.h>
    33 #include <arch/ap.h>
     32#include <arch/smp/apic.h>
     33#include <arch/smp/ap.h>
     34#include <arch/smp/mp.h>
    3435#include <mm/page.h>
    3536#include <time/delay.h>
    3637#include <arch/interrupt.h>
    3738#include <print.h>
    38 #include <arch/mp.h>
    3939#include <arch/asm.h>
    4040#include <arch.h>

  • arch/ia32/src/smp/ipi.c

    r26a8604f r397c77f  
    3030
    3131#include <smp/ipi.h>
    32 #include <arch/apic.h>
     32#include <arch/smp/apic.h>
    3333
    3434void ipi_broadcast_arch(int ipi)

  • arch/ia32/src/smp/mp.c

    r26a8604f r397c77f  
    2929#ifdef __SMP__
    3030
    31 #include <arch/mp.h>
    32 #include <arch/ap.h>
    3331#include <arch/pm.h>
    3432#include <config.h>
    3533#include <print.h>
    3634#include <panic.h>
    37 #include <arch/apic.h>
     35#include <arch/smp/mp.h>
     36#include <arch/smp/ap.h>
     37#include <arch/smp/apic.h>
    3838#include <func.h>
    3939#include <arch/types.h>

  • src/main/kinit.c

    r26a8604f r397c77f  
    4343
    4444#ifdef __SMP__
    45 #include <arch/mp.h>
     45#include <arch/smp/mp.h>
    4646#endif /* __SMP__ */
    4747

  • src/main/main.c

    r26a8604f r397c77f  
    4141
    4242#ifdef __SMP__
    43 #include <arch/apic.h>
    44 #include <arch/mp.h>
     43#include <arch/smp/apic.h>
     44#include <arch/smp/mp.h>
    4545#endif /* __SMP__ */
    4646

  • src/mm/tlb.c

    r26a8604f r397c77f  
    3131#include <synch/spinlock.h>
    3232#include <typedefs.h>
    33 #include <arch/atomic.h>
     33#include <arch/smp/atomic.h>
    3434#include <arch/interrupt.h>
    3535#include <config.h>

  • src/proc/scheduler.c

    r26a8604f r397c77f  
    4343
    4444#ifdef __SMP__
    45 #include <arch/atomic.h>
     45#include <arch/smp/atomic.h>
    4646#endif /* __SMP__ */
    4747

  • src/synch/spinlock.c

    r26a8604f r397c77f  
    3030
    3131#ifdef __SMP__
    32 #include <arch/atomic.h>
     32#include <arch/smp/atomic.h>
    3333#endif
    3434

  • src/time/clock.c

    r26a8604f r397c77f  
    4141
    4242#ifdef __SMP__
    43 #include <arch/atomic.h>
     43#include <arch/smp/atomic.h>
    4444#endif
    4545
Note: See TracChangeset for help on using the changeset viewer.