[meego-commits] 7629: Changes to Trunk:Testing/dsp-tools
Felipe Contreras
no_reply at build.meego.com
Mon Sep 20 18:09:15 UTC 2010
Hi,
I have made the following changes to dsp-tools in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Felipe Contreras
[This message was auto-generated]
---
Request #7629:
submit: home:fcontrer/dsp-tools(r9) -> Trunk:Testing/dsp-tools
Message:
Update to latest upstream
State: new 2010-09-20T11:09:15 fcontrer
Comment: None
changes files:
--------------
++++++ deleted changes files:
--- dsp-tools.changes
old:
----
dsp-tools-1.1.0.g57.tar.gz
dsp-tools.changes
new:
----
dsp-tools-2.0.tar.gz
spec files:
-----------
--- dsp-tools.spec
+++ dsp-tools.spec
@@ -1,5 +1,5 @@
Name: dsp-tools
-Version: 1.1.0.g57
+Version: 2.0
Release: 1
Summary: Miscellaneous utilities for TI's C64x+ DSP
@@ -19,7 +19,7 @@
%build
-make V=y CFLAGS="$RPM_OPT_FLAGS" CROSS_COMPILE= %{?_smp_mflags}
+make V=y DSP_API=2 CFLAGS="$RPM_OPT_FLAGS" CROSS_COMPILE= %{?_smp_mflags}
%install
other changes:
--------------
++++++ dsp-tools-1.1.0.g57.tar.gz -> dsp-tools-2.0.tar.gz
--- .version
+++ .version
@@ -1 +1 @@
-1.1.0.g57
+2.0
--- LICENSE
+++ LICENSE
+ 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!
--- Makefile
+++ Makefile
@@ -1,7 +1,8 @@
CROSS_COMPILE ?= arm-linux-
CC := $(CROSS_COMPILE)gcc
-CFLAGS := -O2 -Wall -Wextra -Wno-unused-parameter -std=c99
+CFLAGS := -O2 -Wall -Wextra -Wno-unused-parameter -ansi -std=c99
+LDFLAGS := -Wl,--as-needed
override CFLAGS += -D_GNU_SOURCE
@@ -41,7 +42,7 @@
endif
%.o:: %.c
- $(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) -MMD -o $@ -c $<
+ $(QUIET_CC)$(CC) $(CFLAGS) -MMD -o $@ -c $<
$(bins):
$(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
--- README
+++ README
@@ -5,8 +5,17 @@
* dsp-test: runs simple trivial tests
* dsp-load: prints the DSP CPU load and frequency
* dsp-probe: checks running tasks
+ * dsp-exec: loads base images into the DSP
== building ==
There are no dependencies, so just type 'make'. If you are using an old version
-of TI's dspbrdige driver, do 'make OLD=y'.
+of TI's dspbrdige driver, do 'make DSP_API=0'.
+
+== tidsp ==
+
+You'll need a kernel with tidspbridge driver, the DSP firmware in /lib/dsp, and
+the DSP running a proper baseimage (baseimage.dof).
+
+See:
+http://omapzoom.org/wiki/L23.i3.8_Release_Notes
--- dmm_buffer.h
+++ dmm_buffer.h
@@ -6,36 +6,32 @@
* Felipe Contreras <felipe.contreras at nokia.com>
* Marco Ballesio <marco.ballesio at nokia.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 <unistd.h> /* for getpagesize */
+#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;
- dsp_node_t *node;
+ void *proc;
void *data;
void *allocated_data;
size_t size;
@@ -47,19 +43,22 @@
void *user_data;
bool used;
bool keyframe;
+ int dir;
} dmm_buffer_t;
static inline dmm_buffer_t *
dmm_buffer_new(int handle,
- dsp_node_t *node)
+ void *proc,
+ int dir)
{
dmm_buffer_t *b;
b = calloc(1, sizeof(*b));
pr_debug("%p", b);
b->handle = handle;
- b->node = node;
+ b->proc = proc;
b->alignment = 128;
+ b->dir = dir;
return b;
}
@@ -71,80 +70,70 @@
if (!b)
return;
if (b->map)
- dsp_unmap(b->handle, b->node, b->map);
+ dsp_unmap(b->handle, b->proc, b->map);
if (b->reserve)
- dsp_unreserve(b->handle, b->node, b->reserve);
+ dsp_unreserve(b->handle, b->proc, b->reserve);
free(b->allocated_data);
free(b);
}
static inline void
-dmm_buffer_map(dmm_buffer_t *b)
+dmm_buffer_begin(dmm_buffer_t *b,
+ size_t len)
{
pr_debug("%p", b);
- if (b->map)
- dsp_unmap(b->handle, b->node, b->map);
- dsp_map(b->handle, b->node, b->data, b->size, b->reserve, &b->map, 0);
+ 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_unmap(dmm_buffer_t *b)
+dmm_buffer_end(dmm_buffer_t *b,
+ size_t len)
{
pr_debug("%p", b);
- if (!b->map)
- return;
- dsp_unmap(b->handle, b->node, b->map);
- b->map = NULL;
+ if (b->dir != DMA_TO_DEVICE)
+ dsp_invalidate(b->handle, b->proc, b->data, len);
}
static inline void
-dmm_buffer_clean(dmm_buffer_t *b,
- size_t len)
-{
- pr_debug(NULL, "%p", b);
- dsp_flush(b->handle, b->node, b->data, len, 1);
-}
-
-static inline void
-dmm_buffer_invalidate(dmm_buffer_t *b,
- size_t len)
+dmm_buffer_map(dmm_buffer_t *b)
{
+ size_t to_reserve;
pr_debug("%p", b);
- dsp_invalidate(b->handle, b->node, b->data, len);
+ 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);
+ dsp_map(b->handle, b->proc, b->data, b->size, b->reserve, &b->map, 0);
}
static inline void
-dmm_buffer_flush(dmm_buffer_t *b,
- size_t len)
+dmm_buffer_unmap(dmm_buffer_t *b)
{
pr_debug("%p", b);
- dsp_flush(b->handle, b->node, b->data, len, 0);
-}
-
-static inline void
-dmm_buffer_reserve(dmm_buffer_t *b,
- size_t size)
-{
- size_t to_reserve;
- size_t page_size;
- page_size = getpagesize();
+ if (b->map) {
+ dsp_unmap(b->handle, b->proc, b->map);
+ b->map = NULL;
+ }
if (b->reserve) {
- if (ROUND_UP(size, page_size) <= ROUND_UP(b->size, page_size))
- goto leave;
- dsp_unreserve(b->handle, b->node, b->reserve);
+ dsp_unreserve(b->handle, b->proc, b->reserve);
+ b->reserve = NULL;
}
- to_reserve = ROUND_UP(size, page_size) + page_size;
- dsp_reserve(b->handle, b->node, to_reserve, &b->reserve);
-leave:
- b->size = size;
}
static inline void
dmm_buffer_allocate(dmm_buffer_t *b,
- size_t size)
+ size_t size)
{
pr_debug("%p", b);
- dmm_buffer_unmap(b);
free(b->allocated_data);
if (b->alignment != 0) {
if (posix_memalign(&b->allocated_data, b->alignment, ROUND_UP(size, b->alignment)) != 0)
@@ -153,20 +142,30 @@
}
else
b->data = b->allocated_data = malloc(size);
- dmm_buffer_reserve(b, size);
- dmm_buffer_map(b);
+ b->size = size;
}
static inline void
dmm_buffer_use(dmm_buffer_t *b,
- void *data,
- size_t size)
+ void *data,
+ size_t size)
{
pr_debug("%p", b);
- dmm_buffer_unmap(b);
b->data = data;
- dmm_buffer_reserve(b, size);
- dmm_buffer_map(b);
+ 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 */
--- dsp_bridge.c
+++ dsp_bridge.c
@@ -5,20 +5,9 @@
*
* Author: Felipe Contreras <felipe.contreras at gmail.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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"
@@ -150,9 +139,12 @@
#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_FREEBUFFER _IOWR(DB, DB_IOC(DB_STRM, 2), unsigned long)
#define STRM_ISSUE _IOW(DB, DB_IOC(DB_STRM, 6), unsigned long)
+/* 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);
@@ -180,7 +172,7 @@
.ret_handle = ret_handle,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_ATTACH, &arg));
+ return !ioctl(handle, PROC_ATTACH, &arg);
}
struct proc_detach {
@@ -194,7 +186,7 @@
.proc_handle = proc_handle,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_DETACH, &arg));
+ return !ioctl(handle, PROC_DETACH, &arg);
}
struct register_notify {
@@ -205,10 +197,10 @@
};
bool dsp_register_notify(int handle,
- void *proc_handle,
- unsigned int event_mask,
- unsigned int notify_type,
- struct dsp_notification *info)
+ void *proc_handle,
+ unsigned int event_mask,
+ unsigned int notify_type,
+ struct dsp_notification *info)
{
struct register_notify arg = {
.proc_handle = proc_handle,
@@ -217,7 +209,7 @@
.info = info,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_REGISTERNOTIFY, &arg));
+ return !ioctl(handle, PROC_REGISTERNOTIFY, &arg);
}
struct proc_start {
@@ -225,23 +217,23 @@
};
bool dsp_start(int handle,
- void *proc_handle)
+ void *proc_handle)
{
struct proc_start arg = {
.proc_handle = proc_handle,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_START, &arg));
+ return !ioctl(handle, PROC_START, &arg);
}
bool dsp_stop(int handle,
- void *proc_handle)
+ void *proc_handle)
{
struct proc_start arg = {
.proc_handle = proc_handle,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_STOP, &arg));
+ return !ioctl(handle, PROC_STOP, &arg);
}
struct proc_load {
@@ -252,9 +244,9 @@
};
bool dsp_load(int handle,
- void *proc_handle,
- int argc, char **argv,
- char **env)
+ void *proc_handle,
+ int argc, char **argv,
+ char **env)
{
struct proc_load arg = {
.proc_handle = proc_handle,
@@ -263,7 +255,7 @@
.env = env,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_LOAD, &arg));
+ return !ioctl(handle, PROC_LOAD, &arg);
}
struct node_register_notify {
@@ -274,10 +266,10 @@
};
bool dsp_node_register_notify(int handle,
- dsp_node_t *node,
- unsigned int event_mask,
- unsigned int notify_type,
- struct dsp_notification *info)
+ 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,
@@ -286,7 +278,7 @@
.info = info,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_REGISTERNOTIFY, &arg));
+ return !ioctl(handle, NODE_REGISTERNOTIFY, &arg);
}
struct wait_for_events {
@@ -297,10 +289,10 @@
};
bool dsp_wait_for_events(int handle,
- struct dsp_notification **notifications,
- unsigned int count,
- unsigned int *ret_index,
- unsigned int timeout)
+ struct dsp_notification **notifications,
+ unsigned int count,
+ unsigned int *ret_index,
+ unsigned int timeout)
{
struct wait_for_events arg = {
.notifications = notifications,
@@ -310,7 +302,7 @@
};
#if DSP_API >= 2
- return DSP_SUCCEEDED(ioctl(handle, MGR_WAIT, &arg));
+ return !ioctl(handle, MGR_WAIT, &arg);
#else
/*
* Temporary hack since libc only saves errors -1 to -4095; 0x80008017
@@ -320,7 +312,7 @@
r = ioctl(handle, MGR_WAIT, &arg);
if (r == (int)0x80008017)
errno = ETIME;
- return DSP_SUCCEEDED(r);
+ return !r;
#endif
}
@@ -332,10 +324,10 @@
};
bool dsp_enum(int handle,
- unsigned int num,
- struct dsp_ndb_props *info,
- size_t info_size,
- unsigned int *ret_num)
+ unsigned int num,
+ struct dsp_ndb_props *info,
+ size_t info_size,
+ unsigned int *ret_num)
{
struct enum_node arg = {
.num = num,
@@ -344,19 +336,19 @@
.ret_num = ret_num,
};
- return DSP_SUCCEEDED(ioctl(handle, MGR_ENUMNODE_INFO, &arg));
+ return !ioctl(handle, MGR_ENUMNODE_INFO, &arg);
}
struct register_object {
- const dsp_uuid_t *uuid;
+ const struct dsp_uuid *uuid;
enum dsp_dcd_object_type type;
const char *path;
};
bool dsp_register(int handle,
- const dsp_uuid_t *uuid,
- enum dsp_dcd_object_type type,
- const char *path)
+ const struct dsp_uuid *uuid,
+ enum dsp_dcd_object_type type,
+ const char *path)
{
struct register_object arg = {
.uuid = uuid,
@@ -364,24 +356,24 @@
.path = path,
};
- return DSP_SUCCEEDED(ioctl(handle, MGR_REGISTEROBJECT, &arg));
+ return !ioctl(handle, MGR_REGISTEROBJECT, &arg);
}
struct unregister_object {
- dsp_uuid_t *uuid;
+ const struct dsp_uuid *uuid;
enum dsp_dcd_object_type type;
};
bool dsp_unregister(int handle,
- dsp_uuid_t *uuid,
- enum dsp_dcd_object_type type)
+ const struct dsp_uuid *uuid,
+ enum dsp_dcd_object_type type)
{
struct unregister_object arg = {
.uuid = uuid,
.type = type,
};
- return DSP_SUCCEEDED(ioctl(handle, MGR_UNREGISTEROBJECT, &arg));
+ return !ioctl(handle, MGR_UNREGISTEROBJECT, &arg);
}
struct node_create {
@@ -389,13 +381,13 @@
};
bool dsp_node_create(int handle,
- dsp_node_t *node)
+ struct dsp_node *node)
{
struct node_create arg = {
.node_handle = node->handle,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_CREATE, &arg));
+ return !ioctl(handle, NODE_CREATE, &arg);
}
struct node_run {
@@ -403,13 +395,13 @@
};
bool dsp_node_run(int handle,
- dsp_node_t *node)
+ struct dsp_node *node)
{
struct node_run arg = {
.node_handle = node->handle,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_RUN, &arg));
+ return !ioctl(handle, NODE_RUN, &arg);
}
struct node_terminate {
@@ -418,27 +410,27 @@
};
bool dsp_node_terminate(int handle,
- dsp_node_t *node,
- unsigned long *status)
+ struct dsp_node *node,
+ unsigned long *status)
{
struct node_terminate arg = {
.node_handle = node->handle,
.status = status,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_TERMINATE, &arg));
+ return !ioctl(handle, NODE_TERMINATE, &arg);
}
struct node_put_message {
void *node_handle;
- const dsp_msg_t *message;
+ const struct dsp_msg *message;
unsigned int timeout;
};
bool dsp_node_put_message(int handle,
- dsp_node_t *node,
- const dsp_msg_t *message,
- unsigned int timeout)
+ struct dsp_node *node,
+ const struct dsp_msg *message,
+ unsigned int timeout)
{
struct node_put_message arg = {
.node_handle = node->handle,
@@ -446,19 +438,19 @@
.timeout = timeout,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_PUTMESSAGE, &arg));
+ return !ioctl(handle, NODE_PUTMESSAGE, &arg);
}
struct node_get_message {
void *node_handle;
- dsp_msg_t *message;
+ struct dsp_msg *message;
unsigned int timeout;
};
bool dsp_node_get_message(int handle,
- dsp_node_t *node,
- dsp_msg_t *message,
- unsigned int timeout)
+ struct dsp_node *node,
+ struct dsp_msg *message,
+ unsigned int timeout)
{
struct node_get_message arg = {
.node_handle = node->handle,
@@ -466,7 +458,7 @@
.timeout = timeout,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_GETMESSAGE, &arg));
+ return !ioctl(handle, NODE_GETMESSAGE, &arg);
}
struct node_delete {
@@ -474,13 +466,13 @@
};
static inline bool dsp_node_delete(int handle,
- dsp_node_t *node)
+ struct dsp_node *node)
{
struct node_delete arg = {
.node_handle = node->handle,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_DELETE, &arg));
+ return !ioctl(handle, NODE_DELETE, &arg);
}
#ifdef ALLOCATE_SM
@@ -491,9 +483,9 @@
};
bool dsp_node_get_attr(int handle,
- dsp_node_t *node,
- struct dsp_node_attr *attr,
- size_t attr_size)
+ struct dsp_node *node,
+ struct dsp_node_attr *attr,
+ size_t attr_size)
{
struct node_get_attr arg = {
.node_handle = node->handle,
@@ -501,7 +493,7 @@
.attr_size = attr_size,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_GETATTR, &arg));
+ return !ioctl(handle, NODE_GETATTR, &arg);
}
struct dsp_buffer_attr {
@@ -518,10 +510,10 @@
};
static inline bool dsp_node_alloc_buf(int handle,
- dsp_node_t *node,
- size_t size,
- struct dsp_buffer_attr *attr,
- void **buffer)
+ struct dsp_node *node,
+ size_t size,
+ struct dsp_buffer_attr *attr,
+ void **buffer)
{
struct node_alloc_buf arg = {
.node_handle = node->handle,
@@ -530,7 +522,7 @@
.buffer = buffer,
};
- if (!DSP_SUCCEEDED(ioctl(handle, NODE_ALLOCMSGBUF, &arg))) {
+ if (ioctl(handle, NODE_ALLOCMSGBUF, &arg)) {
*buffer = NULL;
return false;
}
@@ -567,8 +559,8 @@
};
static inline bool get_cmm_info(int handle,
- void *proc_handle,
- struct dsp_cmm_info *cmm_info)
+ void *proc_handle,
+ struct dsp_cmm_info *cmm_info)
{
struct cmm_object *cmm;
struct cmm_get_handle cmm_arg = {
@@ -579,19 +571,19 @@
.info = cmm_info,
};
- if (!DSP_SUCCEEDED(ioctl(handle, CMM_GETHANDLE, &cmm_arg)))
+ if (ioctl(handle, CMM_GETHANDLE, &cmm_arg))
return false;
cmm_info_arg.cmm = cmm;
- if (!DSP_SUCCEEDED(ioctl(handle, CMM_GETINFO, &cmm_info_arg)))
+ if (ioctl(handle, CMM_GETINFO, &cmm_info_arg))
return false;
return true;
}
static inline bool allocate_segments(int handle,
- void *proc_handle,
- dsp_node_t *node)
+ void *proc_handle,
+ struct dsp_node *node)
{
struct dsp_cmm_info cmm_info;
struct dsp_node_attr attr;
@@ -603,7 +595,7 @@
if (!dsp_node_get_attr(handle, node, &attr, sizeof(attr)))
return false;
- node_type = attr.info.props.uNodeType;
+ node_type = attr.info.props.ntype;
if ((node_type != DSP_NODE_DEVICE) && (cmm_info.segments > 0)) {
struct dsp_cmm_seg_info *seg;
@@ -615,8 +607,8 @@
struct dsp_buffer_attr buffer_attr;
base = mmap(NULL, seg->size,
- PROT_READ | PROT_WRITE, MAP_SHARED | 0x2000 /* MAP_LOCKED */,
- handle, seg->base_pa);
+ PROT_READ | PROT_WRITE, MAP_SHARED | 0x2000 /* MAP_LOCKED */,
+ handle, seg->base_pa);
if (!base)
return false;
@@ -643,14 +635,14 @@
#ifdef ALLOCATE_HEAP
struct get_uuid_props {
void *proc_handle;
- const dsp_uuid_t *node_uuid;
+ const struct dsp_uuid *node_uuid;
struct dsp_ndb_props *props;
};
static inline bool get_uuid_props(int handle,
- void *proc_handle,
- const dsp_uuid_t *node_uuid,
- struct dsp_ndb_props *props)
+ void *proc_handle,
+ const struct dsp_uuid *node_uuid,
+ struct dsp_ndb_props *props)
{
struct get_uuid_props arg = {
.proc_handle = proc_handle,
@@ -658,7 +650,7 @@
.props = props,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_GETUUIDPROPS, &arg));
+ return !ioctl(handle, NODE_GETUUIDPROPS, &arg);
}
#define PG_SIZE_4K 4096
@@ -669,20 +661,20 @@
struct node_allocate {
void *proc_handle;
- const dsp_uuid_t *node_id;
+ 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 dsp_uuid_t *node_uuid,
- const void *cb_data,
- struct dsp_node_attr_in *attrs,
- dsp_node_t **ret_node)
+ void *proc_handle,
+ const struct dsp_uuid *node_uuid,
+ const void *cb_data,
+ struct dsp_node_attr_in *attrs,
+ struct dsp_node **ret_node)
{
- dsp_node_t *node;
+ struct dsp_node *node;
void *node_handle = NULL;
struct node_allocate arg = {
.proc_handle = proc_handle,
@@ -701,10 +693,10 @@
return false;
}
- if (attrs->profile_id < props.uCountProfiles) {
+ if (attrs->profile_id < props.count_profiles) {
unsigned int heap_size = 0;
- heap_size = props.aProfiles[attrs->profile_id].ulHeapSize;
+ heap_size = props.node_profiles[attrs->profile_id].heap_size;
if (heap_size) {
void *virtual = NULL;
@@ -719,7 +711,7 @@
}
#endif
- if (!DSP_SUCCEEDED(ioctl(handle, NODE_ALLOCATE, &arg))) {
+ if (ioctl(handle, NODE_ALLOCATE, &arg)) {
if (attrs) {
free(attrs->gpp_va);
attrs->gpp_va = NULL;
@@ -756,12 +748,12 @@
};
bool dsp_node_connect(int handle,
- dsp_node_t *node,
- unsigned int stream,
- dsp_node_t *other_node,
- unsigned int other_stream,
- struct dsp_stream_attr *attrs,
- void *params)
+ 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,
@@ -772,11 +764,11 @@
.params = params,
};
- return DSP_SUCCEEDED(ioctl(handle, NODE_CONNECT, &arg));
+ return !ioctl(handle, NODE_CONNECT, &arg);
}
bool dsp_node_free(int handle,
- dsp_node_t *node)
+ struct dsp_node *node)
{
#ifdef ALLOCATE_SM
munmap(node->msgbuf_addr, node->msgbuf_size);
@@ -795,9 +787,9 @@
};
bool dsp_reserve(int handle,
- void *proc_handle,
- unsigned long size,
- void **addr)
+ void *proc_handle,
+ unsigned long size,
+ void **addr)
{
struct reserve_mem arg = {
.proc_handle = proc_handle,
@@ -805,7 +797,7 @@
.addr = addr,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_RSVMEM, &arg));
+ return !ioctl(handle, PROC_RSVMEM, &arg);
}
struct unreserve_mem {
@@ -815,15 +807,15 @@
};
bool dsp_unreserve(int handle,
- void *proc_handle,
- void *addr)
+ void *proc_handle,
+ void *addr)
{
struct unreserve_mem arg = {
.proc_handle = proc_handle,
.addr = addr,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_UNRSVMEM, &arg));
+ return !ioctl(handle, PROC_UNRSVMEM, &arg);
}
struct map_mem {
@@ -836,12 +828,12 @@
};
bool dsp_map(int handle,
- void *proc_handle,
- void *mpu_addr,
- unsigned long size,
- void *req_addr,
- void *ret_map_addr,
- unsigned long attr)
+ 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,
@@ -852,7 +844,7 @@
.attr = attr,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_MAPMEM, &arg));
+ return !ioctl(handle, PROC_MAPMEM, &arg);
}
struct unmap_mem {
@@ -862,15 +854,15 @@
};
bool dsp_unmap(int handle,
- void *proc_handle,
- void *map_addr)
+ void *proc_handle,
+ void *map_addr)
{
struct unmap_mem arg = {
.proc_handle = proc_handle,
.map_addr = map_addr,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_UNMAPMEM, &arg));
+ return !ioctl(handle, PROC_UNMAPMEM, &arg);
}
struct flush_mem {
@@ -881,10 +873,10 @@
};
bool dsp_flush(int handle,
- void *proc_handle,
- void *mpu_addr,
- unsigned long size,
- unsigned long flags)
+ void *proc_handle,
+ void *mpu_addr,
+ unsigned long size,
+ unsigned long flags)
{
struct flush_mem arg = {
.proc_handle = proc_handle,
@@ -893,7 +885,7 @@
.flags = flags,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_FLUSHMEMORY, &arg));
+ return !ioctl(handle, PROC_FLUSHMEMORY, &arg);
}
struct invalidate_mem {
@@ -903,9 +895,9 @@
};
bool dsp_invalidate(int handle,
- void *proc_handle,
- void *mpu_addr,
- unsigned long size)
+ void *proc_handle,
+ void *mpu_addr,
+ unsigned long size)
{
struct invalidate_mem arg = {
.proc_handle = proc_handle,
@@ -913,7 +905,7 @@
.size = size,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_INVALIDATEMEMORY, &arg));
+ return !ioctl(handle, PROC_INVALIDATEMEMORY, &arg);
}
struct proc_get_info {
@@ -924,10 +916,10 @@
};
bool dsp_proc_get_info(int handle,
- void *proc_handle,
- unsigned type,
- struct dsp_info *info,
- unsigned size)
+ void *proc_handle,
+ unsigned type,
+ struct dsp_info *info,
+ unsigned size)
{
struct proc_get_info arg = {
.proc_handle = proc_handle,
@@ -936,7 +928,7 @@
.size = size,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_ENUMRESOURCES, &arg));
+ return !ioctl(handle, PROC_ENUMRESOURCES, &arg);
}
struct enum_nodes {
@@ -948,11 +940,11 @@
};
bool dsp_enum_nodes(int handle,
- void *proc_handle,
- void **node_table,
- unsigned node_table_size,
- unsigned *num_nodes,
- unsigned *allocated)
+ void *proc_handle,
+ void **node_table,
+ unsigned node_table_size,
+ unsigned *num_nodes,
+ unsigned *allocated)
{
struct enum_nodes arg = {
.proc_handle = proc_handle,
@@ -962,7 +954,7 @@
.allocated = allocated,
};
- return DSP_SUCCEEDED(ioctl(handle, PROC_ENUMNODE, &arg));
+ return !ioctl(handle, PROC_ENUMNODE, &arg);
}
struct stream_attr {
@@ -982,11 +974,11 @@
};
bool dsp_stream_open(int handle,
- dsp_node_t *node,
- unsigned int direction,
- unsigned int index,
- struct dsp_stream_attr_in *attrin,
- void *stream)
+ 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,
@@ -1000,7 +992,7 @@
};
if (attrin && (attrin->mode == STRMMODE_ZEROCOPY ||
- attrin->mode == STRMMODE_RDMA)) {
+ attrin->mode == STRMMODE_RDMA)) {
struct dsp_cmm_info cmm_info;
if (!get_cmm_info(handle, NULL, &cmm_info))
@@ -1012,9 +1004,9 @@
seg = &cmm_info.info[0];
base = mmap(NULL, seg->size,
- PROT_READ | PROT_WRITE,
- MAP_SHARED | 0x2000 /* MAP_LOCKED */,
- handle, seg->base_pa);
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED | 0x2000 /* MAP_LOCKED */,
+ handle, seg->base_pa);
if (!base)
return false;
@@ -1024,7 +1016,7 @@
}
}
- return DSP_SUCCEEDED(ioctl(handle, STRM_OPEN, &stream_arg));
+ return !ioctl(handle, STRM_OPEN, &stream_arg);
}
struct stream_info {
@@ -1041,9 +1033,9 @@
};
static inline bool get_stream_info(int handle,
- void *stream,
- struct stream_info *info,
- unsigned int size)
+ void *stream,
+ struct stream_info *info,
+ unsigned int size)
{
struct stream_get_info arg = {
.stream = stream,
@@ -1051,11 +1043,11 @@
.size = size,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_GETINFO, &arg));
+ return !ioctl(handle, STRM_GETINFO, &arg);
}
bool dsp_stream_close(int handle,
- void *stream)
+ void *stream)
{
struct stream_info info;
if (!get_stream_info(handle, stream, &info, sizeof(struct stream_info)))
@@ -1075,7 +1067,7 @@
}
}
- return DSP_SUCCEEDED(ioctl(handle, STRM_CLOSE, &stream));
+ return !ioctl(handle, STRM_CLOSE, &stream);
}
struct stream_idle {
@@ -1084,14 +1076,14 @@
};
bool dsp_stream_idle(int handle,
- void *stream,
- bool flush)
+ void *stream,
+ bool flush)
{
struct stream_idle arg = {
.stream = stream,
.flush = flush,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_IDLE, &arg));
+ return !ioctl(handle, STRM_IDLE, &arg);
}
struct stream_reclaim {
@@ -1103,11 +1095,11 @@
};
bool dsp_stream_reclaim(int handle,
- void *stream,
- unsigned char **buff,
- unsigned long *data_size,
- unsigned long *buff_size,
- unsigned long *flag)
+ void *stream,
+ unsigned char **buff,
+ unsigned long *data_size,
+ unsigned long *buff_size,
+ unsigned long *flag)
{
struct stream_reclaim arg = {
.stream = stream,
@@ -1116,7 +1108,7 @@
.buff_size = buff_size,
.flag = flag,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_RECLAIM, &arg));
+ return !ioctl(handle, STRM_RECLAIM, &arg);
}
struct stream_issue {
@@ -1128,11 +1120,11 @@
};
bool dsp_stream_issue(int handle,
- void *stream,
- unsigned char *buff,
- unsigned long data_size,
- unsigned long buff_size,
- unsigned long flag)
+ void *stream,
+ unsigned char *buff,
+ unsigned long data_size,
+ unsigned long buff_size,
+ unsigned long flag)
{
struct stream_issue arg = {
.stream = stream,
@@ -1141,13 +1133,13 @@
.buff_size = buff_size,
.flag = flag,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_ISSUE, &arg));
+ return !ioctl(handle, STRM_ISSUE, &arg);
}
bool dsp_stream_get_info(int handle,
- void *stream,
- struct dsp_stream_info *info,
- unsigned int size)
+ void *stream,
+ struct dsp_stream_info *info,
+ unsigned int size)
{
struct stream_info stream_info = {
.info = info
@@ -1165,10 +1157,10 @@
};
bool dsp_stream_allocate_buffers(int handle,
- void *stream,
- unsigned int size,
- unsigned char **buff,
- unsigned int num_buf)
+ void *stream,
+ unsigned int size,
+ unsigned char **buff,
+ unsigned int num_buf)
{
unsigned int i;
struct stream_info info;
@@ -1183,7 +1175,7 @@
.num_buf = num_buf,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_ALLOCATEBUFFER, &arg));
+ return !ioctl(handle, STRM_ALLOCATEBUFFER, &arg);
}
for (i = 0; i < num_buf; i++)
@@ -1199,9 +1191,9 @@
};
bool dsp_stream_free_buffers(int handle,
- void *stream,
- unsigned char **buff,
- unsigned int num_buf)
+ void *stream,
+ unsigned char **buff,
+ unsigned int num_buf)
{
unsigned int i;
struct stream_info info;
@@ -1214,7 +1206,7 @@
.buff = buff,
.num_buf = num_buf,
};
- return DSP_SUCCEEDED(ioctl(handle, STRM_FREEBUFFER, &arg));
+ return !ioctl(handle, STRM_FREEBUFFER, &arg);
}
for (i = 0; i < num_buf; i++) {
--- dsp_bridge.h
+++ dsp_bridge.h
@@ -3,20 +3,9 @@
*
* Author: Felipe Contreras <felipe.contreras at gmail.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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
@@ -28,35 +17,35 @@
#define ALLOCATE_HEAP
-#define DSP_SUCCEEDED(x) ((int)(x) >= 0)
-#define DSP_FAILED(x) ((int)(x) < 0)
-
#define DSP_MMUFAULT 0x00000010
#define DSP_SYSERROR 0x00000020
#define DSP_NODEMESSAGEREADY 0x00000200
-typedef struct {
+#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];
-} dsp_uuid_t;
+};
-typedef struct {
+struct dsp_node {
void *handle;
void *heap;
void *msgbuf_addr;
size_t msgbuf_size;
-} dsp_node_t;
+};
/* note: cmd = 0x20000000 has special handling */
-typedef struct {
+struct dsp_msg {
uint32_t cmd;
uint32_t arg_1;
uint32_t arg_2;
-} dsp_msg_t;
+};
struct dsp_notification {
char *name;
@@ -89,40 +78,42 @@
};
#ifdef ALLOCATE_HEAP
-struct DSP_RESOURCEREQMTS {
- unsigned long cbStruct;
- unsigned int uStaticDataSize;
- unsigned int uGlobalDataSize;
- unsigned int uProgramMemSize;
- unsigned int uWCExecutionTime;
- unsigned int uWCPeriod;
- unsigned int uWCDeadline;
- unsigned int uAvgExectionTime;
- unsigned int uMinimumPeriod;
+/* 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 {
- unsigned int ulHeapSize;
+struct dsp_nodeprofs {
+ uint32_t heap_size;
};
+/* The dsp_ndb_props structure reports the attributes of a node */
struct dsp_ndb_props {
- unsigned long cbStruct;
- dsp_uuid_t uiNodeID;
- char acName[32];
- enum dsp_node_type uNodeType;
- unsigned int bCacheOnGPP;
- struct DSP_RESOURCEREQMTS dspResourceReqmts;
- int iPriority;
- unsigned int uStackSize;
- unsigned int uSysStackSize;
- unsigned int uStackSeg;
- unsigned int uMessageDepth;
- unsigned int uNumInputStreams;
- unsigned int uNumOutputStreams;
- unsigned int uTimeout;
- unsigned int uCountProfiles; /* Number of supported profiles */
- struct DSP_NODEPROFS aProfiles[16]; /* Array of profiles */
- unsigned int uStackSegName; /* Stack Segment Name */
+ 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
@@ -167,7 +158,7 @@
enum dsp_connect_type type;
unsigned int index;
void *node_handle;
- dsp_uuid_t node_id;
+ struct dsp_uuid node_id;
unsigned int stream_index;
};
@@ -256,133 +247,133 @@
void *proc_handle);
bool dsp_start(int handle,
- void *proc_handle);
+ void *proc_handle);
bool dsp_stop(int handle,
- void *proc_handle);
+ void *proc_handle);
bool dsp_load(int handle,
- void *proc_handle,
- int argc, char **argv,
- char **env);
+ void *proc_handle,
+ int argc, char **argv,
+ char **env);
bool dsp_node_allocate(int handle,
- void *proc_handle,
- const dsp_uuid_t *node_uuid,
- const void *cb_data,
- struct dsp_node_attr_in *attrs,
- dsp_node_t **ret_node);
+ 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,
- dsp_node_t *node);
+ struct dsp_node *node);
bool dsp_node_connect(int handle,
- dsp_node_t *node,
- unsigned int stream,
- dsp_node_t *other_node,
- unsigned int other_stream,
- struct dsp_stream_attr *attrs,
- void *params);
+ 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,
- dsp_node_t *node);
+ struct dsp_node *node);
bool dsp_node_run(int handle,
- dsp_node_t *node);
+ struct dsp_node *node);
bool dsp_node_terminate(int handle,
- dsp_node_t *node,
- unsigned long *status);
+ struct dsp_node *node,
+ unsigned long *status);
bool dsp_node_put_message(int handle,
- dsp_node_t *node,
- const dsp_msg_t *message,
- unsigned int timeout);
+ struct dsp_node *node,
+ const struct dsp_msg *message,
+ unsigned int timeout);
bool dsp_node_get_message(int handle,
- dsp_node_t *node,
- dsp_msg_t *message,
- unsigned int timeout);
+ struct dsp_node *node,
+ struct dsp_msg *message,
+ unsigned int timeout);
bool dsp_reserve(int handle,
- void *proc_handle,
- unsigned long size,
- void **addr);
+ void *proc_handle,
+ unsigned long size,
+ void **addr);
bool dsp_unreserve(int handle,
- void *proc_handle,
- void *addr);
+ 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);
+ 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);
+ void *proc_handle,
+ void *map_addr);
bool dsp_flush(int handle,
- void *proc_handle,
- void *mpu_addr,
- unsigned long size,
- unsigned long flags);
+ 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);
+ 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);
+ void *proc_handle,
+ unsigned int event_mask,
+ unsigned int notify_type,
+ struct dsp_notification *info);
bool dsp_node_register_notify(int handle,
- dsp_node_t *node,
- unsigned int event_mask,
- unsigned int notify_type,
- struct dsp_notification *info);
+ 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);
+ 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,
- unsigned int info_size,
- unsigned int *ret_num);
+ unsigned int num,
+ struct dsp_ndb_props *info,
+ size_t info_size,
+ unsigned int *ret_num);
bool dsp_register(int handle,
- const dsp_uuid_t *uuid,
- enum dsp_dcd_object_type type,
- const char *path);
+ const struct dsp_uuid *uuid,
+ enum dsp_dcd_object_type type,
+ const char *path);
bool dsp_unregister(int handle,
- dsp_uuid_t *uuid,
- enum dsp_dcd_object_type type);
+ 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);
+ void *proc_handle,
+ enum dsp_resource type,
+ struct dsp_info *info,
+ unsigned size);
static inline bool
dsp_send_message(int handle,
- dsp_node_t *node,
- uint32_t cmd,
- uint32_t arg_1,
- uint32_t arg_2)
+ struct dsp_node *node,
+ uint32_t cmd,
+ uint32_t arg_1,
+ uint32_t arg_2)
{
- dsp_msg_t msg;
+ struct dsp_msg msg;
msg.cmd = cmd;
msg.arg_1 = arg_1;
@@ -392,59 +383,59 @@
}
bool dsp_node_get_attr(int handle,
- dsp_node_t *node,
- struct dsp_node_attr *attr,
- size_t attr_size);
+ 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);
+ void *proc_handle,
+ void **node_table,
+ unsigned node_table_size,
+ unsigned *num_nodes,
+ unsigned *allocated);
bool dsp_stream_open(int handle,
- dsp_node_t *node,
- unsigned int direction,
- unsigned int index,
- struct dsp_stream_attr_in *attrin,
- void *stream);
+ 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);
+ void *stream);
bool dsp_stream_idle(int handle,
- void *stream,
- bool flush);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ void *stream,
+ unsigned char **buff,
+ unsigned int num_buf);
#endif /* DSP_BRIDGE_H */
--- dsp_exec.c
+++ dsp_exec.c
@@ -3,20 +3,9 @@
*
* Author: Víctor Manuel Jáquez Leal <vjaquez at igalia.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 <stdio.h>
@@ -26,9 +15,7 @@
#include "dsp_bridge.h"
#include "log.h"
-int
-main(int argc,
- const char **argv)
+int main(int argc, const char **argv)
{
int ret = 0;
int dsp_handle;
--- dsp_load.c
+++ dsp_load.c
@@ -5,20 +5,9 @@
* Felipe Contreras <felipe.contreras at nokia.com>
* Johann Prieur <johann.prieur at nokia.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 <stdio.h>
@@ -29,8 +18,7 @@
static unsigned delay = 500; /* in ms */
-static void
-display(void)
+static void display(void)
{
int dsp_handle;
void *proc_handle;
@@ -45,8 +33,8 @@
dsp_proc_get_info(dsp_handle, proc_handle, DSP_RESOURCE_PROCLOAD, &info, sizeof(info));
printf("load: %lu, freq: %lu\n",
- info.result.proc.pred_load,
- info.result.proc.pred_freq);
+ info.result.proc.pred_load,
+ info.result.proc.pred_freq);
usleep(delay * 1000);
} while (true);
@@ -56,9 +44,7 @@
dsp_close(dsp_handle);
}
-int
-main(int argc,
- char *argv[])
+int main(int argc, char *argv[])
{
display();
return 0;
--- dsp_probe.c
+++ dsp_probe.c
@@ -3,20 +3,9 @@
*
* Author: Felipe Contreras <felipe.contreras at nokia.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 <stdio.h>
@@ -65,15 +54,15 @@
}
struct node_info {
- dsp_uuid_t id;
+ struct dsp_uuid id;
enum dsp_node_type type;
char name[32];
enum dsp_node_state state;
};
-static inline bool uuidcmp(dsp_uuid_t *u1, dsp_uuid_t *u2)
+static inline bool uuidcmp(struct dsp_uuid *u1, struct dsp_uuid *u2)
{
- if (memcmp(u1, u2, sizeof(dsp_uuid_t)) == 0)
+ if (memcmp(u1, u2, sizeof(struct dsp_uuid)) == 0)
return true;
return false;
}
@@ -100,24 +89,24 @@
node_table = calloc(num, sizeof(*node_table));
for (i = 0; i < num; i++) {
if (dsp_enum(dsp_handle, i, &props, sizeof(props), &num)) {
- memcpy(&node_table[i].id, &props.uiNodeID, sizeof(props.uiNodeID));
- memcpy(&node_table[i].name, props.acName, sizeof(props.acName));
- node_table[i].type = props.uNodeType;
+ memcpy(&node_table[i].id, &props.node_id, sizeof(props.node_id));
+ memcpy(&node_table[i].name, props.ac_name, sizeof(props.ac_name));
+ node_table[i].type = props.ntype;
node_table[i].state = -1;
}
}
tmp_table = calloc(num, sizeof(*tmp_table));
if (dsp_enum_nodes(dsp_handle, proc_handle, tmp_table, num,
- &node_count, &allocated_count))
+ &node_count, &allocated_count))
{
for (i = 0; i < node_count; i++) {
struct dsp_node_attr attr;
- dsp_node_t node = { .handle = tmp_table[i] };
+ struct dsp_node node = { .handle = tmp_table[i] };
if (dsp_node_get_attr(dsp_handle, &node, &attr, sizeof(attr))) {
unsigned j;
for (j = 0; j < num; j++) {
- if (uuidcmp(&node_table[j].id, &attr.info.props.uiNodeID)) {
+ if (uuidcmp(&node_table[j].id, &attr.info.props.node_id)) {
node_table[j].state = attr.info.state;
break;
}
@@ -132,13 +121,13 @@
const char *state = node_status_to_str(node_table[i].state);
if (state)
printf("%s: %s (%s)\n",
- node_type_to_str(node_table[i].type),
- node_table[i].name,
- state);
+ node_type_to_str(node_table[i].type),
+ node_table[i].name,
+ state);
else
printf("%s: %s\n",
- node_type_to_str(node_table[i].type),
- node_table[i].name);
+ node_type_to_str(node_table[i].type),
+ node_table[i].name);
}
if (!dsp_detach(dsp_handle, proc_handle))
@@ -150,8 +139,7 @@
return true;
}
-int main(int argc,
- char *argv[])
+int main(int argc, char *argv[])
{
bool ok;
--- dsp_test.c
+++ dsp_test.c
@@ -5,20 +5,9 @@
*
* Author: Felipe Contreras <felipe.contreras at nokia.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 <stdlib.h>
@@ -51,11 +40,11 @@
done = true;
}
-static inline dsp_node_t *
+static inline struct dsp_node *
create_node(void)
{
- dsp_node_t *node;
- const dsp_uuid_t test_uuid = { 0x3dac26d0, 0x6d4b, 0x11dd, 0xad, 0x8b,
+ struct dsp_node *node;
+ const struct dsp_uuid test_uuid = { 0x3dac26d0, 0x6d4b, 0x11dd, 0xad, 0x8b,
{ 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } };
if (!dsp_register(dsp_handle, &test_uuid, DSP_DCD_LIBRARYTYPE, "/lib/dsp/test.dll64P"))
@@ -80,7 +69,7 @@
}
static inline bool
-destroy_node(dsp_node_t *node)
+destroy_node(struct dsp_node *node)
{
if (node) {
if (!dsp_node_free(dsp_handle, node)) {
@@ -96,10 +85,10 @@
static inline void
configure_dsp_node(void *node,
- dmm_buffer_t *input_buffer,
- dmm_buffer_t *output_buffer)
+ dmm_buffer_t *input_buffer,
+ dmm_buffer_t *output_buffer)
{
- dsp_msg_t msg;
+ struct dsp_msg msg;
msg.cmd = 0;
msg.arg_1 = (uint32_t) input_buffer->map;
@@ -109,33 +98,30 @@
dsp_node_put_message(dsp_handle, node, &msg, -1);
}
-static bool
-register_msgs(dsp_node_t *node)
+static bool register_msgs(struct dsp_node *node)
{
events[0] = calloc(1, sizeof(struct dsp_notification));
if (!dsp_node_register_notify(dsp_handle, node,
- DSP_NODEMESSAGEREADY, 1,
- events[0]))
+ DSP_NODEMESSAGEREADY, 1,
+ events[0]))
return false;
events[1] = calloc(1, sizeof(struct dsp_notification));
if (!dsp_register_notify(dsp_handle, proc,
- DSP_MMUFAULT, 1,
- events[1]))
+ DSP_MMUFAULT, 1,
+ events[1]))
return false;
events[2] = calloc(1, sizeof(struct dsp_notification));
if (!dsp_register_notify(dsp_handle, proc,
- DSP_SYSERROR, 1,
- events[2]))
+ DSP_SYSERROR, 1,
+ events[2]))
return false;
return true;
}
-static bool
-check_events(dsp_node_t *node,
- dsp_msg_t *msg)
+static bool check_events(struct dsp_node *node, struct dsp_msg *msg)
{
unsigned int index = 0;
pr_debug("waiting for events");
@@ -148,7 +134,7 @@
case 0:
dsp_node_get_message(dsp_handle, node, msg, 100);
pr_debug("got dsp message: 0x%0x 0x%0x 0x%0x",
- msg->cmd, msg->arg_1, msg->arg_2);
+ msg->cmd, msg->arg_1, msg->arg_2);
return true;
case 1:
pr_err("got DSP MMUFAULT");
@@ -162,24 +148,28 @@
}
}
-void run_dmm(dsp_node_t *node,
- unsigned long times)
+static void run_dmm(struct dsp_node *node, unsigned long times)
{
dmm_buffer_t *input_buffer;
dmm_buffer_t *output_buffer;
+ unsigned long total_times;
- input_buffer = dmm_buffer_new(dsp_handle, proc);
- output_buffer = dmm_buffer_new(dsp_handle, proc);
+ input_buffer = dmm_buffer_new(dsp_handle, proc, DMA_TO_DEVICE);
+ output_buffer = dmm_buffer_new(dsp_handle, proc, DMA_FROM_DEVICE);
dmm_buffer_allocate(input_buffer, input_buffer_size);
dmm_buffer_allocate(output_buffer, output_buffer_size);
+ dmm_buffer_map(output_buffer);
+ dmm_buffer_map(input_buffer);
+
configure_dsp_node(node, input_buffer, output_buffer);
+ total_times = times;
pr_info("running %lu times", times);
while (!done) {
- dsp_msg_t msg;
+ struct dsp_msg msg;
if (do_write) {
static unsigned char foo = 1;
@@ -189,8 +179,8 @@
foo++;
}
- dmm_buffer_clean(input_buffer, input_buffer->size);
- dmm_buffer_invalidate(output_buffer, output_buffer->size);
+ dmm_buffer_begin(input_buffer, input_buffer->size);
+ dmm_buffer_begin(output_buffer, output_buffer->size);
msg.cmd = 1;
msg.arg_1 = input_buffer->size;
dsp_node_put_message(dsp_handle, node, &msg, -1);
@@ -199,6 +189,9 @@
break;
}
+ dmm_buffer_end(input_buffer, input_buffer->size);
+ dmm_buffer_end(output_buffer, output_buffer->size);
+
if (--times == 0)
break;
}
@@ -208,13 +201,14 @@
dmm_buffer_free(output_buffer);
dmm_buffer_free(input_buffer);
+
+ printf("copied %lu times successfully\n", total_times);
}
-void run_ping(dsp_node_t *node,
- unsigned long times)
+static void run_ping(struct dsp_node *node, unsigned long times)
{
while (!done) {
- dsp_msg_t msg;
+ struct dsp_msg msg;
if (!dsp_send_message(dsp_handle, node, 2, 0, 0)) {
pr_err("dsp node put message failed");
@@ -227,16 +221,14 @@
}
printf("ping: id=%d, msg=%d, mem=%d\n",
- msg.cmd, msg.arg_1, msg.arg_2);
+ msg.cmd, msg.arg_1, msg.arg_2);
if (--times == 0)
break;
}
}
-static bool
-run_task(dsp_node_t *node,
- unsigned long times)
+static bool run_task(struct dsp_node *node, unsigned long times)
{
unsigned long exit_status;
@@ -264,9 +256,7 @@
return true;
}
-static void
-handle_options(int *argc,
- const char ***argv)
+static void handle_options(int *argc, const char ***argv)
{
while (*argc > 0) {
const char *cmd = (*argv)[0];
@@ -275,7 +265,7 @@
#ifdef DEBUG
if (!strcmp(cmd, "-d") || !strcmp(cmd, "--debug"))
- debug_level = 3;
+ debug_level = 4;
#endif
if (!strcmp(cmd, "-n") || !strcmp(cmd, "--ntimes")) {
@@ -312,18 +302,16 @@
}
}
-int
-main(int argc,
- const char **argv)
+int main(int argc, const char **argv)
{
- dsp_node_t *node;
+ struct dsp_node *node;
int ret = 0;
unsigned i;
signal(SIGINT, signal_handler);
#ifdef DEBUG
- debug_level = 2;
+ debug_level = 3;
#endif
ntimes = 1000;
--- get-version
+++ get-version
@@ -1,8 +1,12 @@
#!/bin/sh
-if test -f .version
-then
- cat .version
+if test -f .version; then
+ v=`cat .version`
else
- git describe --tags | sed 's/^v//'
+ v=`git describe --tags 2> /dev/null`
fi
+
+test -z "$v" && v="unknown"
+
+# remove initial 'v'
+echo "$v" | sed 's/^v//'
--- log.c
+++ log.c
@@ -4,22 +4,13 @@
*
* Author: Felipe Contreras <felipe.contreras at gmail.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 "log.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -31,7 +22,7 @@
#endif
#ifdef DEBUG
-unsigned debug_level = 1;
+unsigned debug_level = 2;
#endif
#ifdef SYSLOG
@@ -41,7 +32,8 @@
switch (level) {
case 0: return LOG_ERR;
case 1: return LOG_WARNING;
- case 2: return LOG_INFO;
+ case 2:
+ case 3: return LOG_INFO;
default: return LOG_DEBUG;
}
}
@@ -53,18 +45,19 @@
switch (level) {
case 0: return "error"; break;
case 1: return "warning"; break;
- case 2: return "info"; break;
- case 3: return "debug"; break;
+ case 2: return "test"; break;
+ case 3: return "info"; break;
+ case 4: return "debug"; break;
default: return NULL; break;
}
}
void pr_helper(unsigned int level,
- const char *file,
- const char *function,
- unsigned int line,
- const char *fmt,
- ...)
+ const char *file,
+ const char *function,
+ unsigned int line,
+ const char *fmt,
+ ...)
{
char *tmp;
va_list args;
@@ -76,25 +69,32 @@
va_start(args, fmt);
- vasprintf(&tmp, fmt, args);
+ if (vasprintf(&tmp, fmt, args) < 0)
+ goto leave;
if (level <= 1) {
#ifdef SYSLOG
syslog(log_level_to_syslog(level), "%s", tmp);
#endif
fprintf(stderr, "%s: %s: %s\n",
- log_level_to_string(level), function, tmp);
+ log_level_to_string(level), function, tmp);
}
-#ifdef DEBUG
else if (level == 2)
- fprintf(stderr, "%s: %s: %s\n",
- log_level_to_string(level), function, tmp);
+ fprintf(stderr, "%s: %s:%s(%u): %s\n",
+ log_level_to_string(level), file, function, line, tmp);
+#if defined(DEVEL) || defined(DEBUG)
else if (level == 3)
+ fprintf(stderr, "%s: %s: %s\n",
+ log_level_to_string(level), function, tmp);
+#endif
+#ifdef DEBUG
+ else if (level == 4)
fprintf(stderr, "%s: %s:%s(%u): %s\n",
- log_level_to_string(level), file, function, line, tmp);
+ log_level_to_string(level), file, function, line, tmp);
#endif
free(tmp);
+leave:
va_end(args);
}
--- log.h
+++ log.h
@@ -4,47 +4,37 @@
*
* Author: Felipe Contreras <felipe.contreras at gmail.com>
*
- * 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
- * version 2.1 of the License.
- *
- * 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
- *
+ * 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 int debug_level;
+extern unsigned debug_level;
#endif
void pr_helper(unsigned int level,
- const char *file,
- const char *function,
- unsigned int line,
- const char *fmt,
- ...);
+ 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(2, __VA_ARGS__)
-#define pr_debug(...) pr_base(3, __VA_ARGS__)
+#define pr_info(...) pr_base(3, __VA_ARGS__)
+#define pr_debug(...) pr_base(4, __VA_ARGS__)
#else
-#define pr_info(...) ({ if (0) pr_base(2, __VA_ARGS__); })
-#define pr_debug(...) ({ if (0) pr_base(3, __VA_ARGS__); })
+#define pr_info(...) ({ if (0) pr_base(3, __VA_ARGS__); })
+#define pr_debug(...) ({ if (0) pr_base(4, __VA_ARGS__); })
#endif
#endif /* LOG_H */
More information about the MeeGo-commits
mailing list