Skip to content

fix: properly detect usb-c cards plugged in before booting #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frysee merged 2 commits into from
May 27, 2026
+108 −10
Merged

fix: properly detect usb-c cards plugged in before booting #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
192c6dd
fix: properly detect usb-c cards plugged in before booting
frysee May 27, 2026
2b5a1ca
fix: apply the same patch to tg5050
frysee May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 54 additions & 5 deletions workspace/tg5040/libmsettings/msettings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,44 @@ static int get_a2dp_simple_control_name(char *buf, size_t buflen) {
return 0;
}

static int get_usbc_card_num() {
FILE *fp = popen("cat /proc/asound/cards", "r");
if (!fp) return -1;

char line[256];
while (fgets(line, sizeof(line), fp)) {
if (strstr(line, "audiocodec") == NULL) { // skip the built-in codec
int card_num;
if (sscanf(line, " %d ", &card_num) == 1) {
pclose(fp);
return card_num;
}
}
}

pclose(fp);
return -1;
}

static int get_audiocodec_card_num() {
FILE *fp = popen("cat /proc/asound/cards", "r");
if (!fp) return -1;

char line[256];
while (fgets(line, sizeof(line), fp)) {
if (strstr(line, "audiocodec") != NULL) { // look for the built-in codec
int card_num;
if (sscanf(line, " %d ", &card_num) == 1) {
pclose(fp);
return card_num;
}
}
}

pclose(fp);
return -1;
}

void SetRawVolume(int val) { // in: 0-100
if (settings->mute && GetMutedVolume() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
val = scaleVolume(GetMutedVolume());
Expand All @@ -1150,8 +1188,14 @@ void SetRawVolume(int val) { // in: 0-100
}
}
else if (GetAudioSink() == AUDIO_SINK_USBDAC) {
// USB DAC path: use card 1
struct mixer *mixer = mixer_open(1);
// USB DAC path: grab the first card that is not called "audiocodec"
int card_num = get_usbc_card_num();
if(card_num < 0) {
printf("Failed to find USB audio card\n"); fflush(stdout);
return;
}

struct mixer *mixer = mixer_open(card_num);
if (!mixer) {
printf("Failed to open mixer\n"); fflush(stdout);
return;
Expand All @@ -1163,7 +1207,7 @@ void SetRawVolume(int val) { // in: 0-100
const char *name = mixer_ctl_get_name(ctl);
if (!name) continue;

if (strstr(name, "PCM") && (strstr(name, "Volume") || strstr(name, "volume"))) {
if ((strstr(name, "PCM") || strstr(name, "Playback")) && (strstr(name, "Volume") || strstr(name, "volume"))) {
if (mixer_ctl_get_type(ctl) == MIXER_CTL_TYPE_INT) {
int min = mixer_ctl_get_range_min(ctl);
int max = mixer_ctl_get_range_max(ctl);
Expand All @@ -1178,8 +1222,13 @@ void SetRawVolume(int val) { // in: 0-100
mixer_close(mixer);
}
else {
// Speaker path: use direct lookup by name
struct mixer *mixer = mixer_open(0);
// Speaker path: grab the card that is called "audiocodec"
int card_num = get_audiocodec_card_num();
if(card_num < 0) {
card_num = 0; // fallback to card 0 if we can't find it
}

struct mixer *mixer = mixer_open(card_num);
if (!mixer) {
printf("Failed to open mixer\n"); fflush(stdout);
return;
Expand Down
59 changes: 54 additions & 5 deletions workspace/tg5050/libmsettings/msettings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,44 @@ static int get_a2dp_simple_control_name(char *buf, size_t buflen) {
return 0;
}

static int get_usbc_card_num() {
FILE *fp = popen("cat /proc/asound/cards", "r");
if (!fp) return -1;

char line[256];
while (fgets(line, sizeof(line), fp)) {
if (strstr(line, "audiocodec") == NULL) { // skip the built-in codec
int card_num;
if (sscanf(line, " %d ", &card_num) == 1) {
pclose(fp);
return card_num;
}
}
}

pclose(fp);
return -1;
}

static int get_audiocodec_card_num() {
FILE *fp = popen("cat /proc/asound/cards", "r");
if (!fp) return -1;

char line[256];
while (fgets(line, sizeof(line), fp)) {
if (strstr(line, "audiocodec") != NULL) { // look for the built-in codec
int card_num;
if (sscanf(line, " %d ", &card_num) == 1) {
pclose(fp);
return card_num;
}
}
}

pclose(fp);
return -1;
}

void SetRawVolume(int val) { // in: 0-100
if (settings->mute && GetMutedVolume() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
val = scaleVolume(GetMutedVolume());
Expand All @@ -851,8 +889,14 @@ void SetRawVolume(int val) { // in: 0-100
}
}
else if (GetAudioSink() == AUDIO_SINK_USBDAC) {
// USB DAC path: use card 1
struct mixer *mixer = mixer_open(1);
// USB DAC path: grab the first card that is not called "audiocodec"
int card_num = get_usbc_card_num();
if(card_num < 0) {
printf("Failed to find USB audio card\n"); fflush(stdout);
return;
}

struct mixer *mixer = mixer_open(card_num);
if (!mixer) {
printf("Failed to open mixer\n"); fflush(stdout);
return;
Expand All @@ -864,7 +908,7 @@ void SetRawVolume(int val) { // in: 0-100
const char *name = mixer_ctl_get_name(ctl);
if (!name) continue;

if (strstr(name, "PCM") && (strstr(name, "Volume") || strstr(name, "volume"))) {
if ((strstr(name, "PCM") || strstr(name, "Playback")) && (strstr(name, "Volume") || strstr(name, "volume"))) {
if (mixer_ctl_get_type(ctl) == MIXER_CTL_TYPE_INT) {
int min = mixer_ctl_get_range_min(ctl);
int max = mixer_ctl_get_range_max(ctl);
Expand All @@ -879,8 +923,13 @@ void SetRawVolume(int val) { // in: 0-100
mixer_close(mixer);
}
else {
// Speaker path: use direct lookup by name
struct mixer *mixer = mixer_open(0);
// Speaker path: grab the card that is called "audiocodec"
int card_num = get_audiocodec_card_num();
if(card_num < 0) {
card_num = 0; // fallback to card 0 if we can't find it
}

struct mixer *mixer = mixer_open(card_num);
if (!mixer) {
printf("Failed to open mixer\n"); fflush(stdout);
return;
Expand Down
Loading