From 1b6d05f77a9e87ef1f03bf27a25075351f88ad01 Mon Sep 17 00:00:00 2001 From: Xiaopeng Yang Date: Thu, 20 Nov 2008 10:37:39 +0800 Subject: [PATCH] Initial Contribution --- Android.mk | 120 ++++++++++ MODULE_LICENSE_LGPL | 1 + NOTICE | 504 +++++++++++++++++++++++++++++++++++++++++ README | 31 +++ include/config.h | 165 ++++++++++++++ include/global.h | 9 + src/conf.c | 6 +- src/conf/alsa.conf | 2 +- src/conf/cards/aliases.conf | 54 +---- src/control/ctl_symbols_list.c | 1 + src/pcm/pcm_misc.c | 9 + src/pcm/pcm_mmap.c | 3 +- src/pcm/pcm_null.c | 2 - src/pcm/pcm_symbols_list.c | 9 + 14 files changed, 857 insertions(+), 59 deletions(-) create mode 100644 Android.mk create mode 100644 MODULE_LICENSE_LGPL create mode 100644 NOTICE create mode 100644 README create mode 100644 include/config.h create mode 100644 src/control/ctl_symbols_list.c create mode 100644 src/pcm/pcm_symbols_list.c diff --git a/Android.mk b/Android.mk new file mode 100644 index 00000000..9013fb5a --- /dev/null +++ b/Android.mk @@ -0,0 +1,120 @@ +# external/alsa-lib/Android.mk +# +# Copyright 2008 Wind River Systems +# + +ifeq ($(BOARD_USES_ALSA_AUDIO),true) + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +## +## Copy ALSA configuration files to rootfs +## +TARGET_ALSA_CONF_DIR := $(TARGET_OUT)/usr/share/alsa +LOCAL_ALSA_CONF_DIR := $(LOCAL_PATH)/src/conf + +copy_from := \ + alsa.conf \ + pcm/dsnoop.conf \ + pcm/modem.conf \ + pcm/dpl.conf \ + pcm/default.conf \ + pcm/surround51.conf \ + pcm/surround41.conf \ + pcm/surround50.conf \ + pcm/dmix.conf \ + pcm/center_lfe.conf \ + pcm/surround40.conf \ + pcm/side.conf \ + pcm/iec958.conf \ + pcm/rear.conf \ + pcm/surround71.conf \ + pcm/front.conf \ + cards/aliases.conf + +copy_to := $(addprefix $(TARGET_ALSA_CONF_DIR)/,$(copy_from)) +copy_from := $(addprefix $(LOCAL_ALSA_CONF_DIR)/,$(copy_from)) + +$(copy_to) : $(TARGET_ALSA_CONF_DIR)/% : $(LOCAL_ALSA_CONF_DIR)/% | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(copy_to) + +include $(CLEAR_VARS) + +LOCAL_MODULE := libasound + +LOCAL_ARM_MODE := arm + +LOCAL_C_INCLUDES += $(LOCAL_PATH)/include + +# libasound must be compiled with -fno-short-enums, as it makes extensive +# use of enums which are often type casted to unsigned ints. +LOCAL_CFLAGS := \ + -fno-short-enums -fPIC \ + -DALSA_CONFIG_DIR=\"/system/usr/share/alsa\" \ + -DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \ + -DALSA_DEVICE_DIRECTORY=\"/dev/snd/\" + +LOCAL_SRC_FILES := $(addprefix src/, \ + conf.c \ + confmisc.c \ + input.c \ + output.c \ + async.c \ + error.c \ + dlmisc.c \ + socket.c \ + shmarea.c \ + userfile.c \ + names.c \ + hwdep/hwdep.c \ + hwdep/hwdep_hw.c \ + hwdep/hwdep_symbols.c \ + mixer/bag.c \ + mixer/mixer.c \ + mixer/simple.c \ + mixer/simple_abst.c \ + mixer/simple_none.c \ + pcm/atomic.c \ + pcm/mask.c \ + pcm/interval.c \ + pcm/pcm.c \ + pcm/pcm_params.c \ + pcm/pcm_simple.c \ + pcm/pcm_hw.c \ + pcm/pcm_misc.c \ + pcm/pcm_mmap.c \ + pcm/pcm_symbols.c \ + pcm/pcm_generic.c \ + pcm/pcm_plugin.c \ + pcm/pcm_copy.c \ + pcm/pcm_linear.c \ + pcm/pcm_plug.c \ + pcm/pcm_null.c \ + pcm/pcm_empty.c \ + pcm/pcm_hooks.c \ + pcm/pcm_asym.c \ + pcm/pcm_extplug.c \ + pcm/pcm_ioplug.c \ + control/cards.c \ + control/tlv.c \ + control/namehint.c \ + control/hcontrol.c \ + control/control.c \ + control/control_hw.c \ + control/setup.c \ + control/control_symbols.c \ + control/control_ext.c \ + timer/timer.c \ + timer/timer_hw.c \ + timer/timer_query.c \ + timer/timer_query_hw.c \ + timer/timer_symbols.c \ + ) + +include $(BUILD_STATIC_LIBRARY) + +endif + diff --git a/MODULE_LICENSE_LGPL b/MODULE_LICENSE_LGPL new file mode 100644 index 00000000..8d1c8b69 --- /dev/null +++ b/MODULE_LICENSE_LGPL @@ -0,0 +1 @@ + diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..b1e3f5a2 --- /dev/null +++ b/NOTICE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. + + + Copyright (C) + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/README b/README new file mode 100644 index 00000000..99c522e6 --- /dev/null +++ b/README @@ -0,0 +1,31 @@ +This version of the ALSA library was obtained from the following location: +ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.16.tar.bz2 + +This package was configured with the following options: + +./configure \ + --disable-debug \ + --disable-resmgr \ + --enable-aload \ + --enable-mixer \ + --enable-pcm \ + --disable-rawmidi \ + --enable-hwdep \ + --disable-seq \ + --disable-alisp \ + --disable-old-symbols \ + --disable-python \ + --with-confdir=/system/usr/share/alsa \ + --with-plugindir=/system/usr/lib/alsa-lib \ + --with-versioned=no \ + --with-debug=no \ + --with-tmpdir=/tmp \ + --with-softfloat=yes \ + --with-libdl=yes \ + --with-pthread=yes \ + --with-librt=no \ + --with-alsa-devdir=/dev/snd \ + --with-aload-devdir=/dev \ + --with-pcm-plugins="plug null empty hooks asym extplug ioplug" \ + --with-ctl-plugins="ext" + diff --git a/include/config.h b/include/config.h new file mode 100644 index 00000000..52dfc119 --- /dev/null +++ b/include/config.h @@ -0,0 +1,165 @@ +/* include/config.h. Generated from config.h.in by configure. */ +/* include/config.h.in. Generated from configure.in by autoheader. */ + +/* Directory with aload* device files */ +#ifndef ALOAD_DEVICE_DIRECTORY +#define ALOAD_DEVICE_DIRECTORY "/dev/" +#endif + +/* directory containing ALSA configuration database */ +#ifndef ALSA_CONFIG_DIR +#define ALSA_CONFIG_DIR "/usr/share/alsa" +#endif + +/* Enable assert at error message handler */ +/* #undef ALSA_DEBUG_ASSERT */ + +/* Directory with ALSA device files */ +#ifndef ALSA_DEVICE_DIRECTORY +#define ALSA_DEVICE_DIRECTORY "/dev/snd/" +#endif + +/* directory containing ALSA add-on modules */ +#ifndef ALSA_PLUGIN_DIR +#define ALSA_PLUGIN_DIR "/usr/lib/alsa-lib" +#endif + +/* Build hwdep component */ +#define BUILD_HWDEP "1" + +/* Build mixer component */ +#define BUILD_MIXER "1" + +/* Build PCM component */ +#define BUILD_PCM "1" + +/* Build PCM adpcm plugin */ +/* #undef BUILD_PCM_PLUGIN_ADPCM */ + +/* Build PCM alaw plugin */ +/* #undef BUILD_PCM_PLUGIN_ALAW */ + +/* Build PCM lfloat plugin */ +/* #undef BUILD_PCM_PLUGIN_LFLOAT */ + +/* Build PCM mulaw plugin */ +/* #undef BUILD_PCM_PLUGIN_MULAW */ + +/* Build PCM rate plugin */ +/* #undef BUILD_PCM_PLUGIN_RATE */ + +/* Build PCM route plugin */ +/* #undef BUILD_PCM_PLUGIN_ROUTE */ + +/* Build raw MIDI component */ +/* #undef BUILD_RAWMIDI */ + +/* Build sequencer component */ +/* #undef BUILD_SEQ */ + +/* Have clock gettime */ +/* #undef HAVE_CLOCK_GETTIME */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Have libdl */ +#define HAVE_LIBDL 1 + +/* Have libpthread */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `resmgr' library (-lresmgr). */ +/* #undef HAVE_LIBRESMGR */ + +/* Have librt */ +/* #undef HAVE_LIBRT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Avoid calculation in float */ +#define HAVE_SOFT_FLOAT "1" + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WORDEXP_H */ + +/* No assert debug */ +#ifndef NDEBUG +#define NDEBUG +#endif + +/* Name of package */ +#define PACKAGE "alsa-lib" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Support /dev/aload* access for auto-loading */ +#define SUPPORT_ALOAD "1" + +/* Support resmgr with alsa-lib */ +/* #undef SUPPORT_RESMGR */ + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* directory to put tmp socket files */ +#define TMPDIR "/tmp" + +/* sound library version string */ +#define VERSION "1.0.16" + +/* compiled with versioned symbols */ +/* #undef VERSIONED_SYMBOLS */ + +/* Toolchain Symbol Prefix */ +#define __SYMBOL_PREFIX "" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif diff --git a/include/global.h b/include/global.h index 3e3680fb..9be996e9 100644 --- a/include/global.h +++ b/include/global.h @@ -133,6 +133,9 @@ int snd_shm_area_destroy(struct snd_shm_area *area); int snd_user_file(const char *file, char **result); +#if 0 +/* Bionic has struct timeval and struct timespec, but it does not define + _POSIX_C_SOURCE and _POSIX_SOURCE */ #if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) struct timeval { time_t tv_sec; /* seconds */ @@ -144,12 +147,18 @@ struct timespec { long tv_nsec; /* nanoseconds */ }; #endif +#endif /** Timestamp */ typedef struct timeval snd_timestamp_t; /** Hi-res timestamp */ typedef struct timespec snd_htimestamp_t; +/* The arm-eabi headers do not define O_ASYNC. */ +#ifndef O_ASYNC +#define O_ASYNC FASYNC +#endif + /** \} */ #ifdef __cplusplus diff --git a/src/conf.c b/src/conf.c index 32a76085..05ca7bbe 100644 --- a/src/conf.c +++ b/src/conf.c @@ -471,7 +471,7 @@ static int safe_strtoll(const char *str, long long *val) if (!*str) return -EINVAL; errno = 0; - if (sscanf(str, "%Li%n", &v, &endidx) < 1) + if (sscanf(str, "%lli%n", &v, &endidx) < 1) return -EINVAL; if (str[endidx]) return -EINVAL; @@ -1339,7 +1339,7 @@ static int _snd_config_save_leaf(snd_config_t *n, snd_output_t *out, snd_output_printf(out, "%ld", n->u.integer); break; case SND_CONFIG_TYPE_INTEGER64: - snd_output_printf(out, "%Ld", n->u.integer64); + snd_output_printf(out, "%lld", n->u.integer64); break; case SND_CONFIG_TYPE_REAL: snd_output_printf(out, "%-16g", n->u.real); @@ -2232,7 +2232,7 @@ int snd_config_get_ascii(const snd_config_t *config, char **ascii) { char res[32]; int err; - err = snprintf(res, sizeof(res), "%Li", config->u.integer64); + err = snprintf(res, sizeof(res), "%lli", config->u.integer64); if (err < 0 || err == sizeof(res)) { assert(0); return -ENOMEM; diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index 4bf8f07e..80136124 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -8,7 +8,7 @@ { func load files [ - "/etc/asound.conf" + "/system/etc/asound.conf" "~/.asoundrc" ] errors false diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf index c788621e..09cae707 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -2,56 +2,6 @@ # Define aliases for various drivers # -YMF724 cards.YMF744 -YMF724F cards.YMF744 -YMF740 cards.YMF744 -YMF740C cards.YMF744 -YMF754 cards.YMF744 -CMIPCI cards.CMI8338 -CMI8738 cards.CMI8338 -CMI8738-SWIEC cards.CMI8338-SWIEC -CMI8738-MC4 cards.CMI8738-MC6 -'E-mu APS' cards.EMU10K1 -'GUS MAX' cards.GUS -'GUS ACE' cards.GUS -'GUS Extreme' cards.GUS -'AMD InterWave' cards.GUS -'Dynasonic 3-D' cards.GUS -'InterWave STB' cards.GUS -au8810 cards.AU8810 -au8820 cards.AU8820 -au8830 cards.AU8830 -Prodigy71 cards.Aureon71 -Prodigy71LT cards.Aureon71 -Prodigy71HIFI cards.Aureon71 -Aureon71Univ cards.Aureon71 -VIA82XX-MODEM cards.ICH-MODEM -'MPU-401 UART' cards.MPU-401 -'VX222/Old' cards.VX222 -'VX222/v2' cards.VX222 -'VX222/Mic' cards.VX222 -'CMI8330/C3D' cards.CMI8330 -'SB AWE' cards.SBAWE -'SB Pro' cards.SBPro -'PMac Burgundy' cards.PMac -'PMac DACA' cards.PMac -'PMac Tumbler' cards.PMac -'PMac Snapper' cards.PMac -'PMac Screamer' cards.PMac -'PMac AWACS' cards.PMac -'PMac Toonie' cards.PMacToonie -AppleOnbdAudio cards.PMacToonie -'USB US-X2Y' cards.US-X2Y -'Serial MIDI' cards.SerialMIDI -'Prodif Plus' cards.ProdifPlus -ESM1 cards.ES1968 -ES1978 cards.ES1968 -Allegro cards.Maestro3 -Canyon3D-2 cards.Maestro3 -Azalia cards.HDA-Intel -aaci-pl041 cards.AACI -AV200 cards.CMI8788 - - - +# +# diff --git a/src/control/ctl_symbols_list.c b/src/control/ctl_symbols_list.c new file mode 100644 index 00000000..3283dd48 --- /dev/null +++ b/src/control/ctl_symbols_list.c @@ -0,0 +1 @@ +&_snd_module_control_ext, diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c index c075b24f..ef6c417d 100644 --- a/src/pcm/pcm_misc.c +++ b/src/pcm/pcm_misc.c @@ -26,6 +26,15 @@ #include #include "pcm_local.h" +/* Bionic does not provide bswap_64() */ +#ifndef bswap_64 +#undef __ASM_ARM_BYTEORDER_H +#include +#include + +#define bswap_64 __swab64 +#endif + /** * \brief Return sign info for a PCM sample linear format diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c index 4621fe6f..9771b6d1 100644 --- a/src/pcm/pcm_mmap.c +++ b/src/pcm/pcm_mmap.c @@ -24,11 +24,12 @@ #include #include #include +#include #include "pcm_local.h" size_t page_size(void) { - long s = sysconf(_SC_PAGE_SIZE); + int s = getpagesize(); assert(s > 0); return s; } diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index 0e84f8d4..60ee9b64 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -139,7 +139,6 @@ static int snd_pcm_null_start(snd_pcm_t *pcm) static int snd_pcm_null_drop(snd_pcm_t *pcm) { snd_pcm_null_t *null = pcm->private_data; - assert(null->state != SND_PCM_STATE_OPEN); null->state = SND_PCM_STATE_SETUP; return 0; } @@ -147,7 +146,6 @@ static int snd_pcm_null_drop(snd_pcm_t *pcm) static int snd_pcm_null_drain(snd_pcm_t *pcm) { snd_pcm_null_t *null = pcm->private_data; - assert(null->state != SND_PCM_STATE_OPEN); null->state = SND_PCM_STATE_SETUP; return 0; } diff --git a/src/pcm/pcm_symbols_list.c b/src/pcm/pcm_symbols_list.c new file mode 100644 index 00000000..12221fdd --- /dev/null +++ b/src/pcm/pcm_symbols_list.c @@ -0,0 +1,9 @@ +&_snd_module_pcm_copy, +&_snd_module_pcm_linear, +&_snd_module_pcm_plug, +&_snd_module_pcm_null, +&_snd_module_pcm_empty, +&_snd_module_pcm_hooks, +&_snd_module_pcm_asym, +&_snd_module_pcm_extplug, +&_snd_module_pcm_ioplug, -- 2.11.0