diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
| commit | c9202c89653b8dac2ac322c3d3a7389945e1c94c (patch) | |
| tree | da57c01384977ea6a2962cfaac9c7c426da2c0f8 /bsd-core/drm_pci.c | |
| parent | 39a23640b2de9e59e99d48e6de8c9edae0231856 (diff) | |
Commit WIP of BSD conversion to core model. Compiles for r128, radeon, but
doesn't run yet. Moves the ioctl definitions for these two drivers back
to the shared code -- they aren't OS-specific.
Diffstat (limited to 'bsd-core/drm_pci.c')
| -rw-r--r-- | bsd-core/drm_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bsd-core/drm_pci.c b/bsd-core/drm_pci.c index 1d8b593d..07b8a643 100644 --- a/bsd-core/drm_pci.c +++ b/bsd-core/drm_pci.c @@ -39,12 +39,12 @@ * memory block. */ void * -DRM(pci_alloc)(drm_device_t *dev, size_t size, size_t align, dma_addr_t maxaddr, +drm_pci_alloc(drm_device_t *dev, size_t size, size_t align, dma_addr_t maxaddr, dma_addr_t *busaddr) { void *vaddr; - vaddr = contigmalloc(size, DRM(M_DRM), M_NOWAIT, 0ul, maxaddr, align, + vaddr = contigmalloc(size, M_DRM, M_NOWAIT, 0ul, maxaddr, align, 0); *busaddr = vtophys(vaddr); @@ -55,10 +55,10 @@ DRM(pci_alloc)(drm_device_t *dev, size_t size, size_t align, dma_addr_t maxaddr, * \brief Free a DMA-accessible consistent memory block. */ void -DRM(pci_free)(drm_device_t *dev, size_t size, void *vaddr, dma_addr_t busaddr) +drm_pci_free(drm_device_t *dev, size_t size, void *vaddr, dma_addr_t busaddr) { #if __FreeBSD_version > 500000 - contigfree(vaddr, size, DRM(M_DRM)); /* Not available on 4.x */ + contigfree(vaddr, size, M_DRM); /* Not available on 4.x */ #endif } |