diff --git a/headers/private/kernel/fb_console.h b/headers/private/kernel/fb_console.h deleted file mode 100644 index 25ca9417db..0000000000 --- a/headers/private/kernel/fb_console.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -** Copyright 2001, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ -#ifndef KERNEL_FB_CONSOLE_H -#define KERNEL_FB_CONSOLE_H - -struct kernel_args; - -int fb_console_dev_init(struct kernel_args *ka); - -#endif /* KERNEL_FB_CONSOLE_H */ diff --git a/headers/private/kernel/float.h b/headers/private/kernel/float.h deleted file mode 100644 index 99272bf3ca..0000000000 --- a/headers/private/kernel/float.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 1989 Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 peter Exp $ - */ - -#ifndef _MACHINE_FLOAT_H_ -#define _MACHINE_FLOAT_H_ 1 - -#define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS 1 /* FP addition rounds to nearest */ - -#define FLT_MANT_DIG 24 /* p */ -#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ -#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */ -#define FLT_MIN_EXP (-125) /* emin */ -#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */ -#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */ -#define FLT_MAX_EXP 128 /* emax */ -#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */ -#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */ - -#define DBL_MANT_DIG 53 -#define DBL_EPSILON 2.2204460492503131E-16 -#define DBL_DIG 15 -#define DBL_MIN_EXP (-1021) -#define DBL_MIN 2.2250738585072014E-308 -#define DBL_MIN_10_EXP (-307) -#define DBL_MAX_EXP 1024 -#define DBL_MAX 1.7976931348623157E+308 -#define DBL_MAX_10_EXP 308 - -#define LDBL_MANT_DIG DBL_MANT_DIG -#define LDBL_EPSILON DBL_EPSILON -#define LDBL_DIG DBL_DIG -#define LDBL_MIN_EXP DBL_MIN_EXP -#define LDBL_MIN DBL_MIN -#define LDBL_MIN_10_EXP DBL_MIN_10_EXP -#define LDBL_MAX_EXP DBL_MAX_EXP -#define LDBL_MAX DBL_MAX -#define LDBL_MAX_10_EXP DBL_MAX_10_EXP -#endif /* _MACHINE_FLOAT_H_ */ diff --git a/headers/private/kernel/devfs.h b/headers/private/kernel/fs/devfs.h similarity index 100% rename from headers/private/kernel/devfs.h rename to headers/private/kernel/fs/devfs.h diff --git a/headers/private/kernel/fd.h b/headers/private/kernel/fs/fd.h similarity index 100% rename from headers/private/kernel/fd.h rename to headers/private/kernel/fs/fd.h diff --git a/headers/private/kernel/isovol.h b/headers/private/kernel/isovol.h deleted file mode 100644 index 341fc745e8..0000000000 --- a/headers/private/kernel/isovol.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef ISOVOLDESC_H -#define ISOVOLDESC_H - -// Volume Descriptor types -#define ISO_VD_PRIMARY 0x01 -#define ISO_VD_SUPPLEMENTARY 0x02 -#define ISO_VD_END 0xFF - -// Volume Descriptor ID -#define ISO_VD_ID "CD001" - -// Volume Descriptor offset in image -#define ISO_VD_START 0x8000 - -// Index for LE/BE data -#define ISO_LSB_INDEX 0 -#define ISO_MSB_INDEX 1 - -#if 0 -#define PACKED _PACKED -#else -#define PACKED -#endif - -typedef struct iso_vol_date { - char year[4]; // year (*not* ASCIIZ) - char month[2]; // month (1-12) (*not* ASCIIZ) - char day[2]; // day of the month (1-31) (*not* ASCIIZ) - char hour[2]; // hour (00-23) (*not* ASCIIZ) - char minute[2]; // minute (00-59) (*not* ASCIIZ) - char second[2]; // second (00-59) (*not* ASCIIZ) - char hundrSecond[2]; // hundr. of a sec (00-99) (*not* ASCIIZ) - signed char gmtOffset; // offset from GMT, in 15-minute intervals -} PACKED iso_vol_date; - -typedef struct iso_dir_entry { - unsigned char recordLength; // Total length of this record - unsigned char extAttrSecCount; // Number of sectors in extended attr record - unsigned long dataStartSector[2]; // Sector # of 1st data sector for file/dir - unsigned long dataLength[2]; // Length of data for file/directory - unsigned char year; // Years since 1900 - unsigned char month; // Month (1=jan, etc) - unsigned char day; // Day of the month (1-31) - unsigned char hour; // Hour (0-23) - unsigned char minute; // Minute (0-59) - unsigned char second; // Second (0-59) - signed char gmtOffset; // GMT offset in 15 minutes intervals - unsigned char flags; // Flags - unsigned char unitSize; // Unit size for interleaved file (0) - unsigned char gapSize; // Gap size for interleaved file (0) - unsigned short volSeqNumber[2]; // Volume sequence number - unsigned char nameLength; // Length of name - char name[32]; // Name + padding (nameLength [+1]) -} PACKED iso_dir_entry; - -typedef struct iso_path_entry { - unsigned char nameLength; // Length of directory name - unsigned char extAttrSecCount; // Number of sectors in extended attr record - unsigned long dataStartSector; // Sector # of 1st data sector for directory - unsigned short parentDirRec; // Record # of parent directory - unsigned char name[32]; // Name of this entry (nameLength bytes) -} PACKED iso_path_entry; - -typedef struct iso_volume_descriptor { - unsigned char type; // ISO_VD_PRIMARY / ISO_VD_SUPPLEMENTARY - char id[5]; // ISO_VD_ID - unsigned char undef1; // 1 - unsigned char undef2; // 0 - unsigned char systemID[32]; // System Identifier (*not* ASCIIZ) - unsigned char volumeID[32]; // Volume Identifier (*not* ASCIIZ) - unsigned char undef3[8]; // all 0 - unsigned long numSectors[2]; // Total Number Of Sectors (little+big endian) - unsigned char undef4[32]; // all 0 - unsigned short volSetSize[2]; // Volume Set Size (little+big endian) - unsigned short volSeqNumber[2]; // Volume Sequence Number (little+big endian) - unsigned short sectorSize[2]; // Sector Size (little+big endian) - unsigned long pathTblSize[2]; // Path Table Size (bytes) (little+big endian) - unsigned long lePathTbl1Sector; // First sector of LE Path Table - unsigned long lePathTbl2Sector; // First sector of 2nd LE Path Table - unsigned long bePathTbl1Sector; // First sector of BE Path Table - unsigned long bePathTbl2Sector; // First sector of 2nd BE Path Table - - /* Root Directory Entry */ - unsigned char rootDirEntry[34]; // To use, cast to iso_dir_entry - - char volumeSetID[128]; // Volume Set Identifier (*not* ASCIIZ) - char publisherID[128]; // Publisher Identifier (*not* ASCIIZ) - char dataPreparerID[128];// Data Preparer Identifier (*not* ASCIIZ) - char applicationID[128]; // Application Identifier (*not* ASCIIZ) - - char copyrightFile[37]; // Copyright File Identifier(*not* ASCIIZ) - char abstractFile[37]; // Abstract File Identifier (*not* ASCIIZ) - char bibliogrFile[37]; // Bibliographical File Id. (*not* ASCIIZ) - - iso_vol_date dateCreation; // Date and Time of volume creation - iso_vol_date dateModification; // Date and Time of volume modification - iso_vol_date dateExpires; // Date and Time that volume expires - iso_vol_date dateEffective; // Date and Time that volume comes effective - - unsigned char undef5; // 1 - unsigned char undef6; // 0 - unsigned char forAppUse[512]; // usually zeroes - unsigned char undef7[653]; // all 0 -} PACKED iso_volume_descriptor; - -#endif diff --git a/headers/private/kernel/khash.h b/headers/private/kernel/util/khash.h similarity index 100% rename from headers/private/kernel/khash.h rename to headers/private/kernel/util/khash.h diff --git a/headers/private/kernel/kqueue.h b/headers/private/kernel/util/kqueue.h similarity index 100% rename from headers/private/kernel/kqueue.h rename to headers/private/kernel/util/kqueue.h diff --git a/headers/private/kernel/queue.h b/headers/private/kernel/util/queue.h similarity index 100% rename from headers/private/kernel/queue.h rename to headers/private/kernel/util/queue.h diff --git a/headers/private/kernel/vm_priv.h b/headers/private/kernel/vm_priv.h index f13365f6b1..c489f47a92 100644 --- a/headers/private/kernel/vm_priv.h +++ b/headers/private/kernel/vm_priv.h @@ -1,15 +1,15 @@ /* -** Copyright 2002-2004, The Haiku Team. All rights reserved. -** Distributed under the terms of the Haiku License. -** -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002-2005, The Haiku Team. All rights reserved. + * Distributed under the terms of the MIT License. + * + * 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 #include -#include +#include /* should make these scale with the system */ #define DEFAULT_KERNEL_WORKING_SET 1024 diff --git a/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile b/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile index 753d23132f..11b2abb22f 100644 --- a/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/arch/ppc/Jamfile @@ -1,5 +1,7 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci arch ppc ; +SubDirHdrs [ FDirName $(DOTDOT) $(DOTDOT) ] ; + KernelStaticLibrary pci_arch_bus_manager : pci_config.c pci_io.c diff --git a/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile b/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile index 4e3ff98549..52acdf69ec 100644 --- a/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/arch/x86/Jamfile @@ -1,5 +1,7 @@ SubDir OBOS_TOP src add-ons kernel bus_managers pci arch x86 ; +SubDirHdrs [ FDirName $(DOTDOT) $(DOTDOT) ] ; + KernelStaticLibrary pci_arch_bus_manager : bios.c pci_config.c diff --git a/headers/private/kernel/pci_priv.h b/src/add-ons/kernel/bus_managers/pci/pci_priv.h similarity index 100% rename from headers/private/kernel/pci_priv.h rename to src/add-ons/kernel/bus_managers/pci/pci_priv.h diff --git a/src/kernel/core/arch/x86/arch_vm_translation_map.c b/src/kernel/core/arch/x86/arch_vm_translation_map.c index 99ade608c0..c46e473e28 100644 --- a/src/kernel/core/arch/x86/arch_vm_translation_map.c +++ b/src/kernel/core/arch/x86/arch_vm_translation_map.c @@ -1,17 +1,17 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -** -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ #include #include #include #include -#include +#include #include #include #include diff --git a/src/kernel/core/cache/block_cache.cpp b/src/kernel/core/cache/block_cache.cpp index d8ca87c08c..70e7e08a3d 100644 --- a/src/kernel/core/cache/block_cache.cpp +++ b/src/kernel/core/cache/block_cache.cpp @@ -7,11 +7,11 @@ #include #include +#include +#include #include #include -#include -#include -#include +#include #include #include diff --git a/headers/private/kernel/font.h b/src/kernel/core/debug/font.h similarity index 99% rename from headers/private/kernel/font.h rename to src/kernel/core/debug/font.h index 4f30e2f3cb..502c77c1ea 100644 --- a/headers/private/kernel/font.h +++ b/src/kernel/core/debug/font.h @@ -1,5 +1,4 @@ -/* $Id: font.h,v 1.2 2004/06/16 02:10:27 axeld Exp $ -** +/* ** Copyright 2001 Brian J. Swetland ** All rights reserved. ** diff --git a/src/kernel/core/debug/frame_buffer_console.cpp b/src/kernel/core/debug/frame_buffer_console.cpp index 487d00638a..d11a05fcb6 100644 --- a/src/kernel/core/debug/frame_buffer_console.cpp +++ b/src/kernel/core/debug/frame_buffer_console.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/src/kernel/core/device_manager/probe.cpp b/src/kernel/core/device_manager/probe.cpp index ea6e55742a..c42bf9fa1a 100644 --- a/src/kernel/core/device_manager/probe.cpp +++ b/src/kernel/core/device_manager/probe.cpp @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/kernel/core/elf.c b/src/kernel/core/elf.c index 963bad8b1f..fdcd11f821 100644 --- a/src/kernel/core/elf.c +++ b/src/kernel/core/elf.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/kernel/core/int.c b/src/kernel/core/int.c index 09feb652bb..e24156478e 100644 --- a/src/kernel/core/int.c +++ b/src/kernel/core/int.c @@ -1,19 +1,22 @@ /* -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ + -#include #include -#include -#include #include -#include -#include +#include #include +#include + #include #include -#include +#include + #define NUM_IO_VECTORS 256 diff --git a/src/kernel/core/module.c b/src/kernel/core/module.c index c659c572b0..162f855bcd 100644 --- a/src/kernel/core/module.c +++ b/src/kernel/core/module.c @@ -13,9 +13,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/kernel/core/scheduler.c b/src/kernel/core/scheduler.c index 96cf36f0e1..43ee19d58b 100644 --- a/src/kernel/core/scheduler.c +++ b/src/kernel/core/scheduler.c @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include //#define TRACE_SCHEDULER diff --git a/src/kernel/core/syscalls.c b/src/kernel/core/syscalls.c index 98e181542e..770e736d64 100644 --- a/src/kernel/core/syscalls.c +++ b/src/kernel/core/syscalls.c @@ -1,5 +1,5 @@ /* - * Copyright 2004, Haiku Inc. All rights reserved. + * Copyright 2004-2005, Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. */ @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/kernel/core/team.c b/src/kernel/core/team.c index 1896df88a1..0386960f26 100644 --- a/src/kernel/core/team.c +++ b/src/kernel/core/team.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/kernel/core/thread.c b/src/kernel/core/thread.c index 0e35078160..39717da1ca 100644 --- a/src/kernel/core/thread.c +++ b/src/kernel/core/thread.c @@ -12,18 +12,18 @@ #include #include -#include #include #include #include #include -#include -#include #include #include #include #include #include +#include +#include +#include #include #include diff --git a/src/kernel/core/vm/vm.c b/src/kernel/core/vm/vm.c index b7f20e59a5..6cb62f5bf7 100644 --- a/src/kernel/core/vm/vm.c +++ b/src/kernel/core/vm/vm.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/kernel/core/vm/vm_address_space.c b/src/kernel/core/vm/vm_address_space.c index 87a52b0dc7..6bbd86d647 100644 --- a/src/kernel/core/vm/vm_address_space.c +++ b/src/kernel/core/vm/vm_address_space.c @@ -1,10 +1,10 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -** -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ #include @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/kernel/core/vm/vm_cache.c b/src/kernel/core/vm/vm_cache.c index d44b0b7b91..c288891d75 100644 --- a/src/kernel/core/vm/vm_cache.c +++ b/src/kernel/core/vm/vm_cache.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. * * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. @@ -12,15 +12,15 @@ #include #include #include -#include #include -#include +#include #include #include #include #include #include -#include + +#include //#define TRACE_VM_CACHE #ifdef TRACE_VM_CACHE diff --git a/src/kernel/core/vm/vm_daemons.c b/src/kernel/core/vm/vm_daemons.c index a0ba05c0c4..6d15be561b 100644 --- a/src/kernel/core/vm/vm_daemons.c +++ b/src/kernel/core/vm/vm_daemons.c @@ -1,15 +1,15 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -** -** Copyright 2001, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Copyright 2001, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ + #include #include #include -#include #include #include #include @@ -17,6 +17,7 @@ #include #include + bool trimming_cycle; static addr_t free_memory_low_water; static addr_t free_memory_high_water;