From e50cf8765be50a7454c9488db38b638cf90805af Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 2 Dec 2009 18:05:10 +0000 Subject: [PATCH] * Moved the VM headers into subdirectory vm/. * Renamed vm_cache.h/vm_address_space.h to VMCache.h/VMAddressSpace. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34449 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/arch/arm/arch_vm.h | 4 ++-- headers/private/kernel/arch/m68k/arch_vm.h | 4 ++-- headers/private/kernel/arch/vm_translation_map.h | 2 +- headers/private/kernel/file_cache.h | 2 +- headers/private/kernel/util/syscall_args.h | 3 ++- .../{vm_address_space.h => vm/VMAddressSpace.h} | 8 ++++---- .../private/kernel/{vm_cache.h => vm/VMCache.h} | 8 ++++---- headers/private/kernel/{ => vm}/vm.h | 6 +++--- headers/private/kernel/{ => vm}/vm_page.h | 8 ++++---- headers/private/kernel/{ => vm}/vm_priv.h | 9 ++++----- .../private/kernel/{ => vm}/vm_translation_map.h | 6 +++--- headers/private/kernel/{ => vm}/vm_types.h | 6 +++--- src/add-ons/kernel/bus_managers/acpi/oshaiku.c | 2 +- .../kernel/bus_managers/agp_gart/agp_gart.cpp | 4 ++-- .../kernel/bus_managers/ata/ATAChannel.cpp | 14 +++++++------- .../kernel/bus_managers/ata/ATAHelper.cpp | 2 +- src/add-ons/kernel/bus_managers/ide/emulation.c | 2 +- src/add-ons/kernel/bus_managers/ide/pio.c | 2 +- .../kernel/bus_managers/scsi/dma_buffer.c | 2 +- src/add-ons/kernel/bus_managers/scsi/emulation.c | 2 +- src/add-ons/kernel/busses/scsi/ahci/util.c | 2 +- .../kernel/drivers/graphics/vesa/vesa.cpp | 2 +- .../kernel/arch/arm/arch_debug_console.cpp | 2 +- src/system/kernel/arch/arm/arch_int.cpp | 16 ++++++++-------- src/system/kernel/arch/arm/arch_thread.cpp | 4 ++-- src/system/kernel/arch/arm/arch_vm.cpp | 4 ++-- .../kernel/arch/arm/arch_vm_translation_map.cpp | 10 +++++----- .../generic/generic_vm_physical_page_mapper.cpp | 6 +++--- .../generic/generic_vm_physical_page_ops.cpp | 2 +- .../kernel/arch/m68k/arch_debug_console.cpp | 2 +- src/system/kernel/arch/m68k/arch_int.cpp | 6 +++--- src/system/kernel/arch/m68k/arch_thread.cpp | 4 ++-- src/system/kernel/arch/m68k/arch_vm.cpp | 4 ++-- .../kernel/arch/m68k/arch_vm_translation_map.cpp | 10 +++++----- .../arch/m68k/arch_vm_translation_map_impl.cpp | 8 ++++---- .../kernel/arch/mipsel/arch_debug_console.cpp | 2 +- src/system/kernel/arch/mipsel/arch_int.cpp | 14 +++++++------- src/system/kernel/arch/mipsel/arch_thread.cpp | 4 ++-- src/system/kernel/arch/mipsel/arch_vm.cpp | 4 ++-- .../arch/mipsel/arch_vm_translation_map.cpp | 8 ++++---- .../kernel/arch/ppc/arch_debug_console.cpp | 2 +- src/system/kernel/arch/ppc/arch_int.cpp | 6 +++--- src/system/kernel/arch/ppc/arch_thread.cpp | 4 ++-- src/system/kernel/arch/ppc/arch_vm.cpp | 2 +- .../kernel/arch/ppc/arch_vm_translation_map.cpp | 6 +++--- src/system/kernel/arch/x86/arch_cpu.cpp | 6 +++--- src/system/kernel/arch/x86/arch_debug.cpp | 6 +++--- src/system/kernel/arch/x86/arch_int.cpp | 4 ++-- src/system/kernel/arch/x86/arch_smp.cpp | 2 +- src/system/kernel/arch/x86/arch_thread.cpp | 4 ++-- src/system/kernel/arch/x86/arch_vm.cpp | 8 ++++---- .../kernel/arch/x86/arch_vm_translation_map.cpp | 6 +++--- src/system/kernel/arch/x86/bios.cpp | 2 +- src/system/kernel/arch/x86/vm86.cpp | 2 +- .../x86_physical_page_mapper_large_memory.cpp | 8 ++++---- src/system/kernel/cache/file_cache.cpp | 6 +++--- src/system/kernel/cache/file_map.cpp | 6 +++--- src/system/kernel/cache/vnode_store.cpp | 2 +- src/system/kernel/cache/vnode_store.h | 2 +- src/system/kernel/commpage.cpp | 4 ++-- src/system/kernel/debug/BreakpointManager.cpp | 2 +- src/system/kernel/debug/debug.cpp | 4 ++-- src/system/kernel/debug/frame_buffer_console.cpp | 2 +- src/system/kernel/debug/gdb.cpp | 2 +- src/system/kernel/debug/system_profiler.cpp | 2 +- src/system/kernel/debug/tracing.cpp | 2 +- src/system/kernel/debug/user_debugger.cpp | 4 ++-- src/system/kernel/device_manager/IORequest.cpp | 4 ++-- src/system/kernel/device_manager/devfs.cpp | 2 +- src/system/kernel/elf.cpp | 6 +++--- src/system/kernel/fs/fifo.cpp | 2 +- src/system/kernel/fs/rootfs.cpp | 2 +- src/system/kernel/fs/vfs.cpp | 4 ++-- src/system/kernel/heap.cpp | 4 ++-- src/system/kernel/low_resource_manager.cpp | 6 +++--- src/system/kernel/main.cpp | 2 +- src/system/kernel/sem.cpp | 2 +- src/system/kernel/slab/Slab.cpp | 4 ++-- src/system/kernel/syscalls.cpp | 2 +- src/system/kernel/system_info.cpp | 4 ++-- src/system/kernel/team.cpp | 4 ++-- src/system/kernel/thread.cpp | 4 ++-- src/system/kernel/vm/Jamfile | 4 ++-- .../{vm_address_space.cpp => VMAddressSpace.cpp} | 11 ++++++----- src/system/kernel/vm/VMAnonymousCache.cpp | 6 +++--- src/system/kernel/vm/VMAnonymousCache.h | 2 +- src/system/kernel/vm/VMAnonymousNoSwapCache.cpp | 2 +- src/system/kernel/vm/VMAnonymousNoSwapCache.h | 2 +- .../kernel/vm/{vm_cache.cpp => VMCache.cpp} | 10 +++++----- src/system/kernel/vm/VMDeviceCache.h | 2 +- src/system/kernel/vm/VMNullCache.h | 2 +- src/system/kernel/vm/vm.cpp | 10 +++++----- src/system/kernel/vm/vm_daemons.cpp | 9 +++++---- src/system/kernel/vm/vm_page.cpp | 10 +++++----- 94 files changed, 220 insertions(+), 218 deletions(-) rename headers/private/kernel/{vm_address_space.h => vm/VMAddressSpace.h} (94%) rename headers/private/kernel/{vm_cache.h => vm/VMCache.h} (81%) rename headers/private/kernel/{ => vm}/vm.h (98%) rename headers/private/kernel/{ => vm}/vm_page.h (94%) rename headers/private/kernel/{ => vm}/vm_priv.h (88%) rename headers/private/kernel/{ => vm}/vm_translation_map.h (95%) rename headers/private/kernel/{ => vm}/vm_types.h (98%) rename src/system/kernel/vm/{vm_address_space.cpp => VMAddressSpace.cpp} (99%) rename src/system/kernel/vm/{vm_cache.cpp => VMCache.cpp} (99%) diff --git a/headers/private/kernel/arch/arm/arch_vm.h b/headers/private/kernel/arch/arm/arch_vm.h index 9804ec4298..994c569ade 100644 --- a/headers/private/kernel/arch/arm/arch_vm.h +++ b/headers/private/kernel/arch/arm/arch_vm.h @@ -5,7 +5,7 @@ #ifndef ARCH_ARM_VM_H #define ARCH_ARM_VM_H -//#include +//#include /* This many pages will be read/written on I/O if possible */ @@ -22,7 +22,7 @@ struct arm_vm_ops { status_t (*arch_vm_translation_map_init)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args); - status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, + status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, uint8 attributes, addr_t (*get_free_page)(kernel_args *)); status_t (*arch_vm_translation_map_early_query)(addr_t va, addr_t *out_physical);*/ // void (*m68k_set_pgdir)(void *); diff --git a/headers/private/kernel/arch/m68k/arch_vm.h b/headers/private/kernel/arch/m68k/arch_vm.h index 8e064e0228..4635da3ab2 100644 --- a/headers/private/kernel/arch/m68k/arch_vm.h +++ b/headers/private/kernel/arch/m68k/arch_vm.h @@ -5,7 +5,7 @@ #ifndef ARCH_M68K_VM_H #define ARCH_M68K_VM_H -#include +#include /* This many pages will be read/written on I/O if possible */ @@ -22,7 +22,7 @@ struct m68k_vm_ops { status_t (*arch_vm_translation_map_init)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args); - status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, + status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, uint8 attributes, addr_t (*get_free_page)(kernel_args *)); status_t (*arch_vm_translation_map_early_query)(addr_t va, addr_t *out_physical); void (*m68k_set_pgdir)(void *); diff --git a/headers/private/kernel/arch/vm_translation_map.h b/headers/private/kernel/arch/vm_translation_map.h index 855c1464ee..049c050c9a 100644 --- a/headers/private/kernel/arch/vm_translation_map.h +++ b/headers/private/kernel/arch/vm_translation_map.h @@ -9,7 +9,7 @@ #define KERNEL_ARCH_VM_TRANSLATION_MAP_H -#include +#include #ifdef __cplusplus diff --git a/headers/private/kernel/file_cache.h b/headers/private/kernel/file_cache.h index f24ad2cb7a..3454aeb065 100644 --- a/headers/private/kernel/file_cache.h +++ b/headers/private/kernel/file_cache.h @@ -7,7 +7,7 @@ #include -#include +#include #include diff --git a/headers/private/kernel/util/syscall_args.h b/headers/private/kernel/util/syscall_args.h index bf9d82e83e..46eab7342c 100644 --- a/headers/private/kernel/util/syscall_args.h +++ b/headers/private/kernel/util/syscall_args.h @@ -4,7 +4,7 @@ #define _SYSCALL_ARGS_H #include -//#include + // Hack to be able to use the IS_USER_ADDRESS macro when compiling for R5. #ifdef R5_MEMORY_LAYOUT @@ -34,4 +34,5 @@ copy_ref_var_to_user(T &kernel, T *user) return user_memcpy(user, &kernel, sizeof(T)); } + #endif // _SYSCALL_ARGS_H diff --git a/headers/private/kernel/vm_address_space.h b/headers/private/kernel/vm/VMAddressSpace.h similarity index 94% rename from headers/private/kernel/vm_address_space.h rename to headers/private/kernel/vm/VMAddressSpace.h index 3427032e7f..2fb4e1751c 100644 --- a/headers/private/kernel/vm_address_space.h +++ b/headers/private/kernel/vm/VMAddressSpace.h @@ -6,13 +6,13 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_ADDRESS_SPACE_H -#define _KERNEL_VM_ADDRESS_SPACE_H +#ifndef _KERNEL_VM_VM_ADDRESS_SPACE_H +#define _KERNEL_VM_VM_ADDRESS_SPACE_H #include -#include +#include struct VMArea; @@ -115,4 +115,4 @@ status_t vm_delete_areas(struct VMAddressSpace *aspace); #endif -#endif /* _KERNEL_VM_ADDRESS_SPACE_H */ +#endif /* _KERNEL_VM_VM_ADDRESS_SPACE_H */ diff --git a/headers/private/kernel/vm_cache.h b/headers/private/kernel/vm/VMCache.h similarity index 81% rename from headers/private/kernel/vm_cache.h rename to headers/private/kernel/vm/VMCache.h index 10048812d5..fcf87c98fb 100644 --- a/headers/private/kernel/vm_cache.h +++ b/headers/private/kernel/vm/VMCache.h @@ -5,12 +5,12 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_CACHE_H -#define _KERNEL_VM_CACHE_H +#ifndef _KERNEL_VM_VM_CACHE_H +#define _KERNEL_VM_VM_CACHE_H #include -#include +#include struct kernel_args; @@ -28,4 +28,4 @@ struct VMCache *vm_cache_acquire_locked_page_cache(struct vm_page *page, } #endif -#endif /* _KERNEL_VM_CACHE_H */ +#endif /* _KERNEL_VM_VM_CACHE_H */ diff --git a/headers/private/kernel/vm.h b/headers/private/kernel/vm/vm.h similarity index 98% rename from headers/private/kernel/vm.h rename to headers/private/kernel/vm/vm.h index 8035dcff57..adb42afb5b 100644 --- a/headers/private/kernel/vm.h +++ b/headers/private/kernel/vm/vm.h @@ -5,8 +5,8 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_H -#define _KERNEL_VM_H +#ifndef _KERNEL_VM_VM_H +#define _KERNEL_VM_VM_H #include @@ -154,4 +154,4 @@ status_t _user_unreserve_address_range(addr_t address, addr_t size); } #endif -#endif /* _KERNEL_VM_H */ +#endif /* _KERNEL_VM_VM_H */ diff --git a/headers/private/kernel/vm_page.h b/headers/private/kernel/vm/vm_page.h similarity index 94% rename from headers/private/kernel/vm_page.h rename to headers/private/kernel/vm/vm_page.h index 99b5497447..f57c084dcc 100644 --- a/headers/private/kernel/vm_page.h +++ b/headers/private/kernel/vm/vm_page.h @@ -5,11 +5,11 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_PAGE_H -#define _KERNEL_VM_PAGE_H +#ifndef _KERNEL_VM_VM_PAGE_H +#define _KERNEL_VM_VM_PAGE_H -#include +#include struct kernel_args; @@ -62,4 +62,4 @@ struct vm_page *vm_lookup_page(addr_t pageNumber); } #endif -#endif /* _KERNEL_VM_PAGE_H */ +#endif /* _KERNEL_VM_VM_PAGE_H */ diff --git a/headers/private/kernel/vm_priv.h b/headers/private/kernel/vm/vm_priv.h similarity index 88% rename from headers/private/kernel/vm_priv.h rename to headers/private/kernel/vm/vm_priv.h index 0b6cc4527b..3e5747eb72 100644 --- a/headers/private/kernel/vm_priv.h +++ b/headers/private/kernel/vm/vm_priv.h @@ -5,11 +5,11 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_PRIV_H -#define _KERNEL_VM_PRIV_H +#ifndef _KERNEL_VM_VM_PRIV_H +#define _KERNEL_VM_VM_PRIV_H -#include +#include // reserved area definitions @@ -41,5 +41,4 @@ const char *page_state_to_string(int state); } #endif -#endif /* _KERNEL_VM_PRIV_H */ - +#endif /* _KERNEL_VM_VM_PRIV_H */ diff --git a/headers/private/kernel/vm_translation_map.h b/headers/private/kernel/vm/vm_translation_map.h similarity index 95% rename from headers/private/kernel/vm_translation_map.h rename to headers/private/kernel/vm/vm_translation_map.h index 35a64da8dd..b1eedd60ba 100644 --- a/headers/private/kernel/vm_translation_map.h +++ b/headers/private/kernel/vm/vm_translation_map.h @@ -5,8 +5,8 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef KERNEL_VM_TRANSLATION_MAP_H -#define KERNEL_VM_TRANSLATION_MAP_H +#ifndef KERNEL_VM_VM_TRANSLATION_MAP_H +#define KERNEL_VM_VM_TRANSLATION_MAP_H #include @@ -73,4 +73,4 @@ typedef struct vm_translation_map_ops { #include -#endif /* KERNEL_VM_TRANSLATION_MAP_H */ +#endif /* KERNEL_VM_VM_TRANSLATION_MAP_H */ diff --git a/headers/private/kernel/vm_types.h b/headers/private/kernel/vm/vm_types.h similarity index 98% rename from headers/private/kernel/vm_types.h rename to headers/private/kernel/vm/vm_types.h index 5e53017db6..d5ecab7964 100644 --- a/headers/private/kernel/vm_types.h +++ b/headers/private/kernel/vm/vm_types.h @@ -6,8 +6,8 @@ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Distributed under the terms of the NewOS License. */ -#ifndef _KERNEL_VM_TYPES_H -#define _KERNEL_VM_TYPES_H +#ifndef _KERNEL_VM_VM_TYPES_H +#define _KERNEL_VM_VM_TYPES_H #include @@ -314,4 +314,4 @@ struct VMArea { }; -#endif // _KERNEL_VM_TYPES_H +#endif // _KERNEL_VM_VM_TYPES_H diff --git a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c index 5fe2c3e71d..a937340f04 100644 --- a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c +++ b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c @@ -130,7 +130,7 @@ #include #include -#include +#include extern pci_module_info *gPCIManager; diff --git a/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp b/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp index 9a72c2c092..cc94365b9a 100644 --- a/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp +++ b/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp @@ -33,8 +33,8 @@ #include #ifdef __HAIKU__ # include -# include -# include +# include +# include #endif #include diff --git a/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp b/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp index 9af85c595f..578f61914a 100644 --- a/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp +++ b/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp @@ -129,17 +129,17 @@ ATAChannel::_DevicePresent(int device) ata_task_file taskFile; taskFile.chs.sector_count = 0x5a; taskFile.chs.sector_number = 0xa5; - if (_WriteRegs(&taskFile, ATA_MASK_SECTOR_COUNT + if (_WriteRegs(&taskFile, ATA_MASK_SECTOR_COUNT | ATA_MASK_SECTOR_NUMBER) != B_OK) { TRACE_ERROR("_DevicePresent: writing registers failed\n"); return false; } - if (_ReadRegs(&taskFile, ATA_MASK_SECTOR_COUNT + if (_ReadRegs(&taskFile, ATA_MASK_SECTOR_COUNT | ATA_MASK_SECTOR_NUMBER) != B_OK) { TRACE_ERROR("_DevicePresent: reading registers failed\n"); return false; } - bool present = (taskFile.chs.sector_count == 0x5a && + bool present = (taskFile.chs.sector_count == 0x5a && taskFile.chs.sector_number == 0xa5); TRACE_ALWAYS("_DevicePresent: device %i, presence %d\n", device, present); @@ -179,7 +179,7 @@ ATAChannel::ScanBus() if (Wait(0, ATA_STATUS_BUSY, 0, 3 * 1000 * 1000) != B_OK) { uint8 status = AltStatus(); if (status == 0xff || status == 0x7f) { - TRACE_ALWAYS("illegal status value 0x%02x for device %d\n", + TRACE_ALWAYS("illegal status value 0x%02x for device %d\n", status, i); continue; } else { @@ -214,7 +214,7 @@ ATAChannel::ScanBus() TRACE_ERROR("device 0 indicates that device 1 failed" " error code is 0x%02x\n", taskFile.read.error); } else if (taskFile.read.error != 0x01) { - TRACE_ERROR("device %d failed, error code is 0x%02x\n", + TRACE_ERROR("device %d failed, error code is 0x%02x\n", i, taskFile.read.error); } @@ -455,7 +455,7 @@ ATAChannel::Wait(uint8 setBits, uint8 clearedBits, uint32 flags, bigtime_t elapsedTime = system_time() - startTime; #if ATA_TRACING if (lastStatus != status) { - TRACE("wait status changed after %lld, status 0x%02x\n", + TRACE("wait status changed after %lld, status 0x%02x\n", elapsedTime, status); lastStatus = status; } @@ -990,7 +990,7 @@ ATAChannel::_TransferPIOBlock(ATARequest *request, size_t length, // TODO: this should not be necessary, we could directly use virtual addresses -#include +#include #include status_t diff --git a/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp b/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp index ee1aa2344a..c6fdc51fdf 100644 --- a/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp +++ b/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp @@ -8,7 +8,7 @@ #include "ATAPrivate.h" -#include +#include #include diff --git a/src/add-ons/kernel/bus_managers/ide/emulation.c b/src/add-ons/kernel/bus_managers/ide/emulation.c index 5691f3c32e..03ce5f9eb0 100644 --- a/src/add-ons/kernel/bus_managers/ide/emulation.c +++ b/src/add-ons/kernel/bus_managers/ide/emulation.c @@ -11,7 +11,7 @@ #include "ide_internal.h" #include "ide_sim.h" -#include +#include #include diff --git a/src/add-ons/kernel/bus_managers/ide/pio.c b/src/add-ons/kernel/bus_managers/ide/pio.c index ce68ae0f06..40e7a55640 100644 --- a/src/add-ons/kernel/bus_managers/ide/pio.c +++ b/src/add-ons/kernel/bus_managers/ide/pio.c @@ -40,7 +40,7 @@ #include "ide_sim.h" #include -#include +#include #include diff --git a/src/add-ons/kernel/bus_managers/scsi/dma_buffer.c b/src/add-ons/kernel/bus_managers/scsi/dma_buffer.c index e331c49a77..b04a092237 100644 --- a/src/add-ons/kernel/bus_managers/scsi/dma_buffer.c +++ b/src/add-ons/kernel/bus_managers/scsi/dma_buffer.c @@ -27,7 +27,7 @@ #include "scsi_internal.h" #include "KernelExport_ext.h" -#include +#include #include diff --git a/src/add-ons/kernel/bus_managers/scsi/emulation.c b/src/add-ons/kernel/bus_managers/scsi/emulation.c index 22928e0e33..fdfc97f8d4 100644 --- a/src/add-ons/kernel/bus_managers/scsi/emulation.c +++ b/src/add-ons/kernel/bus_managers/scsi/emulation.c @@ -15,7 +15,7 @@ #include "scsi_internal.h" -#include +#include #include diff --git a/src/add-ons/kernel/busses/scsi/ahci/util.c b/src/add-ons/kernel/busses/scsi/ahci/util.c index 4c6f417ab9..b8184aac22 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/util.c +++ b/src/add-ons/kernel/busses/scsi/ahci/util.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp b/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp index 095290f80b..716add0e08 100644 --- a/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp +++ b/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "driver.h" #include "utility.h" diff --git a/src/system/kernel/arch/arm/arch_debug_console.cpp b/src/system/kernel/arch/arm/arch_debug_console.cpp index c11b8b9019..8f5d6fbc63 100644 --- a/src/system/kernel/arch/arm/arch_debug_console.cpp +++ b/src/system/kernel/arch/arm/arch_debug_console.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/system/kernel/arch/arm/arch_int.cpp b/src/system/kernel/arch/arm/arch_int.cpp index f649327e6a..10e7502f62 100644 --- a/src/system/kernel/arch/arm/arch_int.cpp +++ b/src/system/kernel/arch/arm/arch_int.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #warning M68K: writeme! @@ -69,7 +69,7 @@ struct iframe_stack gBootFrameStack; //static void *sPICCookie; -void +void arch_int_enable_io_interrupt(int irq) { #warning ARM WRITEME @@ -82,7 +82,7 @@ arch_int_enable_io_interrupt(int irq) } -void +void arch_int_disable_io_interrupt(int irq) { #warning ARM WRITEME @@ -98,7 +98,7 @@ arch_int_disable_io_interrupt(int irq) /* arch_int_*_interrupts() and friends are in arch_asm.S */ -static void +static void print_iframe(struct iframe *frame) { /* @@ -112,7 +112,7 @@ print_iframe(struct iframe *frame) #warning ARM WRITEME } -status_t +status_t arch_int_init(kernel_args *args) { status_t err; @@ -129,7 +129,7 @@ arch_int_init(kernel_args *args) /* point VBR to the new table */ // asm volatile ("movec %0,%%vbr" : : "r"(vbr):); #warning ARM WRITEME - + return B_OK; } diff --git a/src/system/kernel/arch/arm/arch_thread.cpp b/src/system/kernel/arch/arm/arch_thread.cpp index 92d0b75469..9f4c966acf 100644 --- a/src/system/kernel/arch/arm/arch_thread.cpp +++ b/src/system/kernel/arch/arm/arch_thread.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include //#include diff --git a/src/system/kernel/arch/arm/arch_vm.cpp b/src/system/kernel/arch/arm/arch_vm.cpp index e5d05d561b..6a17583e9d 100644 --- a/src/system/kernel/arch/arm/arch_vm.cpp +++ b/src/system/kernel/arch/arm/arch_vm.cpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include #include //#include diff --git a/src/system/kernel/arch/arm/arch_vm_translation_map.cpp b/src/system/kernel/arch/arm/arch_vm_translation_map.cpp index d410fa1854..06bdf19505 100644 --- a/src/system/kernel/arch/arm/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/arm/arch_vm_translation_map.cpp @@ -11,9 +11,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -94,7 +94,7 @@ arch_vm_translation_map_init_post_sem(kernel_args *args) */ status_t -arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, +arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, uint8 attributes, addr_t (*get_free_page)(kernel_args *)) { return NULL; @@ -107,7 +107,7 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t // XXX currently assumes this translation map is active -status_t +status_t arch_vm_translation_map_early_query(addr_t va, addr_t *out_physical) { return NULL; diff --git a/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp b/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp index 1816673727..fbf548cf80 100644 --- a/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp +++ b/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp @@ -9,9 +9,9 @@ #include "generic_vm_physical_page_mapper.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/system/kernel/arch/generic/generic_vm_physical_page_ops.cpp b/src/system/kernel/arch/generic/generic_vm_physical_page_ops.cpp index 3093bb4689..3b6792ccc0 100644 --- a/src/system/kernel/arch/generic/generic_vm_physical_page_ops.cpp +++ b/src/system/kernel/arch/generic/generic_vm_physical_page_ops.cpp @@ -5,7 +5,7 @@ #include "generic_vm_physical_page_ops.h" -#include +#include #include diff --git a/src/system/kernel/arch/m68k/arch_debug_console.cpp b/src/system/kernel/arch/m68k/arch_debug_console.cpp index 209267d21e..350026ab94 100644 --- a/src/system/kernel/arch/m68k/arch_debug_console.cpp +++ b/src/system/kernel/arch/m68k/arch_debug_console.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include diff --git a/src/system/kernel/arch/m68k/arch_int.cpp b/src/system/kernel/arch/m68k/arch_int.cpp index 72c3d41c2f..045e33a852 100644 --- a/src/system/kernel/arch/m68k/arch_int.cpp +++ b/src/system/kernel/arch/m68k/arch_int.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #warning M68K: writeme! diff --git a/src/system/kernel/arch/m68k/arch_thread.cpp b/src/system/kernel/arch/m68k/arch_thread.cpp index b0592eada9..e61ebe035d 100644 --- a/src/system/kernel/arch/m68k/arch_thread.cpp +++ b/src/system/kernel/arch/m68k/arch_thread.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include //#include diff --git a/src/system/kernel/arch/m68k/arch_vm.cpp b/src/system/kernel/arch/m68k/arch_vm.cpp index 921c10dd70..951533aa3c 100644 --- a/src/system/kernel/arch/m68k/arch_vm.cpp +++ b/src/system/kernel/arch/m68k/arch_vm.cpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp b/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp index 093ebef765..c6b2f13faf 100644 --- a/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp @@ -11,9 +11,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -112,7 +112,7 @@ arch_vm_translation_map_init_post_sem(kernel_args *args) */ status_t -arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, +arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, uint8 attributes, addr_t (*get_free_page)(kernel_args *)) { return get_vm_ops()->arch_vm_translation_map_early_map(ka, virtualAddress, physicalAddress, @@ -122,7 +122,7 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t // XXX currently assumes this translation map is active -status_t +status_t arch_vm_translation_map_early_query(addr_t va, addr_t *out_physical) { return get_vm_ops()->arch_vm_translation_map_early_query(va, out_physical); diff --git a/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp b/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp index c4f5195e6e..1b184288b3 100644 --- a/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp +++ b/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp @@ -43,10 +43,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/system/kernel/arch/mipsel/arch_debug_console.cpp b/src/system/kernel/arch/mipsel/arch_debug_console.cpp index d94900d810..f8ce0a4838 100644 --- a/src/system/kernel/arch/mipsel/arch_debug_console.cpp +++ b/src/system/kernel/arch/mipsel/arch_debug_console.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/system/kernel/arch/mipsel/arch_int.cpp b/src/system/kernel/arch/mipsel/arch_int.cpp index b264784b58..ef0c7f8c99 100644 --- a/src/system/kernel/arch/mipsel/arch_int.cpp +++ b/src/system/kernel/arch/mipsel/arch_int.cpp @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include @@ -42,28 +42,28 @@ addr_t gFaultHandler; struct iframe_stack gBootFrameStack; -void +void arch_int_enable_io_interrupt(int irq) { #warning IMPLEMENT arch_int_enable_io_interrupt } -void +void arch_int_disable_io_interrupt(int irq) { #warning IMPLEMENT arch_int_disable_io_interrupt } -static void +static void print_iframe(struct iframe* frame) { #warning IMPLEMENT print_iframe } -status_t +status_t arch_int_init(kernel_args* args) { #warning IMPLEMENT arch_int_init diff --git a/src/system/kernel/arch/mipsel/arch_thread.cpp b/src/system/kernel/arch/mipsel/arch_thread.cpp index 6327e21e28..ce4046b120 100644 --- a/src/system/kernel/arch/mipsel/arch_thread.cpp +++ b/src/system/kernel/arch/mipsel/arch_thread.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/arch/mipsel/arch_vm.cpp b/src/system/kernel/arch/mipsel/arch_vm.cpp index 379d052d99..1995b57ac0 100644 --- a/src/system/kernel/arch/mipsel/arch_vm.cpp +++ b/src/system/kernel/arch/mipsel/arch_vm.cpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/system/kernel/arch/mipsel/arch_vm_translation_map.cpp b/src/system/kernel/arch/mipsel/arch_vm_translation_map.cpp index 5a7eb8bd78..688fdfb00d 100644 --- a/src/system/kernel/arch/mipsel/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/mipsel/arch_vm_translation_map.cpp @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -76,7 +76,7 @@ arch_vm_translation_map_early_map(kernel_args* ka, addr_t virtualAddress, } -status_t +status_t arch_vm_translation_map_early_query(addr_t va, addr_t* out_physical) { #warning IMPLEMENT arch_vm_translation_map_early_query diff --git a/src/system/kernel/arch/ppc/arch_debug_console.cpp b/src/system/kernel/arch/ppc/arch_debug_console.cpp index d60d7a1742..fae93fee35 100644 --- a/src/system/kernel/arch/ppc/arch_debug_console.cpp +++ b/src/system/kernel/arch/ppc/arch_debug_console.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/src/system/kernel/arch/ppc/arch_int.cpp b/src/system/kernel/arch/ppc/arch_int.cpp index 10440d88ca..183cbeb736 100644 --- a/src/system/kernel/arch/ppc/arch_int.cpp +++ b/src/system/kernel/arch/ppc/arch_int.cpp @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/system/kernel/arch/ppc/arch_thread.cpp b/src/system/kernel/arch/ppc/arch_thread.cpp index 2e9dd1a1ca..0c42445bd1 100644 --- a/src/system/kernel/arch/ppc/arch_thread.cpp +++ b/src/system/kernel/arch/ppc/arch_thread.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include //#include #include diff --git a/src/system/kernel/arch/ppc/arch_vm.cpp b/src/system/kernel/arch/ppc/arch_vm.cpp index 184d71f5db..cf6601201d 100644 --- a/src/system/kernel/arch/ppc/arch_vm.cpp +++ b/src/system/kernel/arch/ppc/arch_vm.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp index c3364ad4d4..6a0091892d 100644 --- a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp @@ -73,9 +73,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/system/kernel/arch/x86/arch_cpu.cpp b/src/system/kernel/arch/x86/arch_cpu.cpp index 8dbe709455..dd5e9bf8e8 100644 --- a/src/system/kernel/arch/x86/arch_cpu.cpp +++ b/src/system/kernel/arch/x86/arch_cpu.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/system/kernel/arch/x86/arch_debug.cpp b/src/system/kernel/arch/x86/arch_debug.cpp index e13b9509e2..25ea7541c9 100644 --- a/src/system/kernel/arch/x86/arch_debug.cpp +++ b/src/system/kernel/arch/x86/arch_debug.cpp @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/system/kernel/arch/x86/arch_int.cpp b/src/system/kernel/arch/x86/arch_int.cpp index 6ad8408135..2c18096814 100644 --- a/src/system/kernel/arch/x86/arch_int.cpp +++ b/src/system/kernel/arch/x86/arch_int.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/arch/x86/arch_smp.cpp b/src/system/kernel/arch/x86/arch_smp.cpp index 0cdca121c1..3b1823ea1b 100644 --- a/src/system/kernel/arch/x86/arch_smp.cpp +++ b/src/system/kernel/arch/x86/arch_smp.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include #include diff --git a/src/system/kernel/arch/x86/arch_thread.cpp b/src/system/kernel/arch/x86/arch_thread.cpp index 76f7effd02..c43781c88f 100644 --- a/src/system/kernel/arch/x86/arch_thread.cpp +++ b/src/system/kernel/arch/x86/arch_thread.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include "x86_paging.h" diff --git a/src/system/kernel/arch/x86/arch_vm.cpp b/src/system/kernel/arch/x86/arch_vm.cpp index 82d8378781..f1dae02257 100644 --- a/src/system/kernel/arch/x86/arch_vm.cpp +++ b/src/system/kernel/arch/x86/arch_vm.cpp @@ -16,10 +16,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp index 5137a7ca4b..1e18dd1279 100644 --- a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp +++ b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "x86_paging.h" #include "x86_physical_page_mapper.h" diff --git a/src/system/kernel/arch/x86/bios.cpp b/src/system/kernel/arch/x86/bios.cpp index 1abad6eb0f..46511a0486 100644 --- a/src/system/kernel/arch/x86/bios.cpp +++ b/src/system/kernel/arch/x86/bios.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/src/system/kernel/arch/x86/vm86.cpp b/src/system/kernel/arch/x86/vm86.cpp index 7ae705df67..988981e6e3 100644 --- a/src/system/kernel/arch/x86/vm86.cpp +++ b/src/system/kernel/arch/x86/vm86.cpp @@ -6,7 +6,7 @@ * Copyright (C) 1998 by Josh Vanderhoof */ -#include +#include #include #include #include diff --git a/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp b/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp index 0ca7f1652e..be1996cd65 100644 --- a/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp +++ b/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp @@ -32,10 +32,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "x86_paging.h" diff --git a/src/system/kernel/cache/file_cache.cpp b/src/system/kernel/cache/file_cache.cpp index ab9f91811b..784298d3f2 100644 --- a/src/system/kernel/cache/file_cache.cpp +++ b/src/system/kernel/cache/file_cache.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "IORequest.h" diff --git a/src/system/kernel/cache/file_map.cpp b/src/system/kernel/cache/file_map.cpp index 669d88692c..c9fe333b97 100644 --- a/src/system/kernel/cache/file_map.cpp +++ b/src/system/kernel/cache/file_map.cpp @@ -19,9 +19,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "kernel_debug_config.h" diff --git a/src/system/kernel/cache/vnode_store.cpp b/src/system/kernel/cache/vnode_store.cpp index cb60242916..bda4fa509e 100644 --- a/src/system/kernel/cache/vnode_store.cpp +++ b/src/system/kernel/cache/vnode_store.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "IORequest.h" diff --git a/src/system/kernel/cache/vnode_store.h b/src/system/kernel/cache/vnode_store.h index 3d5252bd3e..50780c6c02 100644 --- a/src/system/kernel/cache/vnode_store.h +++ b/src/system/kernel/cache/vnode_store.h @@ -7,7 +7,7 @@ #define VNODE_STORE_H -#include +#include struct file_cache_ref; diff --git a/src/system/kernel/commpage.cpp b/src/system/kernel/commpage.cpp index ec62e277c0..aab641905a 100644 --- a/src/system/kernel/commpage.cpp +++ b/src/system/kernel/commpage.cpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include static area_id sCommPageArea; diff --git a/src/system/kernel/debug/BreakpointManager.cpp b/src/system/kernel/debug/BreakpointManager.cpp index 3757c2ef60..ceed7c8fb3 100644 --- a/src/system/kernel/debug/BreakpointManager.cpp +++ b/src/system/kernel/debug/BreakpointManager.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include //#define TRACE_BREAKPOINT_MANAGER diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp index e597a666d2..5493166ebe 100644 --- a/src/system/kernel/debug/debug.cpp +++ b/src/system/kernel/debug/debug.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/debug/frame_buffer_console.cpp b/src/system/kernel/debug/frame_buffer_console.cpp index 12d48c7e20..5f0ce2f659 100644 --- a/src/system/kernel/debug/frame_buffer_console.cpp +++ b/src/system/kernel/debug/frame_buffer_console.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/system/kernel/debug/gdb.cpp b/src/system/kernel/debug/gdb.cpp index 9c90434faa..34cf39dcff 100644 --- a/src/system/kernel/debug/gdb.cpp +++ b/src/system/kernel/debug/gdb.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include enum { INIT = 0, CMDREAD, CKSUM1, CKSUM2, WAITACK, QUIT, GDBSTATES }; diff --git a/src/system/kernel/debug/system_profiler.cpp b/src/system/kernel/debug/system_profiler.cpp index d774d04a16..bc45e81674 100644 --- a/src/system/kernel/debug/system_profiler.cpp +++ b/src/system/kernel/debug/system_profiler.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/src/system/kernel/debug/tracing.cpp b/src/system/kernel/debug/tracing.cpp index 09369ded7f..25e704ca40 100644 --- a/src/system/kernel/debug/tracing.cpp +++ b/src/system/kernel/debug/tracing.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include struct tracing_stack_trace { diff --git a/src/system/kernel/debug/user_debugger.cpp b/src/system/kernel/debug/user_debugger.cpp index 36f5e9a275..8218e600ce 100644 --- a/src/system/kernel/debug/user_debugger.cpp +++ b/src/system/kernel/debug/user_debugger.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/device_manager/IORequest.cpp b/src/system/kernel/device_manager/IORequest.cpp index a8f295de0f..2999ad58f8 100644 --- a/src/system/kernel/device_manager/IORequest.cpp +++ b/src/system/kernel/device_manager/IORequest.cpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include "dma_resources.h" diff --git a/src/system/kernel/device_manager/devfs.cpp b/src/system/kernel/device_manager/devfs.cpp index b7f29d4f90..be0c0f1539 100644 --- a/src/system/kernel/device_manager/devfs.cpp +++ b/src/system/kernel/device_manager/devfs.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "BaseDevice.h" #include "FileDevice.h" diff --git a/src/system/kernel/elf.cpp b/src/system/kernel/elf.cpp index 38d03085b8..dc1b9a4ff2 100644 --- a/src/system/kernel/elf.cpp +++ b/src/system/kernel/elf.cpp @@ -31,9 +31,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/system/kernel/fs/fifo.cpp b/src/system/kernel/fs/fifo.cpp index 4ace0cf7b9..8a4782f4c8 100644 --- a/src/system/kernel/fs/fifo.cpp +++ b/src/system/kernel/fs/fifo.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "fifo.h" diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp index fbb85ccdbc..f0c119744d 100644 --- a/src/system/kernel/fs/rootfs.cpp +++ b/src/system/kernel/fs/rootfs.cpp @@ -19,7 +19,7 @@ # include # include # include -# include +# include # include diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 2da1c37c7c..14e06e9404 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -51,8 +51,8 @@ #include #include #include -#include -#include +#include +#include #include "fifo.h" #include "IORequest.h" diff --git a/src/system/kernel/heap.cpp b/src/system/kernel/heap.cpp index d86402ba2e..a813860206 100644 --- a/src/system/kernel/heap.cpp +++ b/src/system/kernel/heap.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include //#define TRACE_HEAP diff --git a/src/system/kernel/low_resource_manager.cpp b/src/system/kernel/low_resource_manager.cpp index 8d09c3eb04..310711cf70 100644 --- a/src/system/kernel/low_resource_manager.cpp +++ b/src/system/kernel/low_resource_manager.cpp @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include //#define TRACE_LOW_RESOURCE_MANAGER @@ -176,7 +176,7 @@ compute_state(void) sLowSemaphoresState = B_NO_LOW_RESOURCE; sLowResources &= ~B_KERNEL_RESOURCE_SEMAPHORES; } - + // free kernel address space state // TODO: this should take fragmentation into account size_t maxSpace = KERNEL_SIZE; diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp index 147fa73da7..68757c6f66 100644 --- a/src/system/kernel/main.cpp +++ b/src/system/kernel/main.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include "vm/VMAnonymousCache.h" diff --git a/src/system/kernel/sem.cpp b/src/system/kernel/sem.cpp index 043984f44b..08d5304346 100644 --- a/src/system/kernel/sem.cpp +++ b/src/system/kernel/sem.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/system/kernel/slab/Slab.cpp b/src/system/kernel/slab/Slab.cpp index ca896ccd11..ae82c6d252 100644 --- a/src/system/kernel/slab/Slab.cpp +++ b/src/system/kernel/slab/Slab.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include // TODO kMagazineCapacity should be dynamically tuned per cache. diff --git a/src/system/kernel/syscalls.cpp b/src/system/kernel/syscalls.cpp index efe5e0ee32..013be84edc 100644 --- a/src/system/kernel/syscalls.cpp +++ b/src/system/kernel/syscalls.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include "syscall_numbers.h" diff --git a/src/system/kernel/system_info.cpp b/src/system/kernel/system_info.cpp index 41d877d217..e11d53888c 100644 --- a/src/system/kernel/system_info.cpp +++ b/src/system/kernel/system_info.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include const static int64 kKernelVersion = 0x1; diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp index 785c5363b1..2049dc220a 100644 --- a/src/system/kernel/team.cpp +++ b/src/system/kernel/team.cpp @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp index c4a9aadb4b..79eb25c482 100644 --- a/src/system/kernel/thread.cpp +++ b/src/system/kernel/thread.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/src/system/kernel/vm/Jamfile b/src/system/kernel/vm/Jamfile index f7546f93f9..5866d12b62 100644 --- a/src/system/kernel/vm/Jamfile +++ b/src/system/kernel/vm/Jamfile @@ -6,12 +6,12 @@ UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) device_manager ] ; KernelMergeObject kernel_vm.o : vm.cpp - vm_address_space.cpp - vm_cache.cpp vm_daemons.cpp vm_page.cpp + VMAddressSpace.cpp VMAnonymousCache.cpp VMAnonymousNoSwapCache.cpp + VMCache.cpp VMDeviceCache.cpp VMNullCache.cpp #vm_tests.c diff --git a/src/system/kernel/vm/vm_address_space.cpp b/src/system/kernel/vm/VMAddressSpace.cpp similarity index 99% rename from src/system/kernel/vm/vm_address_space.cpp rename to src/system/kernel/vm/VMAddressSpace.cpp index 2fa1b08bb5..7b23fb21b4 100644 --- a/src/system/kernel/vm/vm_address_space.cpp +++ b/src/system/kernel/vm/VMAddressSpace.cpp @@ -8,17 +8,18 @@ */ +#include + +#include + #include #include -#include -#include -#include #include #include - -#include +#include +#include //#define TRACE_VM diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp b/src/system/kernel/vm/VMAnonymousCache.cpp index 828c515d3a..d36bd48de8 100644 --- a/src/system/kernel/vm/VMAnonymousCache.cpp +++ b/src/system/kernel/vm/VMAnonymousCache.cpp @@ -35,9 +35,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "IORequest.h" diff --git a/src/system/kernel/vm/VMAnonymousCache.h b/src/system/kernel/vm/VMAnonymousCache.h index 788d73ba18..5620e0cf69 100644 --- a/src/system/kernel/vm/VMAnonymousCache.h +++ b/src/system/kernel/vm/VMAnonymousCache.h @@ -9,7 +9,7 @@ #ifndef _KERNEL_VM_STORE_ANONYMOUS_H #define _KERNEL_VM_STORE_ANONYMOUS_H -#include +#include #if ENABLE_SWAP_SUPPORT diff --git a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp index 78b045ebb2..dc13948a55 100644 --- a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp +++ b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include //#define TRACE_STORE diff --git a/src/system/kernel/vm/VMAnonymousNoSwapCache.h b/src/system/kernel/vm/VMAnonymousNoSwapCache.h index 62784e5bdf..84dfb5ed23 100644 --- a/src/system/kernel/vm/VMAnonymousNoSwapCache.h +++ b/src/system/kernel/vm/VMAnonymousNoSwapCache.h @@ -9,7 +9,7 @@ #ifndef _KERNEL_VM_STORE_ANONYMOUS_NO_SWAP_H #define _KERNEL_VM_STORE_ANONYMOUS_NO_SWAP_H -#include +#include class VMAnonymousNoSwapCache : public VMCache { diff --git a/src/system/kernel/vm/vm_cache.cpp b/src/system/kernel/vm/VMCache.cpp similarity index 99% rename from src/system/kernel/vm/vm_cache.cpp rename to src/system/kernel/vm/VMCache.cpp index 60d9b17888..7ad6fb227a 100644 --- a/src/system/kernel/vm/vm_cache.cpp +++ b/src/system/kernel/vm/VMCache.cpp @@ -7,7 +7,7 @@ * Distributed under the terms of the NewOS License. */ -#include +#include #include #include @@ -23,10 +23,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include //#define TRACE_VM_CACHE diff --git a/src/system/kernel/vm/VMDeviceCache.h b/src/system/kernel/vm/VMDeviceCache.h index 636e2b1040..fa11c3594d 100644 --- a/src/system/kernel/vm/VMDeviceCache.h +++ b/src/system/kernel/vm/VMDeviceCache.h @@ -9,7 +9,7 @@ #ifndef _KERNEL_VM_STORE_DEVICE_H #define _KERNEL_VM_STORE_DEVICE_H -#include +#include class VMDeviceCache : public VMCache { diff --git a/src/system/kernel/vm/VMNullCache.h b/src/system/kernel/vm/VMNullCache.h index 1a7f1832a0..7622e77fc7 100644 --- a/src/system/kernel/vm/VMNullCache.h +++ b/src/system/kernel/vm/VMNullCache.h @@ -9,7 +9,7 @@ #ifndef _KERNEL_VM_STORE_NULL_H #define _KERNEL_VM_STORE_NULL_H -#include +#include class VMNullCache : public VMCache { diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp index 118e5a22ff..f72c69a9fc 100644 --- a/src/system/kernel/vm/vm.cpp +++ b/src/system/kernel/vm/vm.cpp @@ -8,7 +8,7 @@ */ -#include +#include #include #include @@ -44,10 +44,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "VMAnonymousCache.h" #include "IORequest.h" diff --git a/src/system/kernel/vm/vm_daemons.cpp b/src/system/kernel/vm/vm_daemons.cpp index cff212ea8b..0bb61bb6e1 100644 --- a/src/system/kernel/vm/vm_daemons.cpp +++ b/src/system/kernel/vm/vm_daemons.cpp @@ -13,10 +13,11 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include + #include "VMAnonymousCache.h" diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp index 0201730bd9..884a981145 100644 --- a/src/system/kernel/vm/vm_page.cpp +++ b/src/system/kernel/vm/vm_page.cpp @@ -27,11 +27,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "VMAnonymousCache.h" #include "IORequest.h"