diff options
| author | dfr <dfr@FreeBSD.org> | 1999-10-14 21:38:33 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-10-14 21:38:33 +0000 |
| commit | 37ab4f7a31956a5d39e3eb1f74da3865b7d0fd3e (patch) | |
| tree | 368f670667f06e1028edad29b2c6720ab1c3532d /sys/alpha | |
| parent | 22acf6986dd3517e491a4d9e4deee1109e4ee940 (diff) | |
| download | FreeBSD-src-37ab4f7a31956a5d39e3eb1f74da3865b7d0fd3e.zip FreeBSD-src-37ab4f7a31956a5d39e3eb1f74da3865b7d0fd3e.tar.gz | |
* Implement bus_set/get/delete_resource for pci.
* Change the hack used on the alpha for mapping devices into DENSE or
BWX memory spaces to a simpler one. Its still a hack and should be
a seperate api to explicitly map the resource.
* Add $FreeBSD$ as necessary.
Diffstat (limited to 'sys/alpha')
| -rw-r--r-- | sys/alpha/include/resource.h | 2 | ||||
| -rw-r--r-- | sys/alpha/pci/pcibus.c | 21 |
2 files changed, 6 insertions, 17 deletions
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h index c9253c9..28fcc98 100644 --- a/sys/alpha/include/resource.h +++ b/sys/alpha/include/resource.h @@ -40,7 +40,5 @@ #define SYS_RES_DRQ 2 /* isa dma lines */ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ -#define SYS_RES_DENSE 5 /* i/o memory in dense space */ -#define SYS_RES_BWX 6 /* i/i memory in bwx space */ #endif /* !_MACHINE_RESOURCE_H_ */ diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c index d49a57c..b668c82 100644 --- a/sys/alpha/pci/pcibus.c +++ b/sys/alpha/pci/pcibus.c @@ -207,8 +207,6 @@ pci_alloc_resource(device_t bus, device_t child, int type, int *rid, rm = &port_rman; break; - case SYS_RES_DENSE: - case SYS_RES_BWX: case SYS_RES_MEMORY: rm = &mem_rman; break; @@ -225,19 +223,12 @@ pci_alloc_resource(device_t bus, device_t child, int type, int *rid, case SYS_RES_MEMORY: rman_set_bustag(rv, ALPHA_BUS_SPACE_MEM); rman_set_bushandle(rv, rv->r_start); - rman_set_virtual(rv, (void *) rv->r_start); /* maybe NULL? */ - break; - - case SYS_RES_DENSE: - rman_set_bustag(rv, ALPHA_BUS_SPACE_MEM); - rman_set_bushandle(rv, rv->r_start); - rman_set_virtual(rv, pci_cvt_to_dense(rv->r_start)); - break; - - case SYS_RES_BWX: - rman_set_bustag(rv, ALPHA_BUS_SPACE_MEM); - rman_set_bushandle(rv, rv->r_start); - rman_set_virtual(rv, pci_cvt_to_bwx(rv->r_start)); + if (flags & PCI_RF_DENSE) + rman_set_virtual(rv, pci_cvt_to_dense(rv->r_start)); + else if (flags & PCI_RF_BWX) + rman_set_virtual(rv, pci_cvt_to_bwx(rv->r_start)); + else + rman_set_virtual(rv, (void *) rv->r_start); /* maybe NULL? */ break; case SYS_RES_IOPORT: |
