diff options
author | Svatopluk Kraus <skra@FreeBSD.org> | 2016-03-01 11:27:58 +0000 |
---|---|---|
committer | Svatopluk Kraus <skra@FreeBSD.org> | 2016-03-01 11:27:58 +0000 |
commit | 32d001e479911c0bbe1db91a3bf6b66b6187a518 (patch) | |
tree | 35709d9c15c3d9c659b7b56642ffff3dab4461ea /sys/kern/subr_intr.c | |
parent | 169e6abd8f7539b4aff557c86e337d0716d6fd4a (diff) |
Remove an alternative way for dealing with root interrupt controller
which is not complete. Likely, it was forgotten and not removed before
committing.
Notes
Notes:
svn path=/head/; revision=296262
Diffstat (limited to 'sys/kern/subr_intr.c')
-rw-r--r-- | sys/kern/subr_intr.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 9792e4adcb4a..1c97fd48af21 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -88,7 +88,6 @@ MALLOC_DEFINE(M_INTRNG, "intr", "intr interrupt handling"); void intr_irq_handler(struct trapframe *tf); /* Root interrupt controller stuff. */ -static struct intr_irqsrc *irq_root_isrc; device_t intr_irq_root_dev; static intr_irq_filter_t *irq_root_filter; static void *irq_root_arg; @@ -894,8 +893,6 @@ int intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, void *arg, u_int ipicount) { - int error; - u_int rootirq; if (pic_lookup(dev, xref) == NULL) { device_printf(dev, "not registered\n"); @@ -916,24 +913,6 @@ intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, return (EBUSY); } - rootirq = intr_namespace_map_irq(device_get_parent(dev), 0, 0); - if (rootirq == IRQ_INVALID) { - device_printf(dev, "failed to map an irq for the root pic\n"); - return (ENOMEM); - } - - /* Create the isrc. */ - irq_root_isrc = isrc_lookup(rootirq); - - /* XXX "register" with the PIC. We are the "pic" here, so fake it. */ - irq_root_isrc->isrc_flags |= INTR_ISRCF_REGISTERED; - - error = intr_irq_add_handler(device_get_parent(dev), - (void*)filter, NULL, arg, rootirq, INTR_TYPE_CLK, NULL); - if (error != 0) { - device_printf(dev, "failed to install root pic handler\n"); - return (error); - } intr_irq_root_dev = dev; irq_root_filter = filter; irq_root_arg = arg; |