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

* Introduced phys_addr_range type, an equivalent to addr_range for physical

Browse Source 
address ranges, and a set of support functions working with it.
* Changed the type of the kernel_args physical address range arrays to
  phys_addr_range and adjusted the code working with those.
* Removed a bunch of duplicated address range code in the PPC's mmu.cpp.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36947 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-05-27 11:50:40 +00:00
parent d245fcd9e9
commit d73ddac5bf
5 changed files with 230 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/boot/addr_range.h
+27 -11
View File
@@ -1,4 +1,5 @@
/*
* Copyright 2010, Ingo Weinhold, [email protected].
* Copyright 2004-2007, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License.
*/
@@ -11,26 +12,41 @@
typedef struct addr_range {
addr_t start;
addr_t size;
size_t size;
} addr_range;
typedef struct phys_addr_range {
phys_addr_t start;
phys_size_t size;
} phys_addr_range;
#ifdef __cplusplus
extern "C" {
#endif
status_t insert_address_range(addr_range *ranges, uint32 *_numRanges,
uint32 maxRanges, addr_t start, uint32 size);
status_t remove_address_range(addr_range *ranges, uint32 *_numRanges,
uint32 maxRanges, addr_t start, uint32 size);
bool get_free_address_range(addr_range *ranges, uint32 numRanges, addr_t base,
size_t size, addr_t *_rangeBase);
bool is_address_range_covered(addr_range *ranges, uint32 numRanges, addr_t base,
status_t insert_address_range(addr_range* ranges, uint32* _numRanges,
uint32 maxRanges, addr_t start, size_t size);
status_t remove_address_range(addr_range* ranges, uint32* _numRanges,
uint32 maxRanges, addr_t start, size_t size);
bool get_free_address_range(addr_range* ranges, uint32 numRanges, addr_t base,
size_t size, addr_t* _rangeBase);
bool is_address_range_covered(addr_range* ranges, uint32 numRanges, addr_t base,
size_t size);
status_t insert_physical_memory_range(addr_t start, uint32 size);
status_t insert_physical_allocated_range(addr_t start, uint32 size);
status_t insert_virtual_allocated_range(addr_t start, uint32 size);
status_t insert_physical_address_range(phys_addr_range* ranges,
uint32* _numRanges, uint32 maxRanges, phys_addr_t start, phys_size_t size);
status_t remove_physical_address_range(phys_addr_range* ranges,
uint32* _numRanges, uint32 maxRanges, phys_addr_t start, phys_size_t size);
bool get_free_physical_address_range(phys_addr_range* ranges, uint32 numRanges,
phys_addr_t base, phys_size_t size, phys_addr_t* _rangeBase);
bool is_physical_address_range_covered(phys_addr_range* ranges,
uint32 numRanges, phys_addr_t base, phys_size_t size);
status_t insert_physical_memory_range(phys_addr_t start, phys_size_t size);
status_t insert_physical_allocated_range(phys_addr_t start, phys_size_t size);
status_t insert_virtual_allocated_range(addr_t start, size_t size);
#ifdef __cplusplus
}
headers/private/kernel/boot/kernel_args.h
+9 -9
View File
@@ -46,14 +46,14 @@ typedef struct kernel_args {
struct preloaded_image kernel_image;
struct preloaded_image *preloaded_images;
uint32 num_physical_memory_ranges;
addr_range physical_memory_range[MAX_PHYSICAL_MEMORY_RANGE];
uint32 num_physical_allocated_ranges;
addr_range physical_allocated_range[MAX_PHYSICAL_ALLOCATED_RANGE];
uint32 num_virtual_allocated_ranges;
addr_range virtual_allocated_range[MAX_VIRTUAL_ALLOCATED_RANGE];
uint32 num_kernel_args_ranges;
addr_range kernel_args_range[MAX_KERNEL_ARGS_RANGE];
uint32 num_physical_memory_ranges;
phys_addr_range physical_memory_range[MAX_PHYSICAL_MEMORY_RANGE];
uint32 num_physical_allocated_ranges;
phys_addr_range physical_allocated_range[MAX_PHYSICAL_ALLOCATED_RANGE];
uint32 num_virtual_allocated_ranges;
addr_range virtual_allocated_range[MAX_VIRTUAL_ALLOCATED_RANGE];
uint32 num_kernel_args_ranges;
addr_range kernel_args_range[MAX_KERNEL_ARGS_RANGE];
uint32 num_cpus;
addr_range cpu_kstack[MAX_BOOT_CPUS];
@@ -63,7 +63,7 @@ typedef struct kernel_args {
struct driver_settings_file *driver_settings;
struct {
addr_range physical_buffer;
phys_addr_range physical_buffer;
uint32 bytes_per_row;
uint16 width;
uint16 height;