summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e8c8d11)
raw | patch | inline | side by side (parent: e8c8d11)
author | Misael Lopez Cruz <misael.lopez@ti.com> | |
Tue, 5 Nov 2013 05:36:02 +0000 (23:36 -0600) | ||
committer | Gerrit Code Review <gerrit2@git.omapzoom.org> | |
Mon, 25 Nov 2013 21:22:01 +0000 (15:22 -0600) |
Primary audio HAL uses mixer_get_card_name() function (from
tinyalsa which is under OMAP_ENHANCEMENT) to dynamically find
the id of the McASP-based sound card.
The dynamic search of the card must also be dependent on
OMAP_ENHANCEMENT and provide a default card id if the flag is
not defined.
Change-Id: Id2c610e85d65bc5d559a0c9d1dda0359893a12fa
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
tinyalsa which is under OMAP_ENHANCEMENT) to dynamically find
the id of the McASP-based sound card.
The dynamic search of the card must also be dependent on
OMAP_ENHANCEMENT and provide a default card id if the flag is
not defined.
Change-Id: Id2c610e85d65bc5d559a0c9d1dda0359893a12fa
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
audio/legacy/audio_hw.c | patch | blob | history |
index 671c83a17c8ebc1e42b9972a8cd6f3204071a85b..c3879177a33fc13c4e20779e5e759fadde8ef628 100644 (file)
--- a/audio/legacy/audio_hw.c
+++ b/audio/legacy/audio_hw.c
int found = 0;
unsigned int i;
+#ifdef OMAP_ENHANCEMENT
do {
/* returns an error after last valid card */
int ret = mixer_get_card_name(card, name, sizeof(name));
}
}
} while (!found && (card++ < MAX_CARD_COUNT));
+#endif
/* Use default card number if not found */
if (!found)
- card = 1;
+ card = 0;
return card;
}