devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

hosted: Don't open alsa control device directly

Browse source 
It was just being used as a proxy "yeah, we called hw_init()" so
just use a flag for that directly.

affects rocker, erosq, xduoo x3ii/x20, and fiiom3klinux

Change-Id: I14bd9f8d91f1d6cc8de0982a7426e2a103c6bfce
This commit is contained in:
Solomon Peachy 2021-04-13 21:38:14 -04:00
parent ec4b5c794e
commit 42dba708e3
4 changed files with 25 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

30
firmware/drivers/audio/erosqlinux_codec.c
View file

@ -25,15 +25,11 @@
#include "config.h"
#include "audio.h"
#include "audiohw.h"
#include "button.h"
#include "system.h"
#include "kernel.h"
#include "panic.h"
#include "sysfs.h"
#include "alsa-controls.h"
#include "pcm-alsa.h"
#include "pcm_sw_volume.h"
#include "settings.h"
#include "logf.h"
@ -64,32 +60,19 @@
: values=4
*/
static int fd_hw = -1;
static int hw_init = 0;
static long int vol_l_hw = 255;
static long int vol_r_hw = 255;
static long int last_ps = -1;
static void hw_open(void)
{
fd_hw = open("/dev/snd/controlC0", O_RDWR);
if(fd_hw < 0)
panicf("Cannot open '/dev/snd/controlC0'");
}
static void hw_close(void)
{
close(fd_hw);
fd_hw = -1;
}
static int muted = -1;
void audiohw_mute(int mute)
{
logf("mute %d", mute);
if (fd_hw < 0 || muted == mute)
if (hw_init < 0 || muted == mute)
return;
muted = mute;
@ -111,7 +94,7 @@ int erosq_get_outputs(void) {
int status = 0;
if (fd_hw < 0) return ps;
if (!hw_init) return ps;
const char * const sysfs_lo_switch = "/sys/class/switch/lineout/state";
const char * const sysfs_hs_switch = "/sys/class/switch/headset/state";
@ -129,7 +112,7 @@ int erosq_get_outputs(void) {
void erosq_set_output(int ps)
{
if (fd_hw < 0 || muted) return;
if (!hw_init || muted) return;
if (last_ps != ps)
{
@ -145,7 +128,7 @@ void audiohw_preinit(void)
{
logf("hw preinit");
alsa_controls_init("default");
hw_open();
hw_init = 1;
audiohw_mute(false); /* No need to stay muted */
}
@ -157,7 +140,8 @@ void audiohw_postinit(void)
void audiohw_close(void)
{
logf("hw close");
hw_close();
hw_init = 0;
muted = -1;
alsa_controls_close();
}