summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2016-07-15 21:08:27 +0000
committermacallan <macallan@NetBSD.org>2016-07-15 21:08:27 +0000
commit104ad508c19ad56e16dc37588714c46609ecdac8 (patch)
tree99867a2eb62e662e704dec614c60300b3684b939 /sys/arch/macppc/dev
parentafc88dc44ff22b85e19a47a2a9f079ca18384d0c (diff)
first step to make dbdma less hackish
- dbdma_alloc gets a new parameter to return the actual address of the buffer before being alignment-mangled so we can properly free it - add dbdma_free which takes the pointer mentioned above dbdma should really use bus_dma
Diffstat (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/dbdma.c15
-rw-r--r--sys/arch/macppc/dev/dbdma.h5
2 files changed, 15 insertions, 5 deletions
diff --git a/sys/arch/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c
index da089946d05..4464c31d05b 100644
--- a/sys/arch/macppc/dev/dbdma.c
+++ b/sys/arch/macppc/dev/dbdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbdma.c,v 1.11 2012/05/23 21:47:23 macallan Exp $ */
+/* $NetBSD: dbdma.c,v 1.12 2016/07/15 21:08:27 macallan Exp $ */
/*
* Copyright 1991-1998 by Open Software Foundation, Inc.
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbdma.c,v 1.11 2012/05/23 21:47:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbdma.c,v 1.12 2016/07/15 21:08:27 macallan Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -115,12 +115,21 @@ dbdma_pause(dbdma_regmap_t *dmap)
}
dbdma_command_t *
-dbdma_alloc(int size)
+dbdma_alloc(int size, void **fp)
{
u_int buf;
buf = (u_int)kmem_alloc(size + 0x0f, KM_SLEEP);
+ if (fp != NULL) {
+ *fp = (void *)buf;
+ }
buf = (buf + 0x0f) & ~0x0f;
return (dbdma_command_t *)buf;
}
+
+void
+dbdma_free(void *ptr, int size)
+{
+ kmem_free(ptr, size + 0x0f);
+}
diff --git a/sys/arch/macppc/dev/dbdma.h b/sys/arch/macppc/dev/dbdma.h
index fc87199bbe1..b4c3dd332b7 100644
--- a/sys/arch/macppc/dev/dbdma.h
+++ b/sys/arch/macppc/dev/dbdma.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dbdma.h,v 1.5 2007/10/17 19:55:18 garbled Exp $ */
+/* $NetBSD: dbdma.h,v 1.6 2016/07/15 21:08:27 macallan Exp $ */
/*
* Copyright 1991-1998 by Open Software Foundation, Inc.
@@ -166,6 +166,7 @@ void dbdma_reset(dbdma_regmap_t *channel);
void dbdma_continue(dbdma_regmap_t *channel);
void dbdma_pause(dbdma_regmap_t *channel);
-dbdma_command_t *dbdma_alloc(int); /* Allocate command structures */
+dbdma_command_t *dbdma_alloc(int, void **); /* Allocate command structures */
+void dbdma_free(void *, int);
#endif /* !defined(_POWERMAC_DBDMA_H_) */