Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4200 - in trunk/src/target/opkg: libopkg src
([EMAIL PROTECTED])
2. r4201 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
3. r4202 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
4. r4203 - trunk/src/target/audio/fic-gta02
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-03-13 12:41:24 +0100 (Thu, 13 Mar 2008)
New Revision: 4200
Modified:
trunk/src/target/opkg/libopkg/Makefile.am
trunk/src/target/opkg/libopkg/args.c
trunk/src/target/opkg/libopkg/libopkg.c
trunk/src/target/opkg/libopkg/libopkg.h
trunk/src/target/opkg/libopkg/opkg_cmd.c
trunk/src/target/opkg/libopkg/opkg_cmd.h
trunk/src/target/opkg/libopkg/opkg_download.c
trunk/src/target/opkg/libopkg/opkg_message.c
trunk/src/target/opkg/libopkg/user.c
trunk/src/target/opkg/src/Makefile.am
Log:
opkg: remove redundant OPKG_LIB conditional code
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-03-13 11:41:24 UTC (rev
4200)
@@ -59,7 +59,7 @@
$(opkg_cmd_sources) $(opkg_db_sources) \
$(opkg_util_sources) $(opkg_list_sources)
-libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
+libopkg_la_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
lib_LTLIBRARIES = libopkg.la
Modified: trunk/src/target/opkg/libopkg/args.c
===================================================================
--- trunk/src/target/opkg/libopkg/args.c 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/args.c 2008-03-13 11:41:24 UTC (rev
4200)
@@ -253,13 +253,8 @@
fprintf(stderr, "\tlist_installed List all and only the installed
packages and description \n");
fprintf(stderr, "\tfiles <pkg> List all files belonging to
<pkg>\n");
fprintf(stderr, "\tsearch <file|regexp> Search for a package
providing <file>\n");
-#ifndef OPKG_LIB
- fprintf(stderr, "\tinfo [pkg|regexp [<field>]] Display all/some info
fields for <pkg> or all\n");
- fprintf(stderr, "\tstatus [pkg|regexp [<field>]] Display all/some status
fields for <pkg> or all\n");
-#else
fprintf(stderr, "\tinfo [pkg|regexp] Display all info for
<pkg>\n");
fprintf(stderr, "\tstatus [pkg|regexp] Display all status for
<pkg>\n");
-#endif
fprintf(stderr, "\tdownload <pkg> Download <pkg> to current
directory.\n");
fprintf(stderr, "\tcompare_versions <v1> <op> <v2>\n");
fprintf(stderr, "\t compare versions using <= <
> >= = << >>\n");
Modified: trunk/src/target/opkg/libopkg/libopkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/libopkg.c 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/libopkg.c 2008-03-13 11:41:24 UTC (rev
4200)
@@ -15,8 +15,6 @@
General Public License for more details.
*/
-#ifdef OPKG_LIB
-
#include "opkg.h"
#include "includes.h"
#include "libopkg.h"
@@ -394,12 +392,9 @@
if (conf && (conf->verbosity < level)) {
return 0;
} else {
-#ifdef OPKG_LIB
if ( level == OPKG_ERROR ){
push_error_list(&error_list, msg);
-// printf(msg);
} else
-#endif
printf(msg);
}
return 0;
@@ -523,5 +518,3 @@
return err;
}
-
-#endif /* OPKG_LIB */
Modified: trunk/src/target/opkg/libopkg/libopkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/libopkg.h 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/libopkg.h 2008-03-13 11:41:24 UTC (rev
4200)
@@ -21,8 +21,6 @@
#endif
-#ifdef OPKG_LIB
-
#include "opkg_conf.h"
#include "opkg_message.h"
#include "opkg_state.h"
@@ -90,6 +88,3 @@
extern void free_error_list();
#endif
-
-
-#endif
Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-03-13 11:41:24 UTC (rev
4200)
@@ -49,10 +49,8 @@
#include "opkg_configure.h"
#include "opkg_message.h"
-#ifdef OPKG_LIB
#include "libopkg.h"
static void *p_userdata = NULL;
-#endif
static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv);
static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv);
@@ -145,7 +143,6 @@
return NULL;
}
-#ifdef OPKG_LIB
int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char
**argv, void *userdata)
{
int result;
@@ -175,12 +172,6 @@
p_userdata = NULL;
return result;
}
-#else
-int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char
**argv)
-{
- return (cmd->fun)(conf, argc, argv);
-}
-#endif
static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
{
@@ -673,9 +664,6 @@
if (newline) {
*newline = '\0';
}
-#ifndef OPKG_LIB
- printf("%s - %s\n", pkg->name, desc_short);
-#else
if (opkg_cb_list) {
version_str = pkg_version_str_alloc(pkg);
opkg_cb_list(pkg->name,desc_short,
@@ -684,7 +672,6 @@
p_userdata);
free(version_str);
}
-#endif
}
pkg_vec_free(available);
@@ -722,9 +709,6 @@
if (newline) {
*newline = '\0';
}
-#ifndef OPKG_LIB
- printf("%s - %s\n", pkg->name, desc_short);
-#else
if (opkg_cb_list) {
version_str = pkg_version_str_alloc(pkg);
opkg_cb_list(pkg->name,desc_short,
@@ -733,7 +717,6 @@
p_userdata);
free(version_str);
}
-#endif
}
return 0;
@@ -767,14 +750,6 @@
if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
continue;
}
-#ifndef OPKG_LIB
- if (n_fields) {
- for (j = 0; j < n_fields; j++)
- pkg_print_field(pkg, stdout, pkg_fields[j]);
- } else {
- pkg_print_info(pkg, stdout);
- }
-#else
buff = pkg_formatted_info(pkg);
if ( buff ) {
@@ -788,7 +763,6 @@
*/
free(buff);
}
-#endif
if (conf->verbosity > 1) {
conffile_list_elt_t *iter;
for (iter = pkg->conffiles.head; iter; iter = iter->next) {
@@ -799,10 +773,6 @@
}
}
}
-#ifndef OPKG_LIB
- if (buff)
- free(buff);
-#endif
pkg_vec_free(available);
return 0;
@@ -1077,13 +1047,6 @@
installed_files = pkg_get_installed_files(pkg);
pkg_version = pkg_version_str_alloc(pkg);
-#ifndef OPKG_LIB
- printf("Package %s (%s) is installed on %s and has the following
files:\n",
- pkg->name, pkg_version, pkg->dest->name);
- for (iter = installed_files->head; iter; iter = iter->next) {
- puts(iter->data);
- }
-#else
if (buff) {
try_again:
used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on
%s and has the following files:\n",
@@ -1109,7 +1072,6 @@
p_userdata);
free(buff);
}
-#endif
free(pkg_version);
pkg_free_installed_files(pkg);
@@ -1403,14 +1365,10 @@
for (iter = installed_files->head; iter; iter = iter->next) {
installed_file = iter->data;
if (fnmatch(argv[0], installed_file, 0)==0) {
-#ifndef OPKG_LIB
- printf("%s: %s\n", pkg->name, installed_file);
-#else
if (opkg_cb_list) opkg_cb_list(pkg->name,
installed_file,
pkg_version_str_alloc(pkg),
pkg->state_status,
p_userdata);
-#endif
}
}
Modified: trunk/src/target/opkg/libopkg/opkg_cmd.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.h 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.h 2008-03-13 11:41:24 UTC (rev
4200)
@@ -29,12 +29,8 @@
typedef struct opkg_cmd opkg_cmd_t;
opkg_cmd_t *opkg_cmd_find(const char *name);
-#ifdef OPKG_LIB
int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc,
const char **argv, void *userdata);
-#else
-int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char
**argv);
-#endif
int opkg_multiple_files_scan (opkg_conf_t *conf, int argc, char *argv[]);
/* install any packges with state_want == SW_INSTALL */
int opkg_install_wanted_packages(opkg_conf_t *conf);
Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-13 03:42:12 UTC
(rev 4199)
+++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-03-13 11:41:24 UTC
(rev 4200)
@@ -32,10 +32,8 @@
#include "file_util.h"
#include "str_util.h"
-#ifdef OPKG_LIB
#include "libopkg.h"
opkg_download_progress_callback opkg_cb_download_progress = NULL;
-#endif
int
curl_progress_func (char* url,
@@ -47,7 +45,6 @@
int i;
int p = (t) ? d*100/t : 0;
-#ifdef OPKG_LIB
if (opkg_cb_download_progress)
{
static int prev = -1;
@@ -61,7 +58,6 @@
opkg_cb_download_progress (p, url);
return 0;
}
-#endif
/* skip progress bar if we haven't done started yet
* this prevents drawing the progress bar if we receive an error such as
Modified: trunk/src/target/opkg/libopkg/opkg_message.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_message.c 2008-03-13 03:42:12 UTC
(rev 4199)
+++ trunk/src/target/opkg/libopkg/opkg_message.c 2008-03-13 11:41:24 UTC
(rev 4200)
@@ -18,28 +18,6 @@
#include "opkg_conf.h"
#include "opkg_message.h"
-#ifndef OPKG_LIB
-
-void
-opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
-{
- va_list ap;
-
- if (conf && (conf->verbosity < level))
- {
- return;
- }
- else
- {
-
- va_start (ap, fmt);
- vprintf (fmt, ap);
- va_end (ap);
- }
-}
-
-#else
-
#include "libopkg.h"
//#define opkg_message(conf, level, fmt, arg...) opkg_cb_message(conf, level,
fmt, ## arg)
@@ -58,4 +36,3 @@
opkg_cb_message(conf,level,ts);
}
}
-#endif
Modified: trunk/src/target/opkg/libopkg/user.c
===================================================================
--- trunk/src/target/opkg/libopkg/user.c 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/libopkg/user.c 2008-03-13 11:41:24 UTC (rev
4200)
@@ -20,15 +20,12 @@
#include <stdarg.h>
#include "file_util.h"
#include "str_util.h"
-#ifdef OPKG_LIB
#include "libopkg.h"
-#endif
-#ifdef OPKG_LIB
static char *question = NULL;
static int question_len = 255;
-#endif
+
char *get_user_response(const char *format, ...)
{
int len = question_len;
@@ -36,13 +33,7 @@
char *response;
va_start(ap, format);
-#ifndef OPKG_LIB
- vprintf(format, ap);
do {
- response = file_read_line_alloc(stdin);
- } while (response == NULL);
-#else
- do {
if (question == NULL || len > question_len) {
question = realloc(question, len + 1);
question_len = len;
@@ -50,7 +41,6 @@
len = vsnprintf(question,question_len,format,ap);
} while (len > question_len);
response = strdup(opkg_cb_response(question));
-#endif
str_chomp(response);
str_tolower(response);
Modified: trunk/src/target/opkg/src/Makefile.am
===================================================================
--- trunk/src/target/opkg/src/Makefile.am 2008-03-13 03:42:12 UTC (rev
4199)
+++ trunk/src/target/opkg/src/Makefile.am 2008-03-13 11:41:24 UTC (rev
4200)
@@ -3,7 +3,7 @@
#lib_LTLIBRARIES = libopkg.la
opkg_cl_SOURCES = opkg-frontend.c
-opkg_cl_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)
+opkg_cl_CFLAGS = $(ALL_CFLAGS)
opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
$(top_builddir)/libbb/libbb.la
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-13 12:42:36 +0100 (Thu, 13 Mar 2008)
New Revision: 4201
Modified:
trunk/src/target/opkg/libopkg/opkg_install.c
Log:
opkg: remove unused CONFIG_OPKG_PROCESS_ACTIONS conditional code
Modified: trunk/src/target/opkg/libopkg/opkg_install.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_install.c 2008-03-13 11:41:24 UTC
(rev 4200)
+++ trunk/src/target/opkg/libopkg/opkg_install.c 2008-03-13 11:42:36 UTC
(rev 4201)
@@ -1702,251 +1702,3 @@
return 0;
}
-
-
-#ifdef CONFIG_OPKG_PROCESS_ACTIONS
-
-int opkg_remove_packages(opkg_conf_t *conf, pkg_vec_t *pkgs_to_remove)
-{
- /* first, remove the packages that need removing */
- for (i = 0 ; i < pkgs_to_remove->len; i++ ) {
- pkg_t *pkg = pkgs_to_remove->pkgs[i];
- err = opkg_remove_pkg(conf, pkg,0);
- if (err) return err;
- }
- return 0;
-}
-
-int opkg_process_actions_sanity_check(opkg_conf_t *conf, pkg_vec_t
*pkgs_to_remove, pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
- if (pkg->dest == NULL)
- pkg->dest = conf->default_dest;
-
- pkg->state_want = SW_INSTALL;
-
- /* Abhaya: conflicts check */
- err = check_conflicts_for(conf, pkg);
- if (err) { return err; }
- }
- return 0;
-}
-
-int opkg_process_actions_unpack_packages(opkg_conf_t *conf, pkg_vec_t
*pkgs_to_remove, pkg_vec_t *pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
-
- /* XXX: FEATURE: Need to really support Provides/Replaces: here at
some point */
- pkg_vec_t *replacees = pkg_vec_alloc();
- pkg_get_installed_replacees(conf, pkg, replacees);
-
- /* XXX: BUG: we really should treat replacement more like an upgrade
- * Instead, we're going to remove the replacees
- */
- err = pkg_remove_installed_replacees(conf, replacees);
- if (err) return err;
- pkg->state_flag |= SF_REMOVED_REPLACEES;
- }
- return 0;
-}
-
-int opkg_process_actions_unpack_packages(opkg_conf_t *conf, pkg_vec_t
*pkgs_to_remove, pkg_vec_t *pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
- if (pkg->local_filename == NULL) {
- err = opkg_download_pkg(conf, pkg, conf->tmp_dir);
- if (err) {
- opkg_message(conf, OPKG_ERROR,
- "Failed to download %s. Perhaps you need to
run 'opkg update'?\n",
- pkg->name);
- return err;
- }
- }
- if (pkg->tmp_unpack_dir == NULL) {
- err = unpack_pkg_control_files(conf, pkg);
- if (err) return err;
- }
- }
- return 0;
-}
-
-int opkg_process_actions_prerm(opkg_conf_t *conf, pkg_vec_t *pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
- pkg_t *old_pkg = pkg->old_pkg;
-
- err = prerm_upgrade_old_pkg(conf, pkg, old_pkg);
- if (err) return err;
-
- err = prerm_deconfigure_conflictors(conf, pkg, replacees);
- if (err) return err;
-
- err = preinst_configure(conf, pkg, old_pkg);
- if (err) return err;
-
- err = backup_modified_conffiles(conf, pkg, old_pkg);
- if (err) return err;
-
- err = postrm_upgrade_old_pkg(conf, pkg, old_pkg);
- if (err) return err;
- }
- return 0;
-}
-
-int opkg_process_actions_install(opkg_conf_t *conf, pkg_vec_t *pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
- pkg_t *old_pkg = pkg->old_pkg;
-
- if (old_pkg) {
- old_pkg->state_want = SW_DEINSTALL;
-
- if (old_pkg->state_flag & SF_NOPRUNE) {
- opkg_message(conf, OPKG_INFO,
- " not removing obsolesced files because
package marked noprune\n");
- } else {
- opkg_message(conf, OPKG_INFO,
- " removing obsolesced files\n");
- remove_obsolesced_files(conf, pkg, old_pkg);
- }
- }
-
- opkg_message(conf, OPKG_INFO,
- " installing maintainer scripts\n");
- install_maintainer_scripts(conf, pkg, old_pkg);
-
- /* the following just returns 0 */
- remove_disappeared(conf, pkg);
-
- opkg_message(conf, OPKG_INFO,
- " installing data files\n");
- install_data_files(conf, pkg);
-
- opkg_message(conf, OPKG_INFO,
- " resolving conf files\n");
- resolve_conffiles(conf, pkg);
-
- pkg->state_status = SS_UNPACKED;
-
- if (old_pkg) {
- old_pkg->state_status = SS_NOT_INSTALLED;
- }
-
- time(&pkg->installed_time);
-
- opkg_message(conf, OPKG_INFO,
- " cleanup temp files\n");
- cleanup_temporary_files(conf, pkg);
-
- if (pkg->parent)
- pkg->parent->state_status = pkg->state_status;
- }
- return 0;
-}
-
-int opkg_process_actions_unwind_prerm(opkg_conf_t *conf, pkg_vec_t
*pkgs_to_install)
-{
- int i;
- /* now one more pass checking on the ones that need to be installed */
- for (i = 0 ; i < pkgs_to_install->len; i++ ) {
- pkg_t *pkg = pkgs_to_install->pkgs[i];
- pkg_t *old_pkg = pkg->old_pkg;
-
- if (old_pkg) {
- if (old_pkg->state_flags & SF_POSTRM_UPGRADE)
- postrm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
- if (old_pkg->state_flags & SF_CHECK_DATA_FILE_CLASHES)
- check_data_file_clashes_unwind(conf, pkg, old_pkg);
- if (old_pkg->state_flags & SF_BACKUP_MODIFIED_CONFFILES)
- backup_modified_conffiles_unwind(conf, pkg, old_pkg);
- if (old_pkg->state_flags & SF_PREINST_CONFIGURE)
- preinst_configure_unwind(conf, pkg, old_pkg);
- if (old_pkg->state_flags & SF_DECONFIGURE_CONFLICTORS)
- prerm_deconfigure_conflictors_unwind(conf, pkg, replacees);
- if (old_pkg->state_flags & SF_PRERM_UPGRADE)
- prerm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
-
- if (old_pkg->state_flags & SF_REMOVED_REPLACEES)
- remove_installed_replacees_unwind(conf, pkg, old_pkg);
-
- }
- }
- return 0;
-}
-
-/*
- * Perform all the actions.
- *
- * pkgs_to_remove are packages marked for removal.
- * pkgs_superseded are the old packages being replaced by upgrades.
- *
- * Assumes pkgs_to_install includes all dependences, recursively, sorted in
installable order.
- */
-int opkg_process_actions(opkg_conf_t *conf, pkg_vec_t *pkgs_to_remove,
pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install)
-{
- int err;
- int i;
-
- err = opkg_remove_packages(conf, pkgs_to_remove);
- if (err) return err;
-
- err = opkg_process_actions_sanity_check(conf, pkgs_superseded,
pkgs_to_install);
- if (err) return err;
-
- err = opkg_process_actions_remove_replacees(conf, pkgs_to_install);
- if (err) goto UNWIND;
-
- /* @@@@ look at opkg_install_pkg for handling replacements */
- err = opkg_process_actions_unpack_packages(conf, pkgs_to_install);
- if (err) goto UNWIND;
-
- /*
- * Now that we have the packages unpacked, we can look for data
- * file clashes. First, we mark the files from the superseded
- * packages as obsolete. Then we scan the files in
- * pkgs_to_install, and only complain about clashes with
- * non-obsolete files.
- */
-
- err = opkg_process_actions_check_data_file_clashes(conf, pkgs_superseded,
pkgs_to_install);
- if (err) goto UNWIND;
-
- /* this was before checking data file clashes */
- err = opkg_process_actions_prerm(conf, pkgs_superseded, pkgs_to_install);
- if (err) goto UNWIND;
-
- /* point of no return: no unwinding after this */
- err = opkg_process_actions_install(conf, pkgs_to_install);
- if (err) return err;
-
- opkg_message(conf, OPKG_INFO, "Done.\n");
- return 0;
-
- UNWIND:
- opkg_process_actions_unwind(conf, pkgs_to_install);
-
- opkg_message(conf, OPKG_INFO,
- " cleanup temp files\n");
- cleanup_temporary_files(conf, pkg);
-
- opkg_message(conf, OPKG_INFO,
- "Failed.\n");
- return err;
-}
-
-#endif
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-03-13 12:45:34 +0100 (Thu, 13 Mar 2008)
New Revision: 4202
Modified:
trunk/src/target/opkg/libopkg/opkg_cmd.c
Log:
opkg: Remove unused CONFIG_CLEAR_SW_INSTALL_FLAG conditional code
Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-03-13 11:42:36 UTC (rev
4201)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-03-13 11:45:34 UTC (rev
4202)
@@ -292,33 +292,6 @@
free (tmp);
free(lists_dir);
-#ifdef CONFIG_CLEAR_SW_INSTALL_FLAG
-#warning here
- /* clear SW_INSTALL on any package where state is SS_NOT_INSTALLED.
- * this is a hack to work around poor bookkeeping in old opkg upgrade
code
- * -Jamey 3/1/03
- */
- {
- int i;
- int changed = 0;
- pkg_vec_t *available = pkg_vec_alloc();
- pkg_hash_fetch_available(&conf->pkg_hash, available);
- opkg_message(conf, OPKG_DEBUG, "Clearing SW_INSTALL for
SS_NOT_INSTALLED packages.\n");
- for (i = 0; i < available->len; i++) {
- pkg_t *pkg = available->pkgs[i];
- if (pkg->state_want == SW_INSTALL && pkg->state_status ==
SS_NOT_INSTALLED) {
- opkg_message(conf, OPKG_DEBUG, "Clearing SW_INSTALL on
package %s.\n", pkg->name);
- pkg->state_want = SW_UNKNOWN;
- changed = 1;
- }
- }
- pkg_vec_free(available);
- if (changed) {
- write_status_files_if_changed(conf);
- }
- }
-#endif
-
return failures;
}
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-03-13 15:44:42 +0100 (Thu, 13 Mar 2008)
New Revision: 4203
Added:
trunk/src/target/audio/fic-gta02/gsmheadset.state
Modified:
trunk/src/target/audio/fic-gta02/gsmhandset.state
Log:
add gsmheadset audio state and fine tune gsmhandset, with them, will have
better sound quality. Tested by instrument and field test
Modified: trunk/src/target/audio/fic-gta02/gsmhandset.state
===================================================================
--- trunk/src/target/audio/fic-gta02/gsmhandset.state 2008-03-13 11:45:34 UTC
(rev 4202)
+++ trunk/src/target/audio/fic-gta02/gsmhandset.state 2008-03-13 14:44:42 UTC
(rev 4203)
@@ -6,8 +6,8 @@
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 235
- value.1 235
+ value.0 0
+ value.1 0
}
control.2 {
comment.access 'read write'
@@ -16,8 +16,8 @@
comment.range '0 - 255'
iface MIXER
name 'ADC Capture Volume'
- value.0 195
- value.1 195
+ value.0 0
+ value.1 0
}
control.3 {
comment.access 'read write'
@@ -36,8 +36,8 @@
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 112
- value.1 112
+ value.0 97
+ value.1 97
}
control.5 {
comment.access 'read write'
@@ -46,7 +46,7 @@
comment.range '0 - 127'
iface MIXER
name 'Mono Playback Volume'
- value 121
+ value 103
}
control.6 {
comment.access 'read write'
@@ -55,8 +55,8 @@
comment.range '0 - 7'
iface MIXER
name 'Bypass Playback Volume'
- value.0 2
- value.1 2
+ value.0 7
+ value.1 7
}
control.7 {
comment.access 'read write'
@@ -65,8 +65,8 @@
comment.range '0 - 7'
iface MIXER
name 'Sidetone Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.8 {
comment.access 'read write'
@@ -75,8 +75,8 @@
comment.range '0 - 7'
iface MIXER
name 'Voice Playback Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.9 {
comment.access 'read write'
@@ -103,7 +103,7 @@
comment.range '0 - 7'
iface MIXER
name 'Mono Bypass Playback Volume'
- value 2
+ value 0
}
control.12 {
comment.access 'read write'
@@ -112,7 +112,7 @@
comment.range '0 - 7'
iface MIXER
name 'Mono Sidetone Playback Volume'
- value 2
+ value 5
}
control.13 {
comment.access 'read write'
@@ -121,7 +121,7 @@
comment.range '0 - 7'
iface MIXER
name 'Mono Voice Playback Volume'
- value 2
+ value 0
}
control.14 {
comment.access 'read write'
@@ -190,8 +190,8 @@
comment.range '0 - 7'
iface MIXER
name 'Sidetone Capture Volume'
- value.0 2
- value.1 2
+ value.0 0
+ value.1 0
}
control.21 {
comment.access 'read write'
@@ -209,8 +209,8 @@
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 0
+ value.1 0
}
control.23 {
comment.access 'read write'
@@ -267,7 +267,7 @@
comment.range '0 - 7'
iface MIXER
name 'ALC Capture Target Volume'
- value 3
+ value 0
}
control.29 {
comment.access 'read write'
@@ -276,7 +276,7 @@
comment.range '0 - 7'
iface MIXER
name 'ALC Capture Max Volume'
- value 7
+ value 0
}
control.30 {
comment.access 'read write'
@@ -288,7 +288,7 @@
comment.item.3 Stereo
iface MIXER
name 'ALC Capture Function'
- value Left
+ value Off
}
control.31 {
comment.access 'read write'
@@ -305,7 +305,7 @@
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 15
+ value 0
}
control.33 {
comment.access 'read write'
@@ -314,7 +314,7 @@
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Decay Time'
- value 12
+ value 0
}
control.34 {
comment.access 'read write'
@@ -323,7 +323,7 @@
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Attack Time'
- value 2
+ value 0
}
control.35 {
comment.access 'read write'
@@ -342,7 +342,7 @@
comment.item.1 'Mute ADC Output'
iface MIXER
name 'ALC Capture NG Type'
- value 'Constant PGA Gain'
+ value 'Mute ADC Output'
}
control.37 {
comment.access 'read write'
@@ -608,7 +608,7 @@
comment.item.3 'Right PGA'
iface MIXER
name 'Mic Sidetone Mux'
- value 'Left PGA'
+ value 'Mic 2'
}
control.64 {
comment.access 'read write'
@@ -840,7 +840,7 @@
comment.count 1
iface MIXER
name 'DAPM GSM Line In Switch'
- value false
+ value true
}
control.90 {
comment.access 'read write'
@@ -848,7 +848,7 @@
comment.count 1
iface MIXER
name 'DAPM Headset Mic Switch'
- value false
+ value true
}
control.91 {
comment.access 'read write'
Added: trunk/src/target/audio/fic-gta02/gsmheadset.state
===================================================================
--- trunk/src/target/audio/fic-gta02/gsmheadset.state 2008-03-13 11:45:34 UTC
(rev 4202)
+++ trunk/src/target/audio/fic-gta02/gsmheadset.state 2008-03-13 14:44:42 UTC
(rev 4203)
@@ -0,0 +1,885 @@
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 0
+ value.1 0
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 0
+ value.1 0
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 96
+ value.1 96
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 103
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 7
+ value.1 7
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 0
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 5
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 0
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 0
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 0
+ value.1 0
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 0
+ value.1 0
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 true
+ value.1 true
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value HiFi
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value false
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 0
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 0
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Off
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 0
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 0
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 0
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Mute ADC Output'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value Stereo
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'ROUT2 Phase'
+ value Inverted
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 + 2'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Line Mix'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Rx Mix'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Rx Mix'
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value true
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value false
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Mic 1'
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value PGA
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value Stereo
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value Stereo
+ }
+ control.68 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'
+ value false
+ }
+ control.69 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Left Capture Swi'
+ value false
+ }
+ control.70 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Right Capture Sw'
+ value false
+ }
+ control.71 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'Capture ST'
+ comment.item.2 LOUT2
+ iface MIXER
+ name 'Out4 Mux'
+ value VREF
+ }
+ control.72 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 ROUT2
+ comment.item.2 'Left + Right'
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.73 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Inverted Mono 1'
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 'Left + Right'
+ iface MIXER
+ name 'Mono 2 Mux'
+ value 'Inverted Mono 1'
+ }
+ control.74 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.75 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.76 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Voice Playback Switc'
+ value false
+ }
+ control.77 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Sidetone Playback Sw'
+ value true
+ }
+ control.78 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Bypass Playback Swit'
+ value false
+ }
+ control.79 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Voice Playback Swit'
+ value false
+ }
+ control.80 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Sidetone Playback S'
+ value false
+ }
+ control.81 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Playback Swit'
+ value false
+ }
+ control.82 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Bypass Playback Swi'
+ value true
+ }
+ control.83 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Voice Playback Switc'
+ value false
+ }
+ control.84 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.85 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Playback Switch'
+ value false
+ }
+ control.86 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Bypass Playback Swit'
+ value true
+ }
+ control.87 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Stereo Out Switch'
+ value true
+ }
+ control.88 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line Out Switch'
+ value true
+ }
+ control.89 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line In Switch'
+ value true
+ }
+ control.90 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Headset Mic Switch'
+ value true
+ }
+ control.91 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Mic Switch'
+ value true
+ }
+ control.92 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Spk Switch'
+ value false
+ }
+ control.93 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp State Switch'
+ value true
+ }
+ control.94 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp Spk Switch'
+ value false
+ }
+}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
