From d730e7dc0a683c07a1bcb12a666d1971b6f739de Mon Sep 17 00:00:00 2001 From: marius Date: Fri, 4 Mar 2005 22:23:21 +0000 Subject: - sparc64/fhc/fhc.c: Change fhc(4) to use IRQ numbers instead of RIDs for allocating the IRQs of children. This works similar to e.g. sbus(4), i.e. add the IRQ resources as fully specified to the resource lists of the children, allocate them like normal. When establishing the interrupt search the interrupt maps of the children for a matching INO to determine which map we need to write the fully specified interrupt number to and to enable the mapping (before the RID was used to indicate which interrupt map to use). - dev/puc/puc.c: Revert rev. 1.38, with the above change fhc(4) no longer needs special treatment for allocating IRQs. Thanks to: joerg for providing access to an E3500 --- sys/dev/puc/puc.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'sys/dev/puc') diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index 11506e5..86e2a0c 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -97,10 +97,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef __sparc64__ -#include -#endif - #define PUC_ENTRAILS 1 #include @@ -193,12 +189,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc) printf("puc: name: %s\n", sc->sc_desc.name); #endif - rid = 0; -#ifdef __sparc64__ - if (strcmp(device_get_name(device_get_parent(dev)), "fhc") == 0) - rid = FHC_UART; -#endif res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | RF_SHAREABLE); if (!res) -- cgit v1.1