From 177f5facbf6c2bfbb42292797e63d4aef53efac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 23 May 2018 18:37:09 +0200 Subject: [PATCH] kernel drivers: have timer hooks return B_HANDLED_INTERRUPT. * 0 means B_UNHANDLED_INTERRUPT. * uses int32 as return type. --- src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp | 2 +- src/add-ons/kernel/drivers/graphics/radeon/irq.c | 4 ++-- src/add-ons/kernel/drivers/network/sis19x/MIIBus.cpp | 4 ++-- src/add-ons/kernel/drivers/network/sis19x/MIIBus.h | 2 +- src/add-ons/kernel/drivers/network/sis900/sis900.c | 4 ++-- src/add-ons/kernel/drivers/network/wb840/wb840.c | 2 +- src/libs/compat/freebsd11_network/clock.c | 4 ++-- src/libs/compat/freebsd_network/clock.c | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp index 06e2fa01ea..cf17797051 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp @@ -79,7 +79,7 @@ static int32 generate_event(timer* timer) { gEventProducer.InjectEvent(); - return 0; + return B_HANDLED_INTERRUPT; } diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp index 9bb4c79479..897c3c271d 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp @@ -79,7 +79,7 @@ static int32 generate_event(timer* timer) { gEventProducer.InjectEvent(); - return 0; + return B_HANDLED_INTERRUPT; } diff --git a/src/add-ons/kernel/drivers/graphics/radeon/irq.c b/src/add-ons/kernel/drivers/graphics/radeon/irq.c index d2b1465acc..a5e2c1a999 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon/irq.c +++ b/src/add-ons/kernel/drivers/graphics/radeon/irq.c @@ -26,11 +26,11 @@ Radeon_DisableIRQ(device_info *di) * handles standard interrupts, i.e. VBI and DMA */ -static uint32 +static int32 Radeon_ThreadInterruptWork(vuint8 *regs, device_info *di, uint32 int_status) { shared_info *si = di->si; - uint32 handled = B_HANDLED_INTERRUPT; + int32 handled = B_HANDLED_INTERRUPT; if ((int_status & RADEON_CRTC_VBLANK_STAT) != 0 && si->crtc[0].vblank >= 0) { diff --git a/src/add-ons/kernel/drivers/network/sis19x/MIIBus.cpp b/src/add-ons/kernel/drivers/network/sis19x/MIIBus.cpp index 4532f88fed..e260f0343b 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/MIIBus.cpp +++ b/src/add-ons/kernel/drivers/network/sis19x/MIIBus.cpp @@ -279,7 +279,7 @@ MIIBus::IsLinkUp() } -uint32 +int32 MIIBus::TimerHandler(bool* linkChanged) { // XXX ? @@ -332,7 +332,7 @@ MIIBus::TimerHandler(bool* linkChanged) // (fLinkState.media & IFM_FULL_DUPLEX) ? "full" : "half"); //} - return 0; + return B_HANDLED_INTERRUPT; } diff --git a/src/add-ons/kernel/drivers/network/sis19x/MIIBus.h b/src/add-ons/kernel/drivers/network/sis19x/MIIBus.h index 6e9a1f2c74..e848ff6ccb 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/MIIBus.h +++ b/src/add-ons/kernel/drivers/network/sis19x/MIIBus.h @@ -113,7 +113,7 @@ public: status_t Status(uint16 *status); status_t Select(uint16* status = NULL); status_t Reset(uint16* status = NULL); - uint32 TimerHandler(bool* linkChanged); + int32 TimerHandler(bool* linkChanged); bool IsLinkUp(); status_t UpdateLinkState(ether_link_state* state = NULL); diff --git a/src/add-ons/kernel/drivers/network/sis900/sis900.c b/src/add-ons/kernel/drivers/network/sis900/sis900.c index befb4d2874..d28a2e81b4 100644 --- a/src/add-ons/kernel/drivers/network/sis900/sis900.c +++ b/src/add-ons/kernel/drivers/network/sis900/sis900.c @@ -287,7 +287,7 @@ sis900_timer(timer *t) if (mode) sis900_setMode(info, mode); - return 0; + return B_HANDLED_INTERRUPT; } if (info->link) { // link lost @@ -322,7 +322,7 @@ sis900_timer(timer *t) // else // bug("********* set_eq() would be needed! ********\n"); - return 0; + return B_HANDLED_INTERRUPT; } diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.c b/src/add-ons/kernel/drivers/network/wb840/wb840.c index 4335d35037..67fb6932f7 100644 --- a/src/add-ons/kernel/drivers/network/wb840/wb840.c +++ b/src/add-ons/kernel/drivers/network/wb840/wb840.c @@ -289,7 +289,7 @@ wb_tick(timer* arg) wb_updateLink(device); - return B_OK; + return B_HANDLED_INTERRUPT; } diff --git a/src/libs/compat/freebsd11_network/clock.c b/src/libs/compat/freebsd11_network/clock.c index 43c7743144..258394a5cf 100644 --- a/src/libs/compat/freebsd11_network/clock.c +++ b/src/libs/compat/freebsd11_network/clock.c @@ -16,11 +16,11 @@ static timer sHardClockTimer; /*! * Implementation of FreeBSD's hardclock timer. */ -static status_t +static int32 hardClock(timer* hardClockTimer) { atomic_add(&ticks, 1); - return B_OK; + return B_HANDLED_INTERRUPT; } diff --git a/src/libs/compat/freebsd_network/clock.c b/src/libs/compat/freebsd_network/clock.c index fce43ccef2..3ce5fbbe83 100644 --- a/src/libs/compat/freebsd_network/clock.c +++ b/src/libs/compat/freebsd_network/clock.c @@ -16,11 +16,11 @@ static timer sHardClockTimer; /*! * Implementation of FreeBSD's hardclock timer. */ -static status_t +static int32 hardClock(timer* hardClockTimer) { atomic_add((vint32*)&ticks, 1); - return B_OK; + return B_HANDLED_INTERRUPT; }