Minor header cleanup: moved some headers to better matching directories,

removed unused headers. Adapted sources to still compile with the new
header locations.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11913 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/kernel/fb_console.h

@@ -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 */

headers/private/kernel/float.h

@@ -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_ */

headers/private/kernel/isovol.h

@@ -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

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 <vm.h>
-#include <khash.h>
+#include <util/khash.h>
 
 /* should make these scale with the system */
 #define DEFAULT_KERNEL_WORKING_SET  1024

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

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

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 <vm.h>
 #include <vm_page.h>
 #include <vm_priv.h>
 #include <smp.h>
-#include <queue.h>
+#include <util/queue.h>
 #include <kerrors.h>
 #include <memheap.h>
 #include <arch/vm_translation_map.h>

src/kernel/core/cache/block_cache.cpp

@@ -7,11 +7,11 @@
 #include <KernelExport.h>
 #include <fs_cache.h>
 
+#include <cache.h>
+#include <lock.h>
 #include <util/kernel_cpp.h>
 #include <util/DoublyLinkedList.h>
-#include <cache.h>
-#include <khash.h>
-#include <lock.h>
+#include <util/khash.h>
 
 #include <unistd.h>
 #include <stdlib.h>

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.
 **

src/kernel/core/debug/frame_buffer_console.cpp

@@ -5,7 +5,7 @@
 
 #include <KernelExport.h>
 #include <lock.h>
-#include <devfs.h>
+#include <fs/devfs.h>
 
 #include <boot/kernel_args.h>
 #include <frame_buffer_console.h>

src/kernel/core/device_manager/probe.cpp

@@ -20,9 +20,9 @@
 #include <elf.h>
 #include <kmodule.h>
 #include <fs/KPath.h>
+#include <fs/devfs.h>
 #include <util/Stack.h>
 #include <util/kernel_cpp.h>
-#include <devfs.h>
 
 #include <stdlib.h>
 #include <dirent.h>

src/kernel/core/elf.c

@@ -16,7 +16,7 @@
 #include <team.h>
 #include <debug.h>
 #include <kimage.h>
-#include <khash.h>
+#include <util/khash.h>
 #include <syscalls.h>
 
 #include <arch/cpu.h>

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 <kernel.h>
 #include <int.h>
-#include <debug.h>
-#include <malloc.h>
 #include <smp.h>
-#include <arch/int.h>
-#include <errno.h>
+#include <util/kqueue.h>
 #include <boot/kernel_args.h>
+#include <arch/int.h>
+
 #include <string.h>
 #include <stdio.h>
-#include <kqueue.h>
+#include <malloc.h>
+
 
 #define NUM_IO_VECTORS 256
 

src/kernel/core/module.c

@@ -13,9 +13,9 @@
 
 #include <kmodule.h>
 #include <lock.h>
-#include <khash.h>
 #include <elf.h>
 #include <vfs.h>
+#include <util/khash.h>
 #include <boot/elf.h>
 
 #include <sys/stat.h>

src/kernel/core/scheduler.c

@@ -17,8 +17,8 @@
 #include <int.h>
 #include <smp.h>
 #include <cpu.h>
-#include <khash.h>
 #include <debug.h>
+#include <util/khash.h>
 
 
 //#define TRACE_SCHEDULER

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 <arch_config.h>
 #include <disk_device_manager/ddm_userland_interface.h>
 #include <sys/resource.h>
-#include <fd.h>
+#include <fs/fd.h>
 #include <fs/node_monitor.h>
 #include <sysctl.h>
 #include <ksocket.h>

src/kernel/core/team.c

@@ -12,7 +12,7 @@
 
 #include <team.h>
 #include <int.h>
-#include <khash.h>
+#include <util/khash.h>
 #include <port.h>
 #include <sem.h>
 #include <user_runtime.h>

src/kernel/core/thread.c

@@ -12,18 +12,18 @@
 
 #include <thread.h>
 #include <team.h>
-#include <khash.h>
 #include <int.h>
 #include <smp.h>
 #include <cpu.h>
 #include <arch/vm.h>
-#include <user_runtime.h>
-#include <boot/kernel_args.h>
 #include <kimage.h>
 #include <ksignal.h>
 #include <syscalls.h>
 #include <tls.h>
 #include <vfs.h>
+#include <user_runtime.h>
+#include <boot/kernel_args.h>
+#include <util/khash.h>
 
 #include <sys/resource.h>
 #include <string.h>

src/kernel/core/vm/vm.c

@@ -25,7 +25,6 @@
 #include <int.h>
 #include <smp.h>
 #include <lock.h>
-#include <khash.h>
 #include <thread.h>
 #include <team.h>
 

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 <OS.h>
@@ -25,7 +25,6 @@
 #include <int.h>
 #include <smp.h>
 #include <lock.h>
-#include <khash.h>
 #include <thread.h>
 #include <team.h>
 

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 <vm_priv.h>
 #include <vm_cache.h>
 #include <vm_page.h>
-#include <malloc.h>
 #include <int.h>
-#include <khash.h>
+#include <util/khash.h>
 #include <lock.h>
 #include <debug.h>
 #include <lock.h>
 #include <smp.h>
 #include <arch/cpu.h>
-#include <Errors.h>
+
+#include <malloc.h>
 
 //#define TRACE_VM_CACHE
 #ifdef TRACE_VM_CACHE

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 <kernel.h>
 #include <thread.h>
 #include <debug.h>
-#include <khash.h>
 #include <OS.h>
 #include <arch/cpu.h>
 #include <vm.h>
@@ -17,6 +17,7 @@
 #include <vm_cache.h>
 #include <vm_page.h>
 
+
 bool trimming_cycle;
 static addr_t free_memory_low_water;
 static addr_t free_memory_high_water;