ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-22 15:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dde_ipxe: use irq via device interface

Browse Source 
Issue #1471
This commit is contained in:
Alexander Boettcher 2015-04-10 13:47:43 +02:00 committed by Christian Helmuth
parent 5c1504fd8f
commit 3c5fb420ca
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/dde_ipxe/src/lib/dde_ipxe/dde_support.cc
View File

@ -262,7 +262,7 @@ extern "C" void dde_pci_writel(int pos, dde_uint32_t val) {
struct Irq_handler struct Irq_handler
{ {
Server::Entrypoint &ep; Server::Entrypoint &ep;
Genode::Irq_connection irq; Genode::Irq_session_client irq;
Genode::Signal_rpc_member<Irq_handler> dispatcher; Genode::Signal_rpc_member<Irq_handler> dispatcher;
typedef void (*irq_handler)(void*); typedef void (*irq_handler)(void*);
@ -276,10 +276,10 @@ struct Irq_handler
irq.ack_irq(); irq.ack_irq();
} }
Irq_handler(Server::Entrypoint &ep, int irqnr, Irq_handler(Server::Entrypoint &ep, Genode::Irq_session_capability cap,
irq_handler handler, void *priv) irq_handler handler, void *priv)
: :
ep(ep), irq(irqnr), dispatcher(ep, *this, &Irq_handler::handle), ep(ep), irq(cap), dispatcher(ep, *this, &Irq_handler::handle),
handler(handler), priv(priv) handler(handler), priv(priv)
{ {
irq.sigh(dispatcher); irq.sigh(dispatcher);
@ -291,7 +291,7 @@ struct Irq_handler
static Irq_handler *_irq_handler; static Irq_handler *_irq_handler;
extern "C" int dde_interrupt_attach(int irq, void(*handler)(void *), void *priv) extern "C" int dde_interrupt_attach(void(*handler)(void *), void *priv)
{ {
if (_irq_handler) { if (_irq_handler) {
PERR("Irq_handler already registered"); PERR("Irq_handler already registered");
@ -299,8 +299,9 @@ extern "C" int dde_interrupt_attach(int irq, void(*handler)(void *), void *priv)
} }
try { try {
Pci::Device_client device(pci_drv()._cap);
_irq_handler = new (Genode::env()->heap()) _irq_handler = new (Genode::env()->heap())
Irq_handler(*_ep, irq, handler, priv); Irq_handler(*_ep, device.irq(0), handler, priv);
} catch (...) { return -1; } } catch (...) { return -1; }
return 0; return 0;

2
repos/dde_ipxe/src/lib/dde_ipxe/include/dde_support.h
View File

@ -73,7 +73,7 @@ void dde_lock_leave(void);
** Interrupt handling ** ** Interrupt handling **
************************/ ************************/
int dde_interrupt_attach(int irq, void (*handler)(void *), void *priv); int dde_interrupt_attach(void (*handler)(void *), void *priv);
/****************** /******************

2
repos/dde_ipxe/src/lib/dde_ipxe/nic.c
View File

@ -308,7 +308,7 @@ int dde_ipxe_nic_init(void *ep)
} }
/* initialize IRQ handler */ /* initialize IRQ handler */
int err = dde_interrupt_attach(net_dev->dev->desc.irq, irq_handler, 0); int err = dde_interrupt_attach(irq_handler, 0);
if (err) { if (err) {
LOG("attaching to IRQ %02x failed", net_dev->dev->desc.irq); LOG("attaching to IRQ %02x failed", net_dev->dev->desc.irq);
return 0; return 0;