From ad7f737efe0b2dcd67a2e4e55715f9f54418fd98 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 25 Dec 2002 15:17:23 +0000 Subject: [PATCH] Now a session_info is passed instead of individual parameters. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2301 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/disk_scanner/partition/intel.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/add-ons/kernel/disk_scanner/partition/intel.c b/src/add-ons/kernel/disk_scanner/partition/intel.c index 21cf0a4056..fd63e82fb7 100644 --- a/src/add-ons/kernel/disk_scanner/partition/intel.c +++ b/src/add-ons/kernel/disk_scanner/partition/intel.c @@ -337,11 +337,12 @@ std_ops(int32 op, ...) // intel_identify static bool -intel_identify(int deviceFD, off_t sessionOffset, off_t sessionSize, - const uchar *block, int32 blockSize) +intel_identify(int deviceFD, const session_info *sessionInfo, + const uchar *block) { const partition_table_sector *pts = (const partition_table_sector*)block; bool result = true; + int32 blockSize = sessionInfo->logical_block_size; TRACE(("intel: identify(%d, %lld, %lld, %p, %ld)\n", deviceFD, sessionOffset, sessionSize, block, blockSize)); // check block size @@ -364,15 +365,17 @@ intel_identify(int deviceFD, off_t sessionOffset, off_t sessionSize, // intel_get_nth_info static status_t -intel_get_nth_info(int deviceFD, off_t sessionOffset, off_t sessionSize, - const uchar *block, int32 blockSize, int32 index, +intel_get_nth_info(int deviceFD, const session_info *sessionInfo, + const uchar *block, int32 index, extended_partition_info *partitionInfo) { status_t error = B_ENTRY_NOT_FOUND; + off_t sessionOffset = sessionInfo->offset; + off_t sessionSize = sessionInfo->size; + int32 blockSize = sessionInfo->logical_block_size; TRACE(("intel: get_nth_info(%d, %lld, %lld, %p, %ld, %ld)\n", deviceFD, sessionOffset, sessionSize, block, blockSize, index)); - if (intel_identify(deviceFD, sessionOffset, sessionSize, block, - blockSize)) { + if (intel_identify(deviceFD, sessionInfo, block)) { if (index >= 0) { partition_spec *partitionList = NULL; error = parse_partition_map(deviceFD, sessionOffset, sessionSize,