boot loader: Almost removed use of kernel_cpp.h.

* For some reason that is beyond me, fat/CachedBlock.cpp needs this header,
  or else building the boot loader fails.

src/system/boot/loader/RootFileSystem.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -7,7 +7,6 @@
 #include "RootFileSystem.h"
 
 #include <OS.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <fcntl.h>

src/system/boot/loader/file_systems/amiga_ffs/Directory.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -9,7 +9,6 @@
 #include "File.h"
 
 #include <StorageDefs.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>
@@ -18,6 +17,7 @@
 
 namespace FFS {
 
+
 Directory::Directory(Volume &volume, int32 block)
 	:
 	fVolume(volume)
@@ -165,4 +165,5 @@ Directory::Inode() const
 	return fNode.HeaderKey();
 }
 
+
 }	// namespace FFS

src/system/boot/loader/file_systems/amiga_ffs/File.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -10,11 +10,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <util/kernel_cpp.h>
-
 
 namespace FFS {
 
+
 class Stream {
 	public:
 		Stream(int device, FileBlock &node);
@@ -255,4 +254,5 @@ File::Inode() const
 	return fNode.HeaderKey();
 }
 
+
 }	// namespace FFS

src/system/boot/loader/file_systems/amiga_ffs/Volume.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -9,7 +9,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>

src/system/boot/loader/file_systems/amiga_ffs/amiga_ffs.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -8,7 +8,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>

src/system/boot/loader/file_systems/bfs/Directory.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2010, Axel Dörfler, [email protected].
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -10,7 +10,6 @@
 
 #include <StorageDefs.h>
 #include <KernelExport.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>

src/system/boot/loader/file_systems/bfs/File.cpp

@@ -1,16 +1,15 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * This file may be used under the terms of the MIT License.
  */
 
 
 #include "File.h"
 
-#include <util/kernel_cpp.h>
-
 
 namespace BFS {
 
+
 File::File(Volume &volume, block_run run)
 	:
 	fStream(volume, run)
@@ -89,4 +88,5 @@ File::Inode() const
 	return fStream.ID();
 }
 
+
 }	// namespace BFS

src/system/boot/loader/file_systems/bfs/Link.cpp

@@ -1,16 +1,15 @@
 /*
-** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * This file may be used under the terms of the MIT License.
  */
 
 
 #include "Link.h"
 
-#include <util/kernel_cpp.h>
-
 
 namespace BFS {
 
+
 Link::Link(Volume &volume, block_run run)
 	: File(volume, run)
 {
@@ -63,4 +62,5 @@ Link::Type() const
 	return S_IFLNK;
 }
 
+
 }	// namespace BFS

src/system/boot/loader/file_systems/bfs/Stream.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2010, Axel Dörfler, [email protected].
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
  * This file may be used under the terms of the MIT License.
  */
 
@@ -12,8 +12,6 @@
 #include "File.h"
 #include "Link.h"
 
-#include <util/kernel_cpp.h>
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

src/system/boot/loader/file_systems/bfs/bfs.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009, Axel Dörfler, [email protected].
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -12,7 +12,6 @@
 #include <boot/partitions.h>
 #include <boot/platform.h>
 #include <boot/vfs.h>
-#include <util/kernel_cpp.h>
 
 #include "Volume.h"
 #include "Directory.h"

src/system/boot/loader/file_systems/fat/CachedBlock.h

@@ -9,16 +9,12 @@
 #define CACHED_BLOCK_H
 
 
-#include <SupportDefs.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 #include "Volume.h"
 
 
 namespace FATFS {
 
+
 class CachedBlock {
 	public:
 		enum {

src/system/boot/loader/file_systems/fat/Directory.cpp

@@ -1,6 +1,7 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Copyright 2008, François Revol <[email protected]>
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -14,7 +15,6 @@
 #include <new>
 
 #include <StorageDefs.h>
-#include <util/kernel_cpp.h>
 
 #include "CachedBlock.h"
 #include "File.h"
@@ -24,8 +24,10 @@
 //#define TRACE(x) dprintf x
 #define TRACE(x) do {} while (0)
 
+
 namespace FATFS {
 
+
 struct dir_entry {
 	void *Buffer() const { return (void *)fName; };
 	const char *BaseName() const { return fName; };
@@ -328,7 +330,7 @@ Directory::Open(void **_cookie, int mode)
 	TRACE(("FASFS::Directory::%s(, %d)\n", __FUNCTION__, mode));
 	_inherited::Open(_cookie, mode);
 
-	struct dir_cookie *c = new struct dir_cookie;
+	dir_cookie *c = new(nothrow) dir_cookie;
 	if (c == NULL)
 		return B_NO_MEMORY;
 

src/system/boot/loader/file_systems/fat/File.cpp

@@ -1,6 +1,7 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Copyright 2008, François Revol <[email protected]>
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -9,8 +10,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <util/kernel_cpp.h>
-
 #include "Directory.h"
 
 
@@ -137,4 +136,5 @@ File::Inode() const
 	return fStream.FirstCluster() << 16;
 }
 
+
 }	// namespace FATFS

src/system/boot/loader/file_systems/fat/Stream.cpp

@@ -17,12 +17,12 @@
 #include <algorithm>
 
 #include <boot/FileMapDisk.h>
-#include <util/kernel_cpp.h>
 
 #include "CachedBlock.h"
 #include "Directory.h"
 #include "File.h"
 
+
 //#define TRACE(x) dprintf x
 #define TRACE(x) do {} while (0)
 

src/system/boot/loader/file_systems/fat/Volume.cpp

@@ -1,6 +1,7 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
-** Distributed under the terms of the OpenBeOS License.
+ * Copyright 2008, François Revol <[email protected]>
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -10,7 +11,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>
@@ -18,9 +18,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+
 //#define TRACE(x) dprintf x
 #define TRACE(x) do {} while (0)
 
+
 using namespace FATFS;
 
 
@@ -33,7 +35,7 @@ Volume::Volume(boot::Partition *partition)
 	if ((fDevice = open_node(partition, O_RDONLY)) < B_OK)
 		return;
 
-	fCachedBlock = new CachedBlock(*this);
+	fCachedBlock = new(nothrow) CachedBlock(*this);
 	if (fCachedBlock == NULL)
 		return;
 
@@ -135,13 +137,13 @@ Volume::Volume(boot::Partition *partition)
 		fFatBits = 16;
 		goto err1;
 	}
-	TRACE(("%s: block size %d, sector size %d, sectors/cluster %d\n", __FUNCTION__,
+	TRACE(("%s: block size %d, sector size %d, sectors/cluster %d\n",
-		fBlockSize, fBytesPerSector, fSectorsPerCluster));
+		__FUNCTION__, fBlockSize, fBytesPerSector, fSectorsPerCluster));
-	TRACE(("%s: block shift %d, sector shift %d, cluster shift %d\n", __FUNCTION__,
+	TRACE(("%s: block shift %d, sector shift %d, cluster shift %d\n",
-		fBlockShift, fSectorShift, fClusterShift));
+		__FUNCTION__, fBlockShift, fSectorShift, fClusterShift));
-	TRACE(("%s: reserved %d, max root entries %d, media %02x, sectors/fat %d\n", __FUNCTION__,
+	TRACE(("%s: reserved %d, max root entries %d, media %02x, sectors/fat %d\n",
-		fReservedSectors, fMaxRootEntries, fMediaDesc, fSectorsPerFat));
+		__FUNCTION__, fReservedSectors, fMaxRootEntries, fMediaDesc,
-
+		fSectorsPerFat));
 
 	//if (fTotalSectors > partition->sectors_per_track * partition->cylinder_count * partition->head_count)
 	if ((off_t)fTotalSectors * fBytesPerSector > partition->size)
@@ -150,7 +152,7 @@ Volume::Volume(boot::Partition *partition)
 	TRACE(("%s: found fat%d filesystem, root dir at cluster %d\n", __FUNCTION__,
 		fFatBits, fRootDirCluster));
 
-	fRoot = new Directory(*this, 0, fRootDirCluster, "/");
+	fRoot = new(nothrow) Directory(*this, 0, fRootDirCluster, "/");
 	return;
 
 err1:
@@ -413,7 +415,7 @@ static status_t
 dosfs_get_file_system(boot::Partition *partition, ::Directory **_root)
 {
 	TRACE(("%s()\n", __FUNCTION__));
-	Volume *volume = new Volume(partition);
+	Volume *volume = new(nothrow) Volume(partition);
 	if (volume == NULL)
 		return B_NO_MEMORY;
 

src/system/boot/loader/file_systems/fat/fatfs.cpp

@@ -1,6 +1,6 @@
 /*
-** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2008, François Revol <[email protected]>
-** Distributed under the terms of the OpenBeOS License.
+ * Distributed under the terms of the MIT License.
  */
 
 
@@ -8,7 +8,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>

src/system/boot/loader/file_systems/hfs_plus/hfs_plus.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2005-2013, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -8,7 +8,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <unistd.h>

src/system/boot/loader/file_systems/tarfs/tarfs.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright 2005-2007, Ingo Weinhold, [email protected].
- * Copyright 2005-2009, Axel Dörfler, [email protected].
+ * Copyright 2005-2013, Axel Dörfler, [email protected].
  *
  * Distributed under the terms of the MIT License.
  */
@@ -21,7 +21,6 @@
 
 #include <boot/partitions.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 #include <util/DoublyLinkedList.h>
 
 
@@ -39,6 +38,7 @@ static const size_t kTarRegionSize = 8 * 1024 * 1024;	// 8 MB
 
 namespace TarFS {
 
+
 struct RegionDelete {
 	inline void operator()(void* memory)
 	{
@@ -813,7 +813,6 @@ TarFS::Volume::_Inflate(boot::Partition* partition, void* cookie, off_t offset,
 }
 
 
-
 //	#pragma mark -
 
 

src/system/boot/loader/heap.cpp

@@ -1,12 +1,11 @@
 /*
- * Copyright 2003-2009, Axel Dörfler, [email protected].
+ * Copyright 2003-2013, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
 
 #include <boot/heap.h>
 #include <boot/platform.h>
-#include <util/kernel_cpp.h>
 
 #ifdef HEAP_TEST
 #	include <stdio.h>

src/system/boot/loader/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2013, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -14,8 +14,6 @@
 #include <boot/heap.h>
 #include <boot/stdio.h>
 
-#include <util/kernel_cpp.h>
-
 
 //#define TRACE_MAIN
 #ifdef TRACE_MAIN

src/system/boot/loader/menu.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2010, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2013, Axel Dörfler, axeld@pinc-software.de.
  * Copyright 2011, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
@@ -21,7 +21,6 @@
 #include <boot/platform/generic/text_console.h>
 #include <boot/stdio.h>
 #include <safemode.h>
-#include <util/kernel_cpp.h>
 #include <util/ring_buffer.h>
 
 #include "kernel_debug_config.h"

src/system/boot/loader/partitions.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2013, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -16,7 +16,6 @@
 #include <boot/stdio.h>
 #include <boot/vfs.h>
 #include <ddm_modules.h>
-#include <util/kernel_cpp.h>
 
 #include "RootFileSystem.h"
 
@@ -212,7 +211,7 @@ Partition::Type() const
 Partition *
 Partition::AddChild()
 {
-	Partition *child = new Partition(fFD);
+	Partition *child = new(nothrow) Partition(fFD);
 	TRACE(("%p Partition::AddChild %p\n", this, child));
 	if (child == NULL)
 		return NULL;
@@ -426,7 +425,7 @@ add_partitions_for(int fd, bool mountFileSystems, bool isBootDevice)
 	TRACE(("add_partitions_for(fd = %d, mountFS = %s)\n", fd,
 		mountFileSystems ? "yes" : "no"));
 
-	Partition *partition = new Partition(fd);
+	Partition *partition = new(nothrow) Partition(fd);
 
 	// set some magic/default values
 	partition->block_size = 512;

src/system/boot/loader/stdio.cpp

@@ -1,12 +1,11 @@
 /*
- * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2003-2013, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
 
 #include <boot/vfs.h>
 #include <boot/stdio.h>
-#include <util/kernel_cpp.h>
 
 #include <errno.h>
 #include <stdarg.h>

src/system/boot/loader/vfs.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2013, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -18,7 +18,6 @@
 #include <boot/partitions.h>
 #include <boot/stdio.h>
 #include <boot/stage2.h>
-#include <util/kernel_cpp.h>
 #include <syscall_utils.h>
 
 #include "RootFileSystem.h"