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

Now a session_info is passed instead of individual parameters.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2301 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2002-12-25 15:17:23 +00:00
parent 27563d0575
commit ad7f737efe
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/disk_scanner/partition/intel.c
+9 -6
View File
@@ -337,11 +337,12 @@ std_ops(int32 op, ...)
// intel_identify // intel_identify
static static
bool bool
intel_identify(int deviceFD, off_t sessionOffset, off_t sessionSize, intel_identify(int deviceFD, const session_info *sessionInfo,
const uchar *block, int32 blockSize) const uchar *block)
{ {
const partition_table_sector *pts = (const partition_table_sector*)block; const partition_table_sector *pts = (const partition_table_sector*)block;
bool result = true; bool result = true;
int32 blockSize = sessionInfo->logical_block_size;
TRACE(("intel: identify(%d, %lld, %lld, %p, %ld)\n", deviceFD, TRACE(("intel: identify(%d, %lld, %lld, %p, %ld)\n", deviceFD,
sessionOffset, sessionSize, block, blockSize)); sessionOffset, sessionSize, block, blockSize));
// check block size // check block size
@@ -364,15 +365,17 @@ intel_identify(int deviceFD, off_t sessionOffset, off_t sessionSize,
// intel_get_nth_info // intel_get_nth_info
static static
status_t status_t
intel_get_nth_info(int deviceFD, off_t sessionOffset, off_t sessionSize, intel_get_nth_info(int deviceFD, const session_info *sessionInfo,
const uchar *block, int32 blockSize, int32 index, const uchar *block, int32 index,
extended_partition_info *partitionInfo) extended_partition_info *partitionInfo)
{ {
status_t error = B_ENTRY_NOT_FOUND; 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, TRACE(("intel: get_nth_info(%d, %lld, %lld, %p, %ld, %ld)\n", deviceFD,
sessionOffset, sessionSize, block, blockSize, index)); sessionOffset, sessionSize, block, blockSize, index));
if (intel_identify(deviceFD, sessionOffset, sessionSize, block, if (intel_identify(deviceFD, sessionInfo, block)) {
blockSize)) {
if (index >= 0) { if (index >= 0) {
partition_spec *partitionList = NULL; partition_spec *partitionList = NULL;
error = parse_partition_map(deviceFD, sessionOffset, sessionSize, error = parse_partition_map(deviceFD, sessionOffset, sessionSize,