i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Turned on debugging in the Intel partitioning system add-on, and the partition

Browse Source 
stuff of the boot loader to help with bug #238.
* Minor cleanup (added license headers, fixed debug output)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18977 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-09-29 13:13:02 +00:00
parent 00529536d2
commit 8d9e5a451e
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
+10 -6
View File
@@ -1,7 +1,11 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- *
* Authors:
* Ingo Weinhold, [email protected]
*/
/*! /*!
\file PartitionMap.cpp \file PartitionMap.cpp
\brief Definitions for "intel" style partitions and implementation \brief Definitions for "intel" style partitions and implementation
@@ -28,8 +32,8 @@
#include "PartitionMap.h" #include "PartitionMap.h"
#define TRACE(x) ; //#define TRACE(x) ;
//#define TRACE(x) dprintf x #define TRACE(x) dprintf x
using std::nothrow; using std::nothrow;
src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
+11 -4
View File
@@ -1,4 +1,11 @@
// PartitionMapParser.cpp /*
* Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Ingo Weinhold, [email protected]
*/
#ifndef _USER_MODE #ifndef _USER_MODE
# include <KernelExport.h> # include <KernelExport.h>
@@ -14,8 +21,8 @@
#include "PartitionMap.h" #include "PartitionMap.h"
#include "PartitionMapParser.h" #include "PartitionMapParser.h"
#define TRACE(x) ; //#define TRACE(x) ;
//#define TRACE(x) dprintf x #define TRACE(x) dprintf x
using std::nothrow; using std::nothrow;
@@ -90,7 +97,7 @@ PartitionMapParser::_ParsePrimary(const partition_table_sector *pts)
// ignore, if location is bad // ignore, if location is bad
if (!partition->CheckLocation(fSessionSize, fBlockSize)) { if (!partition->CheckLocation(fSessionSize, fBlockSize)) {
TRACE(("intel: _ParsePrimary(): partition %ld: bad location, " TRACE(("intel: _ParsePrimary(): partition %ld: bad location, "
"ignoring\n")); "ignoring\n", i));
partition->Unset(); partition->Unset();
} }
} }
src/add-ons/kernel/partitioning_systems/intel/intel.cpp
+10 -6
View File
@@ -1,7 +1,11 @@
//---------------------------------------------------------------------- /*
// This software is part of the Haiku distribution and is covered * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
// by the Haiku license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- *
* Authors:
* Ingo Weinhold, [email protected]
*/
/*! /*!
\file intel.cpp \file intel.cpp
\brief disk_scanner partition module for "intel" style partitions. \brief disk_scanner partition module for "intel" style partitions.
@@ -31,8 +35,8 @@
#include "PartitionMap.h" #include "PartitionMap.h"
#include "PartitionMapParser.h" #include "PartitionMapParser.h"
#define TRACE(x) ; //#define TRACE(x) ;
//#define TRACE(x) dprintf x #define TRACE(x) dprintf x
// module names // module names
#define INTEL_PARTITION_MODULE_NAME "partitioning_systems/intel/map/v1" #define INTEL_PARTITION_MODULE_NAME "partitioning_systems/intel/map/v1"
src/system/boot/loader/partitions.cpp
+4 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2005, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2003-2006, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -19,7 +19,7 @@
using namespace boot; using namespace boot;
//#define TRACE_PARTITIONS #define TRACE_PARTITIONS
#ifdef TRACE_PARTITIONS #ifdef TRACE_PARTITIONS
# define TRACE(x) dprintf x # define TRACE(x) dprintf x
#else #else
@@ -409,7 +409,8 @@ get_child_partition(partition_id id, int32 index)
//Partition &partition = *(Partition *)id; //Partition &partition = *(Partition *)id;
// ToDo: do we really have to implement this? // ToDo: do we really have to implement this?
// The intel partition module doesn't really needs this for our mission... // The intel partition module doesn't really need this for our mission...
TRACE(("get_child_partition(id = %lu, index = %ld)\n", id, index));
return NULL; return NULL;
} }