From 0a35130cc640a18cf1b04c2c0574d5cb6623ea14 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 21 Jun 2010 16:00:37 +0000 Subject: [PATCH] Removed undead code. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37196 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ide/Jamfile | 4 +- .../bus_managers/ide/KernelExport_ext.h | 31 ----- .../kernel/bus_managers/ide/virtual_memory.c | 121 ------------------ 3 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 src/add-ons/kernel/bus_managers/ide/KernelExport_ext.h delete mode 100644 src/add-ons/kernel/bus_managers/ide/virtual_memory.c diff --git a/src/add-ons/kernel/bus_managers/ide/Jamfile b/src/add-ons/kernel/bus_managers/ide/Jamfile index 15c8d76736..739e41cede 100644 --- a/src/add-ons/kernel/bus_managers/ide/Jamfile +++ b/src/add-ons/kernel/bus_managers/ide/Jamfile @@ -17,6 +17,4 @@ KernelAddon ide : queuing.c scsi2ata.c sync.c - virtual_memory.c - ; - +; diff --git a/src/add-ons/kernel/bus_managers/ide/KernelExport_ext.h b/src/add-ons/kernel/bus_managers/ide/KernelExport_ext.h deleted file mode 100644 index e40037edbb..0000000000 --- a/src/add-ons/kernel/bus_managers/ide/KernelExport_ext.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2004-2006, Haiku, Inc. All RightsReserved. - * Copyright 2002/03, Thomas Kurschel. All rights reserved. - * - * Distributed under the terms of the MIT License. - */ - -/* - Functions that are missing in kernel. -*/ - -#ifndef _KERNEL_EXPORT_EXT_H -#define _KERNEL_EXPORT_EXT_H - -#include -#include - - -// get memory map of iovec -status_t get_iovec_memory_map( - iovec *vec, // iovec to analyze - size_t vec_count, // number of entries in vec - size_t vec_offset, // number of bytes to skip at beginning of vec - size_t len, // number of bytes to analyze - physical_entry *map, // resulting memory map - size_t max_entries, // max number of entries in map - size_t *num_entries, // actual number of map entries used - size_t *mapped_len // actual number of bytes described by map -); - -#endif // _KERNEL_EXPORT_EXT_H diff --git a/src/add-ons/kernel/bus_managers/ide/virtual_memory.c b/src/add-ons/kernel/bus_managers/ide/virtual_memory.c deleted file mode 100644 index 16b4d4a8cc..0000000000 --- a/src/add-ons/kernel/bus_managers/ide/virtual_memory.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Copyright 2002/03, Thomas Kurschel. All rights reserved. - * - * Distributed under the terms of the MIT License. - */ - -/* - VM helper functions. - - Important assumption: get_memory_map must combine adjacent - physical pages, so contignous memory always leads to a S/G - list of length one. -*/ - -#include "KernelExport_ext.h" -#include "wrapper.h" - -#include - - -/** get sg list of iovec - * TBD: this should be moved to somewhere in kernel - */ - -status_t -get_iovec_memory_map(iovec *vec, size_t vec_count, size_t vec_offset, size_t len, - physical_entry *map, size_t max_entries, size_t *num_entries, size_t *mapped_len) -{ - size_t cur_idx; - size_t left_len; - - SHOW_FLOW(3, "vec_count=%lu, vec_offset=%lu, len=%lu, max_entries=%lu", - vec_count, vec_offset, len, max_entries); - - // skip iovec blocks if needed - while (vec_count > 0 && vec_offset > vec->iov_len) { - vec_offset -= vec->iov_len; - --vec_count; - ++vec; - } - - for (left_len = len, cur_idx = 0; left_len > 0 && vec_count > 0 && cur_idx < max_entries;) { - char *range_start; - size_t range_len; - status_t res; - size_t cur_num_entries, cur_mapped_len; - uint32 tmp_idx; - - SHOW_FLOW( 3, "left_len=%d, vec_count=%d, cur_idx=%d", - (int)left_len, (int)vec_count, (int)cur_idx ); - - // map one iovec - range_start = (char *)vec->iov_base + vec_offset; - range_len = min( vec->iov_len - vec_offset, left_len ); - - SHOW_FLOW( 3, "range_start=%x, range_len=%x", - (int)range_start, (int)range_len ); - - vec_offset = 0; - - if ((res = get_memory_map(range_start, range_len, &map[cur_idx], - max_entries - cur_idx)) != B_OK) { - // according to docu, no error is ever reported - argh! - SHOW_ERROR(1, "invalid io_vec passed (%s)", strerror(res)); - return res; - } - - // stupid: get_memory_map does neither tell how many sg blocks - // are used nor whether there were enough sg blocks at all; - // -> determine that manually - cur_mapped_len = 0; - cur_num_entries = 0; - - for (tmp_idx = cur_idx; tmp_idx < max_entries; ++tmp_idx) { - if (map[tmp_idx].size == 0) - break; - - cur_mapped_len += map[tmp_idx].size; - ++cur_num_entries; - } - - if (cur_mapped_len == 0) { - panic("get_memory_map() returned empty list; left_len=%d, idx=%d/%d", - (int)left_len, (int)cur_idx, (int)max_entries); - SHOW_ERROR(2, "get_memory_map() returned empty list; left_len=%d, idx=%d/%d", - (int)left_len, (int)cur_idx, (int)max_entries); - return B_ERROR; - } - - SHOW_FLOW( 3, "cur_num_entries=%d, cur_mapped_len=%x", - (int)cur_num_entries, (int)cur_mapped_len ); - - // try to combine with previous sg block - if (cur_num_entries > 0 && cur_idx > 0 - && map[cur_idx].address == (char *)map[cur_idx - 1].address + map[cur_idx - 1].size) { - SHOW_FLOW0( 3, "combine with previous chunk" ); - map[cur_idx - 1].size += map[cur_idx].size; - memcpy(&map[cur_idx], &map[cur_idx + 1], (cur_num_entries - 1) * sizeof(map[0])); - --cur_num_entries; - } - - cur_idx += cur_num_entries; - left_len -= cur_mapped_len; - - // advance iovec if current one is described completely - if (cur_mapped_len == range_len) { - ++vec; - --vec_count; - } - } - - *num_entries = cur_idx; - *mapped_len = len - left_len; - - SHOW_FLOW( 3, "num_entries=%d, mapped_len=%x", - (int)*num_entries, (int)*mapped_len ); - - return B_OK; -} -