github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: 'virtual' is a keyword in C++ 

Exposing it in headers causes compilation problems.
This commit is contained in:
deadwood 2022-05-17 12:38:28 +02:00
parent 427e5ad8fb
commit 6977e5208e
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm-native/kernel/mapglobal.c
View File

@ -11,8 +11,8 @@
#include <proto/kernel.h>
AROS_LH4I(int, KrnMapGlobal,
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, physical, A1),
AROS_LHA(void *, virt, A0),
AROS_LHA(void *, phys, A1),
AROS_LHA(uint32_t, length, D0),
AROS_LHA(KRN_MapAttr, flags, D1),
struct KernelBase *, KernelBase, 16, Kernel)
@ -21,7 +21,7 @@ AROS_LH4I(int, KrnMapGlobal,
int retval = 0;
D(bug("[Kernel] KrnMapGlobal(%08x->%08x %08x %04x)\n", virtual, physical, length, flags));
D(bug("[Kernel] KrnMapGlobal(%08x->%08x %08x %04x)\n", virt, phys, length, flags));
return retval;

4
arch/arm-native/kernel/unmapglobal.c
View File

@ -11,7 +11,7 @@
#include <proto/kernel.h>
AROS_LH2I(int, KrnUnmapGlobal,
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, virt, A0),
AROS_LHA(uint32_t, length, D0),
struct KernelBase *, KernelBase, 17, Kernel)
{
@ -19,7 +19,7 @@ AROS_LH2I(int, KrnUnmapGlobal,
int retval = 0;
D(bug("[Kernel] KrnMapGlobal(%08x, %08x)\n", virtual, length));
D(bug("[Kernel] KrnUnmapGlobal(%08x, %08x)\n", virt, length));
return retval;

6
arch/m68k-all/kernel/mapglobal.c
View File

@ -13,8 +13,8 @@
/* See rom/kernel/mapglobal.c for documentation */
AROS_LH4(int, KrnMapGlobal,
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, physical, A1),
AROS_LHA(void *, virt, A0),
AROS_LHA(void *, phys, A1),
AROS_LHA(uint32_t, length, D0),
AROS_LHA(KRN_MapAttr, flags, D1),
struct KernelBase *, KernelBase, 16, Kernel)
@ -26,7 +26,7 @@ AROS_LH4(int, KrnMapGlobal,
BOOL supervisor = (flags & MAP_Supervisor) != 0;
UBYTE cm = (flags & MAP_CacheInhibit) ? CM_SERIALIZED : ((flags & MAP_WriteThrough) ? CM_WRITETHROUGH : CM_COPYBACK);
return map_region(KernelBase, virtual, physical, length, invalid, readonly, supervisor, cm);
return map_region(KernelBase, virt, phys, length, invalid, readonly, supervisor, cm);
AROS_LIBFUNC_EXIT
}

16
arch/ppc-chrp/efika/kernel/mmu.c
View File

@ -401,8 +401,8 @@ AROS_LH3(void, KrnSetProtection,
}
AROS_LH4(int, KrnMapGlobal,
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, physical, A1),
AROS_LHA(void *, virt, A0),
AROS_LHA(void *, phys, A1),
AROS_LHA(uint32_t, length, D0),
AROS_LHA(KRN_MapAttr, flags, D1),
struct KernelBase *, KernelBase, 16, Kernel)
@ -413,10 +413,10 @@ AROS_LH4(int, KrnMapGlobal,
uint32_t msr;
uint32_t ppc_prot = mmu_protection(flags);
D(bug("[KRN] KrnMapGlobal(%08x->%08x %08x %04x)\n", virtual, physical, length, flags));
D(bug("[KRN] KrnMapGlobal(%08x->%08x %08x %04x)\n", virt, phys, length, flags));
msr = goSuper();
retval = mmu_map_area((uint64_t)virtual & 0xffffffff, physical, length, ppc_prot);
retval = mmu_map_area((uint64_t)virt & 0xffffffff, phys, length, ppc_prot);
wrmsr(msr);
return retval;
@ -425,7 +425,7 @@ AROS_LH4(int, KrnMapGlobal,
}
AROS_LH2(int, KrnUnmapGlobal,
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, virt, A0),
AROS_LHA(uint32_t, length, D0),
struct KernelBase *, KernelBase, 17, Kernel)
{
@ -433,16 +433,16 @@ AROS_LH2(int, KrnUnmapGlobal,
int retval = 0;
uint32_t msr;
uintptr_t virt = (uintptr_t)virtual;
uintptr_t virt2 = (uintptr_t)virt;
virt &= ~4095;
length = (length + 4095) & ~4095;
msr = goSuper();
while(length)
{
pte_t *pte = find_pte(virt);
pte_t *pte = find_pte(virt2);
pte->vsid = 0;
virt += 4096;
virt2 += 4096;
length -= 4096;
}
goUser(msr);

4
rom/kernel/kernel.conf
View File

@ -53,8 +53,8 @@ int KrnBug(const char *format, va_list args) (A0, A1)
int KrnIsSuper() ()
void * KrnAddExceptionHandler(uint8_t irq, void *handler, void *handlerData, void *handlerData2) (D0, A0, A1, A2)
void KrnRemExceptionHandler(void * handle) (A0)
int KrnMapGlobal(void *virtual, void *physical, uint32_t length, KRN_MapAttr flags) (A0, A1, D0, D1)
int KrnUnmapGlobal(void *virtual, uint32_t length) (A0, D0)
int KrnMapGlobal(void *virt, void *phys, uint32_t length, KRN_MapAttr flags) (A0, A1, D0, D1)
int KrnUnmapGlobal(void *virt, uint32_t length) (A0, D0)
void *KrnCreateContext() ()
void KrnDeleteContext(void *context) (A0)
void *KrnVirtualToPhysical(void *virt) (A0)

4
rom/kernel/mapglobal.c
View File

@ -17,8 +17,8 @@
AROS_LH4I(int, KrnMapGlobal,
/* SYNOPSIS */
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, physical, A1),
AROS_LHA(void *, virt, A0),
AROS_LHA(void *, phys, A1),
AROS_LHA(uint32_t, length, D0),
AROS_LHA(KRN_MapAttr, flags, D1),

2
rom/kernel/unmapglobal.c
View File

@ -17,7 +17,7 @@
AROS_LH2I(int, KrnUnmapGlobal,
/* SYNOPSIS */
AROS_LHA(void *, virtual, A0),
AROS_LHA(void *, virt, A0),
AROS_LHA(uint32_t, length, D0),
/* LOCATION */