omap3-isp-dsp sample application initial importHEADmaster

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

6 files changed, 2398 insertions, 0 deletions

diff --git a/bridge/LICENSE b/bridge/LICENSE
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/bridge/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/bridge/Makefile b/bridge/Makefile
new file mode 100644
index 0000000..5d1fb0c
--- /dev/null
+++ b/bridge/Makefile
@@ -0,0 +1,19 @@
+AR	:= $(CROSS_COMPILE)ar
+CC	:= $(CROSS_COMPILE)gcc
+CFLAGS	:= -O2 -W -Wall -DDSP_API=2 -fPIC
+LDFLAGS	:= -shared
+
+OBJECTS := dsp_bridge.o
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+all: libdspbridge.a
+
+libdspbridge.a: $(OBJECTS)
+	$(AR) r $@ $^
+
+clean:
+	-$(RM) *.o
+	-$(RM) libdspbridge.a
+
diff --git a/bridge/dmm_buffer.h b/bridge/dmm_buffer.h
new file mode 100644
index 0000000..f86df7e
--- /dev/null
+++ b/bridge/dmm_buffer.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2009-2010 Felipe Contreras
+ * Copyright (C) 2008-2010 Nokia Corporation
+ *
+ * Authors:
+ * Felipe Contreras <felipe.contreras@nokia.com>
+ * Marco Ballesio <marco.ballesio@nokia.com>
+ *
+ * This file may be used under the terms of the GNU Lesser General Public
+ * License version 2.1, a copy of which is found in LICENSE included in the
+ * packaging of this file.
+ */
+
+#ifndef DMM_BUFFER_H
+#define DMM_BUFFER_H
+
+#include <stdlib.h> /* for calloc, free */
+#include <string.h> /* for memset */
+
+#include "dsp_bridge.h"
+#include "log.h"
+
+#define ROUND_UP(num, scale) (((num) + ((scale) - 1)) & ~((scale) - 1))
+#define PAGE_SIZE 0x1000
+
+enum dma_data_direction {
+	DMA_BIDIRECTIONAL,
+	DMA_TO_DEVICE,
+	DMA_FROM_DEVICE,
+};
+
+typedef struct {
+	int handle;
+	void *proc;
+	void *data;
+	void *allocated_data;
+	size_t size;
+	size_t len;
+	void *reserve;
+	void *map;
+	bool need_copy;
+	size_t alignment;
+	void *user_data;
+	bool used;
+	bool keyframe;
+	int dir;
+} dmm_buffer_t;
+
+static inline dmm_buffer_t *
+dmm_buffer_new(int handle,
+		void *proc,
+		int dir)
+{
+	dmm_buffer_t *b;
+	b = calloc(1, sizeof(*b));
+
+	pr_debug("%p", b);
+	b->handle = handle;
+	b->proc = proc;
+	b->alignment = 128;
+	b->dir = dir;
+
+	return b;
+}
+
+static inline void
+dmm_buffer_free(dmm_buffer_t *b)
+{
+	pr_debug("%p", b);
+	if (!b)
+		return;
+	if (b->map)
+		dsp_unmap(b->handle, b->proc, b->map);
+	if (b->reserve)
+		dsp_unreserve(b->handle, b->proc, b->reserve);
+	free(b->allocated_data);
+	free(b);
+}
+
+static inline void
+dmm_buffer_begin(dmm_buffer_t *b,
+		size_t len)
+{
+	pr_debug("%p", b);
+	if (b->dir == DMA_FROM_DEVICE)
+		dsp_invalidate(b->handle, b->proc, b->data, len);
+	else
+		dsp_flush(b->handle, b->proc, b->data, len, 1);
+}
+
+static inline void
+dmm_buffer_end(dmm_buffer_t *b,
+		size_t len)
+{
+	pr_debug("%p", b);
+	if (b->dir != DMA_TO_DEVICE)
+		dsp_invalidate(b->handle, b->proc, b->data, len);
+}
+
+static inline int
+dmm_buffer_map(dmm_buffer_t *b)
+{
+	size_t to_reserve;
+	pr_debug("%p", b);
+	if (b->map)
+		dsp_unmap(b->handle, b->proc, b->map);
+	if (b->reserve)
+		dsp_unreserve(b->handle, b->proc, b->reserve);
+	/**
+	 * @todo What exactly do we want to do here? Shouldn't the driver
+	 * calculate this?
+	 */
+	to_reserve = ROUND_UP(b->size, PAGE_SIZE) + PAGE_SIZE;
+	dsp_reserve(b->handle, b->proc, to_reserve, &b->reserve);
+	return dsp_map(b->handle, b->proc, b->data, b->size, b->reserve, &b->map, 0);
+}
+
+static inline void
+dmm_buffer_unmap(dmm_buffer_t *b)
+{
+	pr_debug("%p", b);
+	if (b->map) {
+		dsp_unmap(b->handle, b->proc, b->map);
+		b->map = NULL;
+	}
+	if (b->reserve) {
+		dsp_unreserve(b->handle, b->proc, b->reserve);
+		b->reserve = NULL;
+	}
+}
+
+static inline void
+dmm_buffer_allocate(dmm_buffer_t *b,
+		size_t size)
+{
+	pr_debug("%p", b);
+	free(b->allocated_data);
+	if (b->alignment != 0) {
+		if (posix_memalign(&b->allocated_data, b->alignment, ROUND_UP(size, b->alignment)) != 0)
+			b->allocated_data = NULL;
+		b->data = b->allocated_data;
+	}
+	else
+		b->data = b->allocated_data = malloc(size);
+	b->size = size;
+}
+
+static inline void
+dmm_buffer_use(dmm_buffer_t *b,
+		void *data,
+		size_t size)
+{
+	pr_debug("%p", b);
+	b->data = data;
+	b->size = size;
+}
+
+static inline dmm_buffer_t *
+dmm_buffer_calloc(int handle,
+		void *proc,
+		size_t size,
+		int dir)
+{
+	dmm_buffer_t *tmp;
+	tmp = dmm_buffer_new(handle, proc, dir);
+	dmm_buffer_allocate(tmp, size);
+	memset(tmp->data, 0, size);
+	return tmp;
+}
+
+#endif /* DMM_BUFFER_H */
diff --git a/bridge/dsp_bridge.c b/bridge/dsp_bridge.c
new file mode 100644
index 0000000..e5affb3
--- /dev/null
+++ b/bridge/dsp_bridge.c
@@ -0,0 +1,1225 @@
+/*
+ * Copyright (C) 2009-2010 Felipe Contreras
+ * Copyright (C) 2009-2010 Nokia Corporation
+ * Copyright (C) 2007 Texas Instruments, Incorporated
+ *
+ * Author: Felipe Contreras <felipe.contreras@gmail.com>
+ *
+ * This file may be used under the terms of the GNU Lesser General Public
+ * License version 2.1, a copy of which is found in LICENSE included in the
+ * packaging of this file.
+ */
+
+#include "dsp_bridge.h"
+
+/* for open */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <unistd.h> /* for close */
+#include <sys/ioctl.h> /* for ioctl */
+#include <stdlib.h> /* for free */
+
+#include <malloc.h> /* for memalign */
+
+#define ALLOCATE_SM
+
+#ifdef ALLOCATE_SM
+#include <malloc.h> /* for memalign */
+#include <sys/mman.h> /* for mmap */
+#endif
+
+#if DSP_API < 2
+#include <errno.h>
+#endif
+
+/*
+ * Dspbridge ioctl numbering scheme
+ *
+ *    7                           0
+ *  ---------------------------------
+ *  |  Module   |   ioctl Number    |
+ *  ---------------------------------
+ *  | x | x | x | 0 | 0 | 0 | 0 | 0 |
+ *  ---------------------------------
+ */
+
+/* ioctl driver identifier */
+#define DB 0xDB
+
+/*
+ * Following are used to distinguish between module ioctls, this is needed
+ * in case new ioctls are introduced.
+ */
+#define DB_MODULE_MASK 0xE0
+#define DB_IOC_MASK    0x1F
+
+#if DSP_API >= 1
+
+#include <linux/ioctl.h>
+
+/* ioctl module masks */
+#define DB_MGR  0x0
+#define DB_PROC 0x20
+#define DB_NODE 0x40
+#define DB_STRM 0x60
+#define DB_CMM  0x80
+
+/* Used to calculate the ioctl per dspbridge module */
+#define DB_IOC(module, num) \
+	(((module) & DB_MODULE_MASK) | ((num) & DB_IOC_MASK))
+
+#else
+
+#define DB_MGR  1
+#define DB_PROC 7
+#define DB_NODE 24
+#define DB_STRM 39
+#define DB_CMM  50
+
+#define DB_IOC(module, num)	((module) + (num))
+
+#undef _IOR
+#undef _IOW
+#undef _IOWR
+
+#define _IOR(type, nr, size)	(nr)
+#define _IOW(type, nr, size)	(nr)
+#define _IOWR(type, nr, size)	(nr)
+
+#endif /* DSP_API */
+
+/* MGR Module */
+#define MGR_WAIT		_IOWR(DB, DB_IOC(DB_MGR, 4), unsigned long)
+#define MGR_ENUMNODE_INFO	_IOWR(DB, DB_IOC(DB_MGR, 0), unsigned long)
+#define MGR_REGISTEROBJECT	_IOWR(DB, DB_IOC(DB_MGR, 2), unsigned long)
+#define MGR_UNREGISTEROBJECT	_IOWR(DB, DB_IOC(DB_MGR, 3), unsigned long)
+
+/* PROC Module */
+#define PROC_ATTACH		_IOWR(DB, DB_IOC(DB_PROC, 0), unsigned long)
+/* PROC_DETACH Deprecated */
+#define PROC_DETACH		_IOR(DB, DB_IOC(DB_PROC, 2), unsigned long)
+#define PROC_REGISTERNOTIFY	_IOWR(DB, DB_IOC(DB_PROC, 8), unsigned long)
+#define PROC_RSVMEM		_IOWR(DB, DB_IOC(DB_PROC, 10), unsigned long)
+#define PROC_UNRSVMEM		_IOW(DB, DB_IOC(DB_PROC, 11), unsigned long)
+#define PROC_MAPMEM		_IOWR(DB, DB_IOC(DB_PROC, 12), unsigned long)
+#define PROC_UNMAPMEM		_IOR(DB, DB_IOC(DB_PROC, 13), unsigned long)
+#define PROC_FLUSHMEMORY	_IOW(DB, DB_IOC(DB_PROC, 14), unsigned long)
+#define PROC_INVALIDATEMEMORY	_IOW(DB, DB_IOC(DB_PROC, 16), unsigned long)
+#define PROC_GET_STATE		_IOWR(DB, DB_IOC(DB_PROC, 5), unsigned long)
+#define PROC_ENUMRESOURCES	_IOWR(DB, DB_IOC(DB_PROC, 4), unsigned long)
+#define PROC_ENUMNODE		_IOWR(DB, DB_IOC(DB_PROC, 3), unsigned long)
+#define PROC_STOP               _IOWR(DB, DB_IOC(DB_PROC, 15), unsigned long)
+#define PROC_LOAD               _IOW(DB, DB_IOC(DB_PROC, 7), unsigned long)
+#define PROC_START              _IOW(DB, DB_IOC(DB_PROC, 9), unsigned long)
+
+/* NODE Module */
+#define NODE_REGISTERNOTIFY	_IOWR(DB, DB_IOC(DB_NODE, 11), unsigned long)
+#define NODE_CREATE		_IOW(DB, DB_IOC(DB_NODE, 4), unsigned long)
+#define NODE_RUN		_IOW(DB, DB_IOC(DB_NODE, 12), unsigned long)
+#define NODE_TERMINATE		_IOWR(DB, DB_IOC(DB_NODE, 13), unsigned long)
+#define NODE_PUTMESSAGE		_IOW(DB, DB_IOC(DB_NODE, 10), unsigned long)
+#define NODE_GETMESSAGE		_IOWR(DB, DB_IOC(DB_NODE, 8), unsigned long)
+#define NODE_DELETE		_IOW(DB, DB_IOC(DB_NODE, 5), unsigned long)
+#define NODE_GETATTR		_IOWR(DB, DB_IOC(DB_NODE, 7), unsigned long)
+#define NODE_ALLOCMSGBUF	_IOWR(DB, DB_IOC(DB_NODE, 1), unsigned long)
+#define NODE_GETUUIDPROPS	_IOWR(DB, DB_IOC(DB_NODE, 14), unsigned long)
+#define NODE_ALLOCATE		_IOWR(DB, DB_IOC(DB_NODE, 0), unsigned long)
+#define NODE_CONNECT		_IOW(DB, DB_IOC(DB_NODE, 3), unsigned long)
+
+/* CMM Module */
+#define CMM_GETHANDLE		_IOR(DB, DB_IOC(DB_CMM, 2), unsigned long)
+#define CMM_GETINFO		_IOR(DB, DB_IOC(DB_CMM, 3), unsigned long)
+
+/* STRM Module */
+#define STRM_OPEN		_IOWR(DB, DB_IOC(DB_STRM, 7), unsigned long)
+#define STRM_CLOSE		_IOW(DB, DB_IOC(DB_STRM, 1), unsigned long)
+#define STRM_GETINFO		_IOWR(DB, DB_IOC(DB_STRM, 4), unsigned long)
+#define STRM_ALLOCATEBUFFER	_IOWR(DB, DB_IOC(DB_STRM, 0), unsigned long)
+#define STRM_IDLE		_IOW(DB, DB_IOC(DB_STRM, 5), unsigned long)
+#define STRM_RECLAIM		_IOWR(DB, DB_IOC(DB_STRM, 8), unsigned long)
+#define STRM_FREEBUFFER		_IOWR(DB, DB_IOC(DB_STRM, 2), unsigned long)
+#define STRM_ISSUE		_IOW(DB, DB_IOC(DB_STRM, 6), unsigned long)
+
+#if DSP_API < 2
+static inline int real_ioctl(int fd, int r, void *arg)
+{
+	return ioctl(fd, r, arg);
+}
+#endif
+
+/* will not be needed when tidspbridge uses proper error codes */
+#define ioctl(...) (ioctl(__VA_ARGS__) < 0)
+
+int dsp_open(void)
+{
+	return open("/dev/DspBridge", O_RDWR);
+}
+
+int dsp_close(int handle)
+{
+	return close(handle);
+}
+
+struct proc_attach {
+	unsigned int num;
+	const void *info; /* not used */
+	void **ret_handle;
+};
+
+bool dsp_attach(int handle,
+		unsigned int num,
+		const void *info,
+		void **ret_handle)
+{
+	struct proc_attach arg = {
+		.num = num,
+		.info = info,
+		.ret_handle = ret_handle,
+	};
+
+	return !ioctl(handle, PROC_ATTACH, &arg);
+}
+
+struct proc_detach {
+	void *proc_handle;
+};
+
+bool dsp_detach(int handle,
+		void *proc_handle)
+{
+	struct proc_detach arg = {
+		.proc_handle = proc_handle,
+	};
+
+	return !ioctl(handle, PROC_DETACH, &arg);
+}
+
+struct register_notify {
+	void *proc_handle;
+	unsigned int event_mask;
+	unsigned int notify_type;
+	struct dsp_notification *info;
+};
+
+bool dsp_register_notify(int handle,
+		void *proc_handle,
+		unsigned int event_mask,
+		unsigned int notify_type,
+		struct dsp_notification *info)
+{
+	struct register_notify arg = {
+		.proc_handle = proc_handle,
+		.event_mask = event_mask,
+		.notify_type = notify_type,
+		.info = info,
+	};
+
+	return !ioctl(handle, PROC_REGISTERNOTIFY, &arg);
+}
+
+struct proc_start {
+	void *proc_handle;
+};
+
+bool dsp_start(int handle,
+		void *proc_handle)
+{
+	struct proc_start arg = {
+		.proc_handle = proc_handle,
+	};
+
+	return !ioctl(handle, PROC_START, &arg);
+}
+
+bool dsp_stop(int handle,
+		void *proc_handle)
+{
+	struct proc_start arg = {
+		.proc_handle = proc_handle,
+	};
+
+	return !ioctl(handle, PROC_STOP, &arg);
+}
+
+struct proc_load {
+	void *proc_handle;
+	int argc;
+	char **argv;
+	char **env;
+};
+
+bool dsp_load(int handle,
+		void *proc_handle,
+		int argc, char **argv,
+		char **env)
+{
+	struct proc_load arg = {
+		.proc_handle = proc_handle,
+		.argc = argc,
+		.argv = argv,
+		.env = env,
+	};
+
+	return !ioctl(handle, PROC_LOAD, &arg);
+}
+
+struct node_register_notify {
+	void *node_handle;
+	unsigned int event_mask;
+	unsigned int notify_type;
+	struct dsp_notification *info;
+};
+
+bool dsp_node_register_notify(int handle,
+		struct dsp_node *node,
+		unsigned int event_mask,
+		unsigned int notify_type,
+		struct dsp_notification *info)
+{
+	struct node_register_notify arg = {
+		.node_handle = node->handle,
+		.event_mask = event_mask,
+		.notify_type = notify_type,
+		.info = info,
+	};
+
+	return !ioctl(handle, NODE_REGISTERNOTIFY, &arg);
+}
+
+struct wait_for_events {
+	struct dsp_notification **notifications;
+	unsigned int count;
+	unsigned int *ret_index;
+	unsigned int timeout;
+};
+
+bool dsp_wait_for_events(int handle,
+		struct dsp_notification **notifications,
+		unsigned int count,
+		unsigned int *ret_index,
+		unsigned int timeout)
+{
+	struct wait_for_events arg = {
+		.notifications = notifications,
+		.count = count,
+		.ret_index = ret_index,
+		.timeout = timeout,
+	};
+
+#if DSP_API >= 2
+	return !ioctl(handle, MGR_WAIT, &arg);
+#else
+	/*
+	 * Temporary hack since libc only saves errors -1 to -4095; 0x80008017
+	 * is not stored.
+	 */
+	int r;
+	r = real_ioctl(handle, MGR_WAIT, &arg);
+	if (r == (int)0x80008017)
+		errno = ETIME;
+	return r >= 0;
+#endif
+}
+
+struct enum_node {
+	unsigned int num;
+	struct dsp_ndb_props *info;
+	unsigned int info_size;
+	unsigned int *ret_num;
+};
+
+bool dsp_enum(int handle,
+		unsigned int num,
+		struct dsp_ndb_props *info,
+		size_t info_size,
+		unsigned int *ret_num)
+{
+	struct enum_node arg = {
+		.num = num,
+		.info = info,
+		.info_size = info_size,
+		.ret_num = ret_num,
+	};
+
+	return !ioctl(handle, MGR_ENUMNODE_INFO, &arg);
+}
+
+struct register_object {
+	const struct dsp_uuid *uuid;
+	enum dsp_dcd_object_type type;
+	const char *path;
+};
+
+bool dsp_register(int handle,
+		const struct dsp_uuid *uuid,
+		enum dsp_dcd_object_type type,
+		const char *path)
+{
+	struct register_object arg = {
+		.uuid = uuid,
+		.type = type,
+		.path = path,
+	};
+
+	return !ioctl(handle, MGR_REGISTEROBJECT, &arg);
+}
+
+struct unregister_object {
+	const struct dsp_uuid *uuid;
+	enum dsp_dcd_object_type type;
+};
+
+bool dsp_unregister(int handle,
+		const struct dsp_uuid *uuid,
+		enum dsp_dcd_object_type type)
+{
+	struct unregister_object arg = {
+		.uuid = uuid,
+		.type = type,
+	};
+
+	return !ioctl(handle, MGR_UNREGISTEROBJECT, &arg);
+}
+
+struct node_create {
+	void *node_handle;
+};
+
+bool dsp_node_create(int handle,
+		struct dsp_node *node)
+{
+	struct node_create arg = {
+		.node_handle = node->handle,
+	};
+
+	return !ioctl(handle, NODE_CREATE, &arg);
+}
+
+struct node_run {
+	void *node_handle;
+};
+
+bool dsp_node_run(int handle,
+		struct dsp_node *node)
+{
+	struct node_run arg = {
+		.node_handle = node->handle,
+	};
+
+	return !ioctl(handle, NODE_RUN, &arg);
+}
+
+struct node_terminate {
+	void *node_handle;
+	unsigned long *status;
+};
+
+bool dsp_node_terminate(int handle,
+		struct dsp_node *node,
+		unsigned long *status)
+{
+	struct node_terminate arg = {
+		.node_handle = node->handle,
+		.status = status,
+	};
+
+	return !ioctl(handle, NODE_TERMINATE, &arg);
+}
+
+struct node_put_message {
+	void *node_handle;
+	const struct dsp_msg *message;
+	unsigned int timeout;
+};
+
+bool dsp_node_put_message(int handle,
+		struct dsp_node *node,
+		const struct dsp_msg *message,
+		unsigned int timeout)
+{
+	struct node_put_message arg = {
+		.node_handle = node->handle,
+		.message = message,
+		.timeout = timeout,
+	};
+
+	return !ioctl(handle, NODE_PUTMESSAGE, &arg);
+}
+
+struct node_get_message {
+	void *node_handle;
+	struct dsp_msg *message;
+	unsigned int timeout;
+};
+
+bool dsp_node_get_message(int handle,
+		struct dsp_node *node,
+		struct dsp_msg *message,
+		unsigned int timeout)
+{
+	struct node_get_message arg = {
+		.node_handle = node->handle,
+		.message = message,
+		.timeout = timeout,
+	};
+
+	return !ioctl(handle, NODE_GETMESSAGE, &arg);
+}
+
+struct node_delete {
+	void *node_handle;
+};
+
+static inline bool dsp_node_delete(int handle,
+		struct dsp_node *node)
+{
+	struct node_delete arg = {
+		.node_handle = node->handle,
+	};
+
+	return !ioctl(handle, NODE_DELETE, &arg);
+}
+
+#ifdef ALLOCATE_SM
+struct node_get_attr {
+	void *node_handle;
+	struct dsp_node_attr *attr;
+	unsigned int attr_size;
+};
+
+bool dsp_node_get_attr(int handle,
+		struct dsp_node *node,
+		struct dsp_node_attr *attr,
+		size_t attr_size)
+{
+	struct node_get_attr arg = {
+		.node_handle = node->handle,
+		.attr = attr,
+		.attr_size = attr_size,
+	};
+
+	return !ioctl(handle, NODE_GETATTR, &arg);
+}
+
+struct dsp_buffer_attr {
+	unsigned long cb;
+	unsigned int segment;
+	unsigned int alignment;
+};
+
+struct node_alloc_buf {
+	void *node_handle;
+	unsigned int size;
+	struct dsp_buffer_attr *attr;
+	void **buffer;
+};
+
+static inline bool dsp_node_alloc_buf(int handle,
+		struct dsp_node *node,
+		size_t size,
+		struct dsp_buffer_attr *attr,
+		void **buffer)
+{
+	struct node_alloc_buf arg = {
+		.node_handle = node->handle,
+		.size = size,
+		.attr = attr,
+		.buffer = buffer,
+	};
+
+	if (ioctl(handle, NODE_ALLOCMSGBUF, &arg)) {
+		*buffer = NULL;
+		return false;
+	}
+
+	return true;
+}
+
+struct dsp_cmm_seg_info {
+	unsigned long base_pa;
+	unsigned long size;
+	unsigned long gpp_base_pa;
+	unsigned long gpp_size;
+	unsigned long dsp_base_va;
+	unsigned long dsp_size;
+	unsigned long use_count;
+	unsigned long base_va;
+};
+
+struct dsp_cmm_info {
+	unsigned long segments;
+	unsigned long use_count;
+	unsigned long min_block_size;
+	struct dsp_cmm_seg_info info[1];
+};
+
+struct cmm_get_handle {
+	void *proc_handle;
+	struct cmm_object **cmm;
+};
+
+struct cmm_get_info {
+	struct cmm_object *cmm;
+	struct dsp_cmm_info *info;
+};
+
+static inline bool get_cmm_info(int handle,
+		void *proc_handle,
+		struct dsp_cmm_info *cmm_info)
+{
+	struct cmm_object *cmm;
+	struct cmm_get_handle cmm_arg = {
+		.proc_handle = proc_handle,
+		.cmm = &cmm,
+	};
+	struct cmm_get_info cmm_info_arg = {
+		.info = cmm_info,
+	};
+
+	if (ioctl(handle, CMM_GETHANDLE, &cmm_arg))
+		return false;
+
+	cmm_info_arg.cmm = cmm;
+	if (ioctl(handle, CMM_GETINFO, &cmm_info_arg))
+		return false;
+
+	return true;
+}
+
+static inline bool allocate_segments(int handle,
+		void *proc_handle,
+		struct dsp_node *node)
+{
+	struct dsp_cmm_info cmm_info;
+	struct dsp_node_attr attr;
+	enum dsp_node_type node_type;
+
+	if (!get_cmm_info(handle, proc_handle, &cmm_info))
+		return false;
+
+	if (!dsp_node_get_attr(handle, node, &attr, sizeof(attr)))
+		return false;
+
+	node_type = attr.info.props.ntype;
+
+	if ((node_type != DSP_NODE_DEVICE) && (cmm_info.segments > 0)) {
+		struct dsp_cmm_seg_info *seg;
+
+		seg = &cmm_info.info[0];
+
+		if (seg->base_pa != 0 && seg->size > 0) {
+			void *base;
+			struct dsp_buffer_attr buffer_attr;
+
+			base = mmap(NULL, seg->size,
+					PROT_READ | PROT_WRITE, MAP_SHARED | 0x2000 /* MAP_LOCKED */,
+					handle, seg->base_pa);
+
+			if (!base)
+				return false;
+
+			buffer_attr.alignment = 0;
+			buffer_attr.segment = 1 | 0x10000000;
+			buffer_attr.cb = 0;
+			if (!dsp_node_alloc_buf(handle, node, seg->size,
+						&buffer_attr, &base))
+			{
+				munmap(base, seg->size);
+				return false;
+			}
+
+			node->msgbuf_addr = base;
+			node->msgbuf_size = seg->size;
+		}
+	}
+
+	return true;
+}
+#endif
+
+#ifdef ALLOCATE_HEAP
+struct get_uuid_props {
+	void *proc_handle;
+	const struct dsp_uuid *node_uuid;
+	struct dsp_ndb_props *props;
+};
+
+static inline bool get_uuid_props(int handle,
+		void *proc_handle,
+		const struct dsp_uuid *node_uuid,
+		struct dsp_ndb_props *props)
+{
+	struct get_uuid_props arg = {
+		.proc_handle = proc_handle,
+		.node_uuid = node_uuid,
+		.props = props,
+	};
+
+	return !ioctl(handle, NODE_GETUUIDPROPS, &arg);
+}
+
+#define PG_SIZE_4K 4096
+#define PG_MASK(pg_size) (~((pg_size)-1))
+#define PG_ALIGN_LOW(addr, pg_size) ((addr) & PG_MASK(pg_size))
+#define PG_ALIGN_HIGH(addr, pg_size) (((addr)+(pg_size)-1) & PG_MASK(pg_size))
+#endif
+
+struct node_allocate {
+	void *proc_handle;
+	const struct dsp_uuid *node_id;
+	const void *cb_data;
+	struct dsp_node_attr_in *attrs;
+	void **ret_node;
+};
+
+bool dsp_node_allocate(int handle,
+		void *proc_handle,
+		const struct dsp_uuid *node_uuid,
+		const void *cb_data,
+		struct dsp_node_attr_in *attrs,
+		struct dsp_node **ret_node)
+{
+	struct dsp_node *node;
+	void *node_handle = NULL;
+	struct node_allocate arg = {
+		.proc_handle = proc_handle,
+		.node_id = node_uuid,
+		.cb_data = cb_data,
+		.attrs = attrs,
+		.ret_node = &node_handle,
+	};
+
+#ifdef ALLOCATE_HEAP
+	if (attrs) {
+		struct dsp_ndb_props props;
+
+		if (!get_uuid_props(handle, proc_handle, node_uuid, &props)) {
+			attrs->gpp_va = NULL;
+			return false;
+		}
+
+		if (attrs->profile_id < props.count_profiles) {
+			unsigned int heap_size = 0;
+
+			heap_size = props.node_profiles[attrs->profile_id].heap_size;
+			if (heap_size) {
+				void *virtual = NULL;
+
+				heap_size = PG_ALIGN_HIGH(heap_size, PG_SIZE_4K);
+				virtual = memalign(128, heap_size);
+				if (!virtual)
+					return false;
+				attrs->heap_size = heap_size;
+				attrs->gpp_va = virtual;
+			}
+		}
+	}
+#endif
+
+	if (ioctl(handle, NODE_ALLOCATE, &arg)) {
+		if (attrs) {
+			free(attrs->gpp_va);
+			attrs->gpp_va = NULL;
+		}
+		return false;
+	}
+
+	node = calloc(1, sizeof(*node));
+	node->handle = node_handle;
+	if (attrs)
+		node->heap = attrs->gpp_va;
+
+#ifdef ALLOCATE_SM
+	if (!allocate_segments(handle, proc_handle, node)) {
+		dsp_node_delete(handle, node);
+		free(node->heap);
+		free(node);
+		return false;
+	}
+#endif
+
+	*ret_node = node;
+
+	return true;
+}
+
+struct node_connect {
+	void *node_handle;
+	unsigned int stream;
+	void *other_node_handle;
+	unsigned int other_stream;
+	struct dsp_stream_attr *attrs;
+	void *params;
+};
+
+bool dsp_node_connect(int handle,
+		struct dsp_node *node,
+		unsigned int stream,
+		struct dsp_node *other_node,
+		unsigned int other_stream,
+		struct dsp_stream_attr *attrs,
+		void *params)
+{
+	struct node_connect arg = {
+		.node_handle = node->handle,
+		.stream = stream,
+		.other_node_handle = other_node->handle,
+		.other_stream = other_stream,
+		.attrs = attrs,
+		.params = params,
+	};
+
+	return !ioctl(handle, NODE_CONNECT, &arg);
+}
+
+bool dsp_node_free(int handle,
+		struct dsp_node *node)
+{
+#ifdef ALLOCATE_SM
+	munmap(node->msgbuf_addr, node->msgbuf_size);
+#endif
+	dsp_node_delete(handle, node);
+	free(node->heap);
+	free(node);
+
+	return true;
+}
+
+struct reserve_mem {
+	void *proc_handle;
+	unsigned long size;
+	void **addr;
+};
+
+bool dsp_reserve(int handle,
+		void *proc_handle,
+		unsigned long size,
+		void **addr)
+{
+	struct reserve_mem arg = {
+		.proc_handle = proc_handle,
+		.size = size,
+		.addr = addr,
+	};
+
+	return !ioctl(handle, PROC_RSVMEM, &arg);
+}
+
+struct unreserve_mem {
+	void *proc_handle;
+	unsigned long size;
+	void *addr;
+};
+
+bool dsp_unreserve(int handle,
+		void *proc_handle,
+		void *addr)
+{
+	struct unreserve_mem arg = {
+		.proc_handle = proc_handle,
+		.addr = addr,
+	};
+
+	return !ioctl(handle, PROC_UNRSVMEM, &arg);
+}
+
+struct map_mem {
+	void *proc_handle;
+	void *mpu_addr;
+	unsigned long size;
+	void *req_addr;
+	void **ret_map_addr;
+	unsigned long attr;
+};
+
+bool dsp_map(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size,
+		void *req_addr,
+		void *ret_map_addr,
+		unsigned long attr)
+{
+	struct map_mem arg = {
+		.proc_handle = proc_handle,
+		.mpu_addr = mpu_addr,
+		.size = size,
+		.req_addr = req_addr,
+		.ret_map_addr = ret_map_addr,
+		.attr = attr,
+	};
+
+	return !ioctl(handle, PROC_MAPMEM, &arg);
+}
+
+struct unmap_mem {
+	void *proc_handle;
+	unsigned long size;
+	void *map_addr;
+};
+
+bool dsp_unmap(int handle,
+		void *proc_handle,
+		void *map_addr)
+{
+	struct unmap_mem arg = {
+		.proc_handle = proc_handle,
+		.map_addr = map_addr,
+	};
+
+	return !ioctl(handle, PROC_UNMAPMEM, &arg);
+}
+
+struct flush_mem {
+	void *proc_handle;
+	void *mpu_addr;
+	unsigned long size;
+	unsigned long flags;
+};
+
+bool dsp_flush(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size,
+		unsigned long flags)
+{
+	struct flush_mem arg = {
+		.proc_handle = proc_handle,
+		.mpu_addr = mpu_addr,
+		.size = size,
+		.flags = flags,
+	};
+
+	return !ioctl(handle, PROC_FLUSHMEMORY, &arg);
+}
+
+struct invalidate_mem {
+	void *proc_handle;
+	void *mpu_addr;
+	unsigned long size;
+};
+
+bool dsp_invalidate(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size)
+{
+	struct invalidate_mem arg = {
+		.proc_handle = proc_handle,
+		.mpu_addr = mpu_addr,
+		.size = size,
+	};
+
+	return !ioctl(handle, PROC_INVALIDATEMEMORY, &arg);
+}
+
+struct proc_get_info {
+	void *proc_handle;
+	unsigned type;
+	struct dsp_info *info;
+	unsigned size;
+};
+
+bool dsp_proc_get_info(int handle,
+		void *proc_handle,
+		unsigned type,
+		struct dsp_info *info,
+		unsigned size)
+{
+	struct proc_get_info arg = {
+		.proc_handle = proc_handle,
+		.type = type,
+		.info = info,
+		.size = size,
+	};
+
+	return !ioctl(handle, PROC_ENUMRESOURCES, &arg);
+}
+
+struct enum_nodes {
+	void *proc_handle;
+	void **node_table;
+	unsigned node_table_size;
+	unsigned *num_nodes;
+	unsigned *allocated;
+};
+
+bool dsp_enum_nodes(int handle,
+		void *proc_handle,
+		void **node_table,
+		unsigned node_table_size,
+		unsigned *num_nodes,
+		unsigned *allocated)
+{
+	struct enum_nodes arg = {
+		.proc_handle = proc_handle,
+		.node_table = node_table,
+		.node_table_size = node_table_size,
+		.num_nodes = num_nodes,
+		.allocated = allocated,
+	};
+
+	return !ioctl(handle, PROC_ENUMNODE, &arg);
+}
+
+struct stream_attr {
+	void *event;
+	char *name;
+	void *base;
+	unsigned long size;
+	struct dsp_stream_attr_in *attrin;
+};
+
+struct stream_open {
+	void *node_handle;
+	unsigned int direction;
+	unsigned int index;
+	struct stream_attr *attr;
+	void *stream;
+};
+
+bool dsp_stream_open(int handle,
+		struct dsp_node *node,
+		unsigned int direction,
+		unsigned int index,
+		struct dsp_stream_attr_in *attrin,
+		void *stream)
+{
+	struct stream_attr strm_attr = {
+		.attrin = attrin,
+	};
+	struct stream_open stream_arg = {
+		.node_handle = node->handle,
+		.direction = direction,
+		.index = index,
+		.attr = &strm_attr,
+		.stream = stream,
+	};
+
+	if (attrin && (attrin->mode == STRMMODE_ZEROCOPY ||
+				attrin->mode == STRMMODE_RDMA)) {
+		struct dsp_cmm_info cmm_info;
+
+		if (!get_cmm_info(handle, NULL, &cmm_info))
+			return false;
+
+		if (cmm_info.segments > 0) {
+			void *base;
+			struct dsp_cmm_seg_info *seg;
+
+			seg = &cmm_info.info[0];
+			base = mmap(NULL, seg->size,
+					PROT_READ | PROT_WRITE,
+					MAP_SHARED | 0x2000 /* MAP_LOCKED */,
+					handle, seg->base_pa);
+
+			if (!base)
+				return false;
+
+			strm_attr.base = base;
+			strm_attr.size = seg->size;
+		}
+	}
+
+	return !ioctl(handle, STRM_OPEN, &stream_arg);
+}
+
+struct stream_info {
+	enum dsp_stream_mode mode;
+	unsigned int segment;
+	void *base;
+	struct dsp_stream_info *info;
+};
+
+struct stream_get_info {
+	void *stream;
+	struct stream_info *info;
+	unsigned int size;
+};
+
+static inline bool get_stream_info(int handle,
+		void *stream,
+		struct stream_info *info,
+		unsigned int size)
+{
+	struct stream_get_info arg = {
+		.stream = stream,
+		.info = info,
+		.size = size,
+	};
+
+	return !ioctl(handle, STRM_GETINFO, &arg);
+}
+
+bool dsp_stream_close(int handle,
+		void *stream)
+{
+	struct stream_info info;
+	if (!get_stream_info(handle, stream, &info, sizeof(struct stream_info)))
+		return false;
+
+	if (info.base) {
+		struct dsp_cmm_info cmm_info;
+
+		if (!get_cmm_info(handle, NULL, &cmm_info))
+			return false;
+
+		if (cmm_info.segments > 0) {
+			struct dsp_cmm_seg_info *seg;
+			seg = &cmm_info.info[0];
+			if (munmap(info.base, seg->size))
+				return false;
+		}
+	}
+
+	return !ioctl(handle, STRM_CLOSE, &stream);
+}
+
+struct stream_idle {
+	void *stream;
+	bool flush;
+};
+
+bool dsp_stream_idle(int handle,
+		void *stream,
+		bool flush)
+{
+	struct stream_idle arg = {
+		.stream = stream,
+		.flush = flush,
+	};
+	return !ioctl(handle, STRM_IDLE, &arg);
+}
+
+struct stream_reclaim {
+	void *stream;
+	unsigned char **buff;
+	unsigned long *data_size;
+	unsigned long *buff_size;
+	unsigned long *flag;
+};
+
+bool dsp_stream_reclaim(int handle,
+		void *stream,
+		unsigned char **buff,
+		unsigned long *data_size,
+		unsigned long *buff_size,
+		unsigned long *flag)
+{
+	struct stream_reclaim arg = {
+		.stream = stream,
+		.buff = buff,
+		.data_size = data_size,
+		.buff_size = buff_size,
+		.flag = flag,
+	};
+	return !ioctl(handle, STRM_RECLAIM, &arg);
+}
+
+struct stream_issue {
+	void *stream;
+	unsigned char *buff;
+	unsigned long data_size;
+	unsigned long buff_size;
+	unsigned long flag;
+};
+
+bool dsp_stream_issue(int handle,
+		void *stream,
+		unsigned char *buff,
+		unsigned long data_size,
+		unsigned long buff_size,
+		unsigned long flag)
+{
+	struct stream_issue arg = {
+		.stream = stream,
+		.buff = buff,
+		.data_size = data_size,
+		.buff_size = buff_size,
+		.flag = flag,
+	};
+	return !ioctl(handle, STRM_ISSUE, &arg);
+}
+
+bool dsp_stream_get_info(int handle,
+		void *stream,
+		struct dsp_stream_info *info,
+		unsigned int size)
+{
+	struct stream_info stream_info = {
+		.info = info
+	};
+
+	return get_stream_info(handle, stream, &stream_info, size);
+}
+
+
+struct stream_allocate_buffer {
+	void *stream;
+	unsigned int size;
+	unsigned char **buff;
+	unsigned int num_buf;
+};
+
+bool dsp_stream_allocate_buffers(int handle,
+		void *stream,
+		unsigned int size,
+		unsigned char **buff,
+		unsigned int num_buf)
+{
+	unsigned int i;
+	struct stream_info info;
+	if (!get_stream_info(handle, stream, &info, sizeof(struct stream_info)))
+		return false;
+
+	if (info.segment > 0) {
+		struct stream_allocate_buffer arg = {
+			.stream = stream,
+			.size = size,
+			.buff = buff,
+			.num_buf = num_buf,
+		};
+
+		return !ioctl(handle, STRM_ALLOCATEBUFFER, &arg);
+	}
+
+	for (i = 0; i < num_buf; i++)
+		buff[i] = (unsigned char *) malloc(size);
+
+	return true;
+}
+
+struct stream_free_buffers {
+	void *stream;
+	unsigned char **buff;
+	unsigned int num_buf;
+};
+
+bool dsp_stream_free_buffers(int handle,
+		void *stream,
+		unsigned char **buff,
+		unsigned int num_buf)
+{
+	unsigned int i;
+	struct stream_info info;
+	if (!get_stream_info(handle, stream, &info, sizeof(struct stream_info)))
+		return false;
+
+	if (info.segment) {
+		struct stream_free_buffers arg = {
+			.stream = stream,
+			.buff = buff,
+			.num_buf = num_buf,
+		};
+		return !ioctl(handle, STRM_FREEBUFFER, &arg);
+	}
+
+	for (i = 0; i < num_buf; i++) {
+		free(buff[i]);
+		buff[i] = NULL;
+	}
+
+	return true;
+}
diff --git a/bridge/dsp_bridge.h b/bridge/dsp_bridge.h
new file mode 100644
index 0000000..c5acaa4
--- /dev/null
+++ b/bridge/dsp_bridge.h
@@ -0,0 +1,441 @@
+/*
+ * Copyright (C) 2009-2010 Felipe Contreras
+ *
+ * Author: Felipe Contreras <felipe.contreras@gmail.com>
+ *
+ * This file may be used under the terms of the GNU Lesser General Public
+ * License version 2.1, a copy of which is found in LICENSE included in the
+ * packaging of this file.
+ */
+
+#ifndef DSP_BRIDGE_H
+#define DSP_BRIDGE_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define ALLOCATE_HEAP
+
+#define DSP_MMUFAULT 0x00000010
+#define DSP_SYSERROR 0x00000020
+#define DSP_NODEMESSAGEREADY 0x00000200
+
+#define MAX_PROFILES 16
+#define DSP_MAXNAMELEN 32
+
+struct dsp_uuid {
+	uint32_t field_1;
+	uint16_t field_2;
+	uint16_t field_3;
+	uint8_t field_4;
+	uint8_t field_5;
+	uint8_t field_6[6];
+};
+
+struct dsp_node {
+	void *handle;
+	void *heap;
+	void *msgbuf_addr;
+	size_t msgbuf_size;
+};
+
+/* note: cmd = 0x20000000 has special handling */
+struct dsp_msg {
+	uint32_t cmd;
+	uint32_t arg_1;
+	uint32_t arg_2;
+};
+
+struct dsp_notification {
+	char *name;
+	void *handle;
+};
+
+struct dsp_node_attr_in {
+	unsigned long cb;
+	int priority;
+	unsigned int timeout;
+	unsigned int profile_id;
+	unsigned int heap_size;
+	void *gpp_va;
+};
+
+enum dsp_dcd_object_type {
+	DSP_DCD_NODETYPE,
+	DSP_DCD_PROCESSORTYPE,
+	DSP_DCD_LIBRARYTYPE,
+	DSP_DCD_CREATELIBTYPE,
+	DSP_DCD_EXECUTELIBTYPE,
+	DSP_DCD_DELETELIBTYPE,
+};
+
+enum dsp_node_type {
+	DSP_NODE_DEVICE,
+	DSP_NODE_TASK,
+	DSP_NODE_DAISSOCKET,
+	DSP_NODE_MESSAGE,
+};
+
+#ifdef ALLOCATE_HEAP
+/* The dsp_resourcereqmts structure for node's resource requirements */
+struct dsp_resourcereqmts {
+	uint32_t cb_struct;
+	uint32_t static_data_size;
+	uint32_t global_data_size;
+	uint32_t program_mem_size;
+	uint32_t uwc_execution_time;
+	uint32_t uwc_period;
+	uint32_t uwc_deadline;
+	uint32_t avg_exection_time;
+	uint32_t minimum_period;
+};
+
+struct dsp_nodeprofs {
+	uint32_t heap_size;
+};
+
+/* The dsp_ndb_props structure reports the attributes of a node */
+struct dsp_ndb_props {
+	uint32_t cb_struct;
+	struct dsp_uuid node_id;
+	char ac_name[DSP_MAXNAMELEN];
+	enum dsp_node_type ntype;
+	uint32_t cache_on_gpp;
+	struct dsp_resourcereqmts dsp_resource_reqmts;
+	int32_t prio;
+	uint32_t stack_size;
+	uint32_t sys_stack_size;
+	uint32_t stack_seg;
+	uint32_t message_depth;
+	uint32_t num_input_streams;
+	uint32_t num_output_streams;
+	uint32_t timeout;
+	uint32_t count_profiles; /* Number of supported profiles */
+	struct dsp_nodeprofs node_profiles[MAX_PROFILES]; /* Array of profiles */
+	uint32_t stack_seg_name; /* Stack Segment Name */
+};
+#endif
+
+enum dsp_resource {
+	DSP_RESOURCE_DYNDARAM = 0,
+	DSP_RESOURCE_DYNSARAM,
+	DSP_RESOURCE_DYNEXTERNAL,
+	DSP_RESOURCE_DYNSRAM,
+	DSP_RESOURCE_PROCLOAD,
+};
+
+struct dsp_info {
+	unsigned long cb;
+	enum dsp_resource type;
+	union {
+		unsigned long resource;
+		struct {
+			unsigned long size;
+			unsigned long total_free_size;
+			unsigned long len_max_free_block;
+			unsigned long free_blocks;
+			unsigned long alloc_blocks;
+		} mem;
+		struct {
+			unsigned long load;
+			unsigned long pred_load;
+			unsigned long freq;
+			unsigned long pred_freq;
+		} proc;
+	} result;
+};
+
+enum dsp_connect_type {
+	CONNECTTYPE_NODEOUTPUT,
+	CONNECTTYPE_GPPOUTPUT,
+	CONNECTTYPE_NODEINPUT,
+	CONNECTTYPE_GPPINPUT
+};
+
+struct dsp_stream_connect {
+	unsigned long cb;
+	enum dsp_connect_type type;
+	unsigned int index;
+	void *node_handle;
+	struct dsp_uuid node_id;
+	unsigned int stream_index;
+};
+
+enum dsp_stream_mode {
+	STRMMODE_PROCCOPY,
+	STRMMODE_ZEROCOPY,
+	STRMMODE_LDMA,
+	STRMMODE_RDMA
+};
+
+struct dsp_stream_attr {
+	unsigned int seg_id;
+	unsigned int buf_size;
+	unsigned int num_bufs;
+	unsigned int alignment;
+	unsigned int timeout;
+	enum dsp_stream_mode mode;
+	unsigned int dma_chnl_id;
+	unsigned int dma_priority;
+};
+
+struct dsp_stream_attr_in {
+	unsigned long cb;
+	unsigned int timeout;
+	unsigned int segment;
+	unsigned int alignment;
+	unsigned int num_bufs;
+	enum dsp_stream_mode mode;
+	unsigned int dma_chnl_id;
+	unsigned int dma_priority;
+};
+
+enum dsp_stream_state {
+	STREAM_IDLE,
+	STREAM_READY,
+	STREAM_PENDING,
+	STREAM_DONE
+};
+
+struct dsp_stream_info {
+	unsigned long cb;
+	unsigned int num_bufs_allowed;
+	unsigned int num_bufs_in_stream;
+	unsigned long num_bytes;
+	void *sync_handle;
+	enum dsp_stream_state state;
+};
+
+enum dsp_node_state {
+	NODE_ALLOCATED,
+	NODE_CREATED,
+	NODE_RUNNING,
+	NODE_PAUSED,
+	NODE_DONE
+};
+
+struct dsp_node_info {
+	unsigned long cb;
+	struct dsp_ndb_props props;
+	unsigned int priority;
+	enum dsp_node_state state;
+	void *owner;
+	unsigned int num_streams;
+	struct dsp_stream_connect streams[16];
+	unsigned int node_env;
+};
+
+struct dsp_node_attr {
+	unsigned long cb;
+	struct dsp_node_attr_in attr_in;
+	unsigned long inputs;
+	unsigned long outputs;
+	struct dsp_node_info info;
+};
+
+int dsp_open(void);
+
+int dsp_close(int handle);
+
+bool dsp_attach(int handle,
+		unsigned int num,
+		const void *info,
+		void **ret_handle);
+
+bool dsp_detach(int handle,
+		void *proc_handle);
+
+bool dsp_start(int handle,
+		void *proc_handle);
+
+bool dsp_stop(int handle,
+		void *proc_handle);
+
+bool dsp_load(int handle,
+		void *proc_handle,
+		int argc, char **argv,
+		char **env);
+
+bool dsp_node_allocate(int handle,
+		void *proc_handle,
+		const struct dsp_uuid *node_uuid,
+		const void *cb_data,
+		struct dsp_node_attr_in *attrs,
+		struct dsp_node **ret_node);
+
+bool dsp_node_free(int handle,
+		struct dsp_node *node);
+
+bool dsp_node_connect(int handle,
+		struct dsp_node *node,
+		unsigned int stream,
+		struct dsp_node *other_node,
+		unsigned int other_stream,
+		struct dsp_stream_attr *attrs,
+		void *params);
+
+bool dsp_node_create(int handle,
+		struct dsp_node *node);
+
+bool dsp_node_run(int handle,
+		struct dsp_node *node);
+
+bool dsp_node_terminate(int handle,
+		struct dsp_node *node,
+		unsigned long *status);
+
+bool dsp_node_put_message(int handle,
+		struct dsp_node *node,
+		const struct dsp_msg *message,
+		unsigned int timeout);
+
+bool dsp_node_get_message(int handle,
+		struct dsp_node *node,
+		struct dsp_msg *message,
+		unsigned int timeout);
+
+bool dsp_reserve(int handle,
+		void *proc_handle,
+		unsigned long size,
+		void **addr);
+
+bool dsp_unreserve(int handle,
+		void *proc_handle,
+		void *addr);
+
+bool dsp_map(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size,
+		void *req_addr,
+		void *ret_map_addr,
+		unsigned long attr);
+
+bool dsp_unmap(int handle,
+		void *proc_handle,
+		void *map_addr);
+
+bool dsp_flush(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size,
+		unsigned long flags);
+
+bool dsp_invalidate(int handle,
+		void *proc_handle,
+		void *mpu_addr,
+		unsigned long size);
+
+bool dsp_register_notify(int handle,
+		void *proc_handle,
+		unsigned int event_mask,
+		unsigned int notify_type,
+		struct dsp_notification *info);
+
+bool dsp_node_register_notify(int handle,
+		struct dsp_node *node,
+		unsigned int event_mask,
+		unsigned int notify_type,
+		struct dsp_notification *info);
+
+bool dsp_wait_for_events(int handle,
+		struct dsp_notification **notifications,
+		unsigned int count,
+		unsigned int *ret_index,
+		unsigned int timeout);
+
+bool dsp_enum(int handle,
+		unsigned int num,
+		struct dsp_ndb_props *info,
+		size_t info_size,
+		unsigned int *ret_num);
+
+bool dsp_register(int handle,
+		const struct dsp_uuid *uuid,
+		enum dsp_dcd_object_type type,
+		const char *path);
+
+bool dsp_unregister(int handle,
+		const struct dsp_uuid *uuid,
+		enum dsp_dcd_object_type type);
+
+bool dsp_proc_get_info(int handle,
+		void *proc_handle,
+		enum dsp_resource type,
+		struct dsp_info *info,
+		unsigned size);
+
+static inline bool
+dsp_send_message(int handle,
+		struct dsp_node *node,
+		uint32_t cmd,
+		uint32_t arg_1,
+		uint32_t arg_2)
+{
+	struct dsp_msg msg;
+
+	msg.cmd = cmd;
+	msg.arg_1 = arg_1;
+	msg.arg_2 = arg_2;
+
+	return dsp_node_put_message(handle, node, &msg, -1);
+}
+
+bool dsp_node_get_attr(int handle,
+		struct dsp_node *node,
+		struct dsp_node_attr *attr,
+		size_t attr_size);
+
+bool dsp_enum_nodes(int handle,
+		void *proc_handle,
+		void **node_table,
+		unsigned node_table_size,
+		unsigned *num_nodes,
+		unsigned *allocated);
+
+bool dsp_stream_open(int handle,
+		struct dsp_node *node,
+		unsigned int direction,
+		unsigned int index,
+		struct dsp_stream_attr_in *attrin,
+		void *stream);
+
+bool dsp_stream_close(int handle,
+		void *stream);
+
+bool dsp_stream_idle(int handle,
+		void *stream,
+		bool flush);
+
+bool dsp_stream_reclaim(int handle,
+		void *stream,
+		unsigned char **buff,
+		unsigned long *data_size,
+		unsigned long *buff_size,
+		unsigned long *args);
+
+bool dsp_stream_issue(int handle,
+		void *stream,
+		unsigned char *buff,
+		unsigned long data_size,
+		unsigned long buff_size,
+		unsigned long arg);
+
+bool dsp_stream_get_info(int handle,
+		void *stream,
+		struct dsp_stream_info *info,
+		unsigned int size);
+
+bool dsp_stream_allocate_buffers(int handle,
+		void *stream,
+		unsigned int size,
+		unsigned char **buff,
+		unsigned int num_buf);
+
+bool dsp_stream_free_buffers(int handle,
+		void *stream,
+		unsigned char **buff,
+		unsigned int num_buf);
+
+#endif /* DSP_BRIDGE_H */
diff --git a/bridge/log.h b/bridge/log.h
new file mode 100644
index 0000000..55378ed
--- /dev/null
+++ b/bridge/log.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2009-2010 Felipe Contreras
+ * Copyright (C) 2009-2010 Nokia Corporation
+ *
+ * Author: Felipe Contreras <felipe.contreras@gmail.com>
+ *
+ * This file may be used under the terms of the GNU Lesser General Public
+ * License version 2.1, a copy of which is found in LICENSE included in the
+ * packaging of this file.
+ */
+
+#ifndef LOG_H
+#define LOG_H
+
+#ifdef DEBUG
+extern unsigned debug_level;
+#endif
+
+void pr_helper(unsigned int level,
+		const char *file,
+		const char *function,
+		unsigned int line,
+		const char *fmt,
+		...) __attribute__((format(printf, 5, 6)));
+
+#define pr_base(level, ...) pr_helper(level, __FILE__, __func__, __LINE__, __VA_ARGS__)
+
+#define pr_err(...) pr_base(0, __VA_ARGS__)
+#define pr_warning(...) pr_base(1, __VA_ARGS__)
+#define pr_test(...) pr_base(2, __VA_ARGS__)
+
+#ifdef DEBUG
+#define pr_info(...) pr_base(3, __VA_ARGS__)
+#define pr_debug(...) pr_base(4, __VA_ARGS__)
+#else
+#define pr_info(...) ({ if (0) pr_base(3, __VA_ARGS__); })
+#define pr_debug(...) ({ if (0) pr_base(4, __VA_ARGS__); })
+#endif
+
+#endif /* LOG_H */