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

freebsd_network: Rewrite bus/vm headers to use Haiku phys_addr types directly.

Browse Source 
Instead of redeclaring them, which it did so incorrectly on systems
with PAE in some cases. May fix problems on some 32-bit systems.
This commit is contained in:
Augustin Cavalier
2022-06-10 13:38:08 -04:00
parent 3c5b619e97
commit 30763b1e79
3 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/compat/machine/_bus.h
+3 -19
View File
@@ -1,6 +1,5 @@
/* /*
* Copyright 2009, Colin Günther. All Rights Reserved. * Copyright 2022, Haiku, Inc. All rights reserved.
* Copyright 2007, Hugo Santos. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _FBSD_COMPAT_MACHINE__BUS_H_ #ifndef _FBSD_COMPAT_MACHINE__BUS_H_
@@ -11,6 +10,8 @@
typedef phys_addr_t bus_addr_t; typedef phys_addr_t bus_addr_t;
typedef phys_size_t bus_size_t;
typedef addr_t bus_space_handle_t;
typedef int bus_space_tag_t; typedef int bus_space_tag_t;
@@ -24,21 +25,4 @@ enum {
}; };
#ifdef B_HAIKU_64_BIT
typedef uint64_t bus_size_t;
typedef uint64_t bus_space_handle_t;
#else
typedef uint32_t bus_size_t;
typedef unsigned int bus_space_handle_t;
#if defined(__HAIKU_ARCH_PHYSICAL_64_BIT) && defined(__i386__)
#define PAE 1
#endif
#endif
#endif /* _FBSD_COMPAT_MACHINE__BUS_H_ */ #endif /* _FBSD_COMPAT_MACHINE__BUS_H_ */
src/libs/compat/freebsd_network/compat/machine/x86/bus.h
+4
View File
@@ -117,6 +117,10 @@
#define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF
#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF
#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
#if defined(__HAIKU_ARCH_PHYSICAL_64_BIT) && defined(__i386__)
#define PAE 1
#endif
#if defined(__amd64__) || defined(PAE) #if defined(__amd64__) || defined(PAE)
#define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL #define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL
#else #else
src/libs/compat/freebsd_network/compat/vm/vm.h
+7 -18
View File
@@ -1,36 +1,25 @@
/* /*
* Copyright 2007, Hugo Santos. All Rights Reserved. * Copyright 2022, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _FBSD_COMPAT_VM_VM_H_ #ifndef _FBSD_COMPAT_VM_VM_H_
#define _FBSD_COMPAT_VM_VM_H_ #define _FBSD_COMPAT_VM_VM_H_
#include <stdint.h>
#include <KernelExport.h> #include <KernelExport.h>
#ifdef B_HAIKU_64_BIT typedef phys_addr_t vm_paddr_t;
typedef addr_t vm_offset_t;
typedef uint64_t vm_offset_t; typedef void* pmap_t;
typedef uint64_t vm_paddr_t;
#else
typedef uint32_t vm_offset_t;
typedef uint32_t vm_paddr_t;
#endif
typedef void *pmap_t;
#define vmspace_pmap(...) NULL
#define pmap_extract(...) NULL
vm_paddr_t pmap_kextract(vm_offset_t virtualAddress); vm_paddr_t pmap_kextract(vm_offset_t virtualAddress);
#define vtophys(virtualAddress) pmap_kextract((vm_offset_t)(virtualAddress)) #define vtophys(virtualAddress) pmap_kextract((vm_offset_t)(virtualAddress))
#define vmspace_pmap(...) NULL
#define pmap_extract(...) NULL
#endif /* _FBSD_COMPAT_VM_VM_H_ */ #endif /* _FBSD_COMPAT_VM_VM_H_ */