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

kernel/arm/int: convert TRACE to new syntax and hush

Browse Source 
Change-Id: I8945ad621aee2bc1c8d8852bb1c220936e567d86
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5430
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
David Karoly
2022-07-04 07:00:03 +00:00
committed by Adrien Destugues
parent e0a405d765
commit 1b95b1e857
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm/arch_int.cpp
+9 -9
View File
@@ -43,11 +43,11 @@
#include "soc_omap3.h" #include "soc_omap3.h"
#include "soc_sun4i.h" #include "soc_sun4i.h"
#define TRACE_ARCH_INT //#define TRACE_ARCH_INT
#ifdef TRACE_ARCH_INT #ifdef TRACE_ARCH_INT
# define TRACE(x) dprintf x # define TRACE(x...) dprintf(x)
#else #else
# define TRACE(x) ; # define TRACE(x...) ;
#endif #endif
#define VECTORPAGE_SIZE 64 #define VECTORPAGE_SIZE 64
@@ -71,7 +71,7 @@ struct iframe_stack gBootFrameStack;
void void
arch_int_enable_io_interrupt(int irq) arch_int_enable_io_interrupt(int irq)
{ {
TRACE(("arch_int_enable_io_interrupt(%d)\n", irq)); TRACE("arch_int_enable_io_interrupt(%d)\n", irq);
InterruptController *ic = InterruptController::Get(); InterruptController *ic = InterruptController::Get();
if (ic != NULL) if (ic != NULL)
ic->EnableInterrupt(irq); ic->EnableInterrupt(irq);
@@ -81,7 +81,7 @@ arch_int_enable_io_interrupt(int irq)
void void
arch_int_disable_io_interrupt(int irq) arch_int_disable_io_interrupt(int irq)
{ {
TRACE(("arch_int_disable_io_interrupt(%d)\n", irq)); TRACE("arch_int_disable_io_interrupt(%d)\n", irq);
InterruptController *ic = InterruptController::Get(); InterruptController *ic = InterruptController::Get();
if (ic != NULL) if (ic != NULL)
ic->DisableInterrupt(irq); ic->DisableInterrupt(irq);
@@ -251,13 +251,13 @@ arch_arm_syscall(struct iframe *iframe)
#endif #endif
uint32_t syscall = *(uint32_t *)(iframe->pc-4) & 0x00ffffff; uint32_t syscall = *(uint32_t *)(iframe->pc-4) & 0x00ffffff;
TRACE(("syscall number: %d\n", syscall)); TRACE("syscall number: %d\n", syscall);
uint32_t args[20]; uint32_t args[20];
if (syscall < kSyscallCount) { if (syscall < kSyscallCount) {
TRACE(("syscall(%s,%d)\n", TRACE("syscall(%s,%d)\n",
kExtendedSyscallInfos[syscall].name, kExtendedSyscallInfos[syscall].name,
kExtendedSyscallInfos[syscall].parameter_count)); kExtendedSyscallInfos[syscall].parameter_count);
int argSize = kSyscallInfos[syscall].parameter_size; int argSize = kSyscallInfos[syscall].parameter_size;
memcpy(args, &iframe->r0, std::min<int>(argSize, 4 * sizeof(uint32))); memcpy(args, &iframe->r0, std::min<int>(argSize, 4 * sizeof(uint32)));
@@ -277,7 +277,7 @@ arch_arm_syscall(struct iframe *iframe)
uint64 returnValue = 0; uint64 returnValue = 0;
syscall_dispatcher(syscall, (void*)args, &returnValue); syscall_dispatcher(syscall, (void*)args, &returnValue);
TRACE(("returning %" B_PRId64 "\n", returnValue)); TRACE("returning %" B_PRId64 "\n", returnValue);
iframe->r0 = returnValue; iframe->r0 = returnValue;
} }