[PATCH] build: use by default DSP_API = 1

17 views
Skip to first unread message

Víctor Manuel Jáquez Leal

unread,
Feb 6, 2012, 6:14:57 AM2/6/12
to gst...@googlegroups.com, Felipe Contreras, Felipe Contreras
DSP_API v2 is not currently working in the mainline kernel. Hence,
I propose use by default v1.

Signed-off-by: Víctor Manuel Jáquez Leal <vja...@igalia.com>
---
Makefile.conf | 2 +-
configure | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index bd33474..4d2cfbf 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -6,7 +6,7 @@ LDFLAGS := -Wl,--no-undefined -Wl,--as-needed
GST_CFLAGS := $(shell pkg-config --cflags gstreamer-0.10)
GST_LIBS := $(shell pkg-config --libs gstreamer-0.10)

-DSP_API := 2
+DSP_API := 1
SN_API := 2

dspdir := /lib/dsp
diff --git a/configure b/configure
index de5b6c9..df8c7fe 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@ LDFLAGS=${LDFLAGS:--Wl,--no-undefined -Wl,--as-needed}
GST_CFLAGS=$(pkg-config --cflags gstreamer-0.10)
GST_LIBS=$(pkg-config --libs gstreamer-0.10)

-DSP_API=${DSP_API:-2}
+DSP_API=${DSP_API:-1}
SN_API=${SN_API:-2}

dspdir=${dspdir:-"/lib/dsp"}
--
1.7.8.3

Felipe Contreras

unread,
Feb 6, 2012, 7:23:50 AM2/6/12
to Víctor Manuel Jáquez Leal, gst...@googlegroups.com, Felipe Contreras
2012/2/6 Víctor Manuel Jáquez Leal <vja...@igalia.com>:

> DSP_API v2 is not currently working in the mainline kernel. Hence,
> I propose use by default v1.

In theory this would break other parts, because not only the DMA
begin/end ioctls depend on DSP_API>=2. I would rather have an #if 0 in
those ioctls for now. Of course, even better would be figure out
what's wrong. I don't think it should be that difficult.

Cheers.

--
Felipe Contreras

Felipe Contreras

unread,
Feb 8, 2012, 6:24:31 AM2/8/12
to Víctor Manuel Jáquez Leal, gst...@googlegroups.com, Felipe Contreras
2012/2/6 Felipe Contreras <felipe.c...@gmail.com>:

I think I screwed up an if condition while rebasing the patch. This
seems to fix the issue:

--- a/dmm_buffer.h
+++ b/dmm_buffer.h
@@ -91,9 +91,9 @@ dmm_buffer_begin(dmm_buffer_t *b,
if (b->dma_len == (size_t) -1)
return;
if (dsp_begin_dma(b->handle, b->proc, b->data, len, b->dir))
- b->dma_len = (size_t) -1;
- else
b->dma_len = len;
+ else
+ b->dma_len = (size_t) -1;
#endif
}

--
Felipe Contreras

Reply all
Reply to author
Forward
0 new messages