From bdcd7fcadc390466fb110a55e0932bedc1232b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 30 Nov 2009 15:32:38 +0000 Subject: [PATCH] * Remove kernel/disk_device_manager from Jamfiles (the add-ons now need to specify the path). * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34377 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/partitioning_systems/amiga/Jamfile | 15 +---- .../partitioning_systems/amiga/amiga_rdb.cpp | 57 +++++++++++-------- .../kernel/partitioning_systems/efi/Jamfile | 1 - .../partitioning_systems/efi/efi_gpt.cpp | 2 +- .../kernel/partitioning_systems/intel/Jamfile | 5 +- .../partitioning_systems/intel/intel.cpp | 2 +- .../intel/write_support.cpp | 2 +- .../intel/write_support.h | 4 +- .../partitioning_systems/session/Jamfile | 27 +-------- .../partitioning_systems/session/session.cpp | 2 +- 10 files changed, 43 insertions(+), 74 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile index c3d9f84a94..43b9a931b0 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile @@ -1,19 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems amiga ; -UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; -UsePrivateHeaders [ FDirName kernel ] ; -UsePrivateHeaders [ FDirName storage ] ; +UsePrivateHeaders kernel storage ; UsePrivateSystemHeaders ; KernelAddon amiga_rdb : amiga_rdb.cpp - ; - -#Addon amiga_rdb : -# amiga_rdb.cpp -# ; -# -#LinkAgainst amiga_rdb : -# libkernelland_emu.so -# libdisk_device_manager.so -# ; +; diff --git a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp index 8660b56e0e..924462df0e 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp +++ b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp @@ -1,14 +1,14 @@ /* -** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2003-2009, Axel Dörfler, axeld@pinc-software.de. + * Distributed under the terms of the MIT License. + */ #include "amiga_rdb.h" #include #include -#include +#include #include #ifdef _BOOT_MODE # include @@ -75,7 +75,8 @@ get_tupel(uint32 id) static status_t -get_next_partition(int fd, rigid_disk_block &rdb, uint32 &cookie, partition_block &partition) +get_next_partition(int fd, rigid_disk_block &rdb, uint32 &cookie, + partition_block &partition) { if (cookie == 0) { // first entry @@ -85,15 +86,16 @@ get_next_partition(int fd, rigid_disk_block &rdb, uint32 &cookie, partition_bloc return B_ENTRY_NOT_FOUND; } - ssize_t bytesRead = read_pos(fd, (off_t)cookie * rdb.BlockSize(), (void *)&partition, - sizeof(partition_block)); + ssize_t bytesRead = read_pos(fd, (off_t)cookie * rdb.BlockSize(), + (void *)&partition, sizeof(partition_block)); if (bytesRead < (ssize_t)sizeof(partition_block)) return B_ERROR; - // ToDo: Should we retry with the next block if the following test fails, as - // long as this we find partition_blocks within a reasonable range? + // TODO: Should we retry with the next block if the following test fails, as + // long as this we find partition_blocks within a reasonable range? - if (partition.ID() != RDB_PARTITION_ID || !validate_check_sum(&partition)) + if (partition.ID() != RDB_PARTITION_ID + || !validate_check_sum(&partition)) return B_BAD_DATA; cookie = partition.Next(); @@ -113,7 +115,8 @@ search_rdb(int fd, rigid_disk_block **_rdb) } rigid_disk_block *rdb = (rigid_disk_block *)buffer; - if (rdb->ID() == RDB_DISK_ID && validate_check_sum(rdb)) { + if (rdb->ID() == RDB_DISK_ID + && validate_check_sum(rdb)) { // copy the RDB to a new piece of memory rdb = new rigid_disk_block(); memcpy(rdb, buffer, sizeof(rigid_disk_block)); @@ -127,8 +130,7 @@ search_rdb(int fd, rigid_disk_block **_rdb) } -// #pragma mark - -// AmigaRDB public module interface +// #pragma mark - public module interface static status_t @@ -174,19 +176,25 @@ amiga_rdb_scan_partition(int fd, partition_data *partition, void *_cookie) uint32 index = 0, cookie = 0; status_t status; - while ((status = get_next_partition(fd, rdb, cookie, partitionBlock)) == B_OK) { - disk_environment &environment = *(disk_environment *)&partitionBlock.environment[0]; - TRACE(("amiga_rdb: file system: %s\n", get_tupel(B_BENDIAN_TO_HOST_INT32(environment.dos_type)))); + while ((status = get_next_partition(fd, rdb, cookie, partitionBlock)) + == B_OK) { + disk_environment &environment + = *(disk_environment *)&partitionBlock.environment[0]; + TRACE(("amiga_rdb: file system: %s\n", + get_tupel(B_BENDIAN_TO_HOST_INT32(environment.dos_type)))); - if (environment.Start() + environment.Size() > (uint64)partition->size) { - TRACE(("amiga_rdb: child partition exceeds existing space (%Ld bytes)\n", environment.Size())); + if (environment.Start() + environment.Size() + > (uint64)partition->size) { + TRACE(("amiga_rdb: child partition exceeds existing space (%Ld " + "bytes)\n", environment.Size())); continue; } partition_data *child = create_child_partition(partition->id, index++, partition->offset + environment.Start(), environment.Size(), -1); if (child == NULL) { - TRACE(("amiga_rdb: Creating child at index %ld failed\n", index - 1)); + TRACE(("amiga_rdb: Creating child at index %ld failed\n", + index - 1)); return B_ERROR; } @@ -201,7 +209,8 @@ amiga_rdb_scan_partition(int fd, partition_data *partition, void *_cookie) static void -amiga_rdb_free_identify_partition_cookie(partition_data *partition, void *_cookie) +amiga_rdb_free_identify_partition_cookie(partition_data *partition, + void *_cookie) { delete (rigid_disk_block *)_cookie; } @@ -222,12 +231,10 @@ partition_module_info gAmigaPartitionModule = { 0, // flags // scanning - amiga_rdb_identify_partition, // identify_partition - amiga_rdb_scan_partition, // scan_partition - amiga_rdb_free_identify_partition_cookie, // free_identify_partition_cookie + amiga_rdb_identify_partition, + amiga_rdb_scan_partition, + amiga_rdb_free_identify_partition_cookie, NULL, -// amiga_rdb_free_partition_cookie, // free_partition_cookie -// amiga_rdb_free_partition_content_cookie, // free_partition_content_cookie }; #ifndef _BOOT_MODE diff --git a/src/add-ons/kernel/partitioning_systems/efi/Jamfile b/src/add-ons/kernel/partitioning_systems/efi/Jamfile index faa6305497..431a677789 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/efi/Jamfile @@ -1,6 +1,5 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems efi ; -UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders interface kernel storage ; UsePrivateSystemHeaders ; diff --git a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp index 6794edd8d2..4231c76c38 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp +++ b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp @@ -9,7 +9,7 @@ #include "efi_gpt.h" #include -#include +#include #include #ifdef _BOOT_MODE # include diff --git a/src/add-ons/kernel/partitioning_systems/intel/Jamfile b/src/add-ons/kernel/partitioning_systems/intel/Jamfile index 846714fdb2..c3137bfb9c 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/intel/Jamfile @@ -1,9 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems intel ; -UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; -UsePrivateHeaders kernel ; -UsePrivateHeaders shared ; -UsePrivateHeaders storage ; +UsePrivateHeaders kernel shared storage ; UsePrivateSystemHeaders ; KernelAddon intel : diff --git a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp index b07044f94b..b117be93a6 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "intel.h" #include "PartitionLocker.h" diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp index 0693909196..4f357c4279 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp @@ -7,6 +7,7 @@ * Tomas Kucera, kucerat@centrum.cz */ + #include "write_support.h" #include @@ -20,7 +21,6 @@ #include #include -#include #include "intel.h" #include "PartitionLocker.h" diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.h b/src/add-ons/kernel/partitioning_systems/intel/write_support.h index a70e21a531..dbf48c2818 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.h +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.h @@ -1,12 +1,12 @@ /* * Copyright 2007, Ingo Weinhold, bonefish@cs.tu-berlin.de. All rights reserved. - * * Distributed under the terms of the MIT License. */ #ifndef INTEL_WRITE_SUPPORT_H #define INTEL_WRITE_SUPPORT_H -#include + +#include uint32 pm_get_supported_operations(partition_data* partition, diff --git a/src/add-ons/kernel/partitioning_systems/session/Jamfile b/src/add-ons/kernel/partitioning_systems/session/Jamfile index eb20e2b934..5390930794 100644 --- a/src/add-ons/kernel/partitioning_systems/session/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/session/Jamfile @@ -1,33 +1,10 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems session ; -#UsePrivateHeaders $(DOT) ; -UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; -UsePrivateHeaders [ FDirName kernel ] ; -UsePrivateHeaders [ FDirName storage ] ; +UsePrivateHeaders kernel storage ; UsePrivateSystemHeaders ; -{ -# local defines = [ FDefines USER ] ; -# SubDirCcFlags $(defines) ; -# SubDirC++Flags $(defines) ; -} - -local session_files = +KernelAddon session : Debug.cpp Disc.cpp session.cpp - ; - -KernelAddon session : - $(session_files) ; - -# also build a userland version -#Addon session : -# [ FGristFiles $(session_files:S=$(SUFOBJ)) ] -#; -# -#LinkAgainst session : -# libkernelland_emu.so -# libdisk_device_manager.so -#; diff --git a/src/add-ons/kernel/partitioning_systems/session/session.cpp b/src/add-ons/kernel/partitioning_systems/session/session.cpp index d565dac016..501d3b49fd 100644 --- a/src/add-ons/kernel/partitioning_systems/session/session.cpp +++ b/src/add-ons/kernel/partitioning_systems/session/session.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include #include