Skip to content
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

Updated OTG audio drivers to make all string descriptors configurable through configfs #6299

Open
wants to merge 1 commit into
base: rpi-6.6.y
Choose a base branch
from
Open

Updated OTG audio drivers to make all string descriptors configurable through configfs #6299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 54 additions & 18 deletions drivers/usb/gadget/function/f_uac2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,10 @@ enum {
STR_AS_OUT_ALT1,
STR_AS_IN_ALT0,
STR_AS_IN_ALT1,
NUM_STR_DESCRIPTORS,
};

static struct usb_string strings_fn[] = {
/* [STR_ASSOC].s = DYNAMIC, */
[STR_IF_CTRL].s = "Topology Control",
[STR_CLKSRC_IN].s = "Input Clock",
[STR_CLKSRC_OUT].s = "Output Clock",
[STR_USB_IT].s = "USBH Out",
[STR_IO_IT].s = "USBD Out",
[STR_USB_OT].s = "USBH In",
[STR_IO_OT].s = "USBD In",
[STR_FU_IN].s = "Capture Volume",
[STR_FU_OUT].s = "Playback Volume",
[STR_AS_OUT_ALT0].s = "Playback Inactive",
[STR_AS_OUT_ALT1].s = "Playback Active",
[STR_AS_IN_ALT0].s = "Capture Inactive",
[STR_AS_IN_ALT1].s = "Capture Active",
{ },
};
static struct usb_string strings_fn[NUM_STR_DESCRIPTORS + 1] = {};

static const char *const speed_names[] = {
[USB_SPEED_UNKNOWN] = "UNKNOWN",
Expand Down Expand Up @@ -1046,6 +1031,19 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
return ret;

strings_fn[STR_ASSOC].s = uac2_opts->function_name;
strings_fn[STR_IF_CTRL].s = uac2_opts->if_ctrl_string;
strings_fn[STR_CLKSRC_IN].s = uac2_opts->clksrc_in_string;
strings_fn[STR_CLKSRC_OUT].s = uac2_opts->clksrc_out_string;
strings_fn[STR_USB_IT].s = uac2_opts->usb_it_string;
strings_fn[STR_IO_IT].s = uac2_opts->io_it_string;
strings_fn[STR_USB_OT].s = uac2_opts->usb_ot_string;
strings_fn[STR_IO_OT].s = uac2_opts->io_ot_string;
strings_fn[STR_FU_IN].s = uac2_opts->fu_in_string;
strings_fn[STR_FU_OUT].s = uac2_opts->fu_out_string;
strings_fn[STR_AS_OUT_ALT0].s = uac2_opts->as_out_alt0_string;
strings_fn[STR_AS_OUT_ALT1].s = uac2_opts->as_out_alt1_string;
strings_fn[STR_AS_IN_ALT0].s = uac2_opts->as_in_alt0_string;
strings_fn[STR_AS_IN_ALT1].s = uac2_opts->as_in_alt1_string;

us = usb_gstrings_attach(cdev, fn_strings, ARRAY_SIZE(strings_fn));
if (IS_ERR(us))
Expand Down Expand Up @@ -2094,6 +2092,19 @@ UAC2_ATTRIBUTE(s16, c_volume_max);
UAC2_ATTRIBUTE(s16, c_volume_res);
UAC2_ATTRIBUTE(u32, fb_max);
UAC2_ATTRIBUTE_STRING(function_name);
UAC2_ATTRIBUTE_STRING(if_ctrl_string);
UAC2_ATTRIBUTE_STRING(clksrc_in_string);
UAC2_ATTRIBUTE_STRING(clksrc_out_string);
UAC2_ATTRIBUTE_STRING(usb_it_string);
UAC2_ATTRIBUTE_STRING(io_it_string);
UAC2_ATTRIBUTE_STRING(usb_ot_string);
UAC2_ATTRIBUTE_STRING(io_ot_string);
UAC2_ATTRIBUTE_STRING(fu_in_string);
UAC2_ATTRIBUTE_STRING(fu_out_string);
UAC2_ATTRIBUTE_STRING(as_out_alt0_string);
UAC2_ATTRIBUTE_STRING(as_out_alt1_string);
UAC2_ATTRIBUTE_STRING(as_in_alt0_string);
UAC2_ATTRIBUTE_STRING(as_in_alt1_string);

static struct configfs_attribute *f_uac2_attrs[] = {
&f_uac2_opts_attr_p_chmask,
Expand Down Expand Up @@ -2121,7 +2132,19 @@ static struct configfs_attribute *f_uac2_attrs[] = {
&f_uac2_opts_attr_c_volume_res,

&f_uac2_opts_attr_function_name,

&f_uac2_opts_attr_if_ctrl_string,
&f_uac2_opts_attr_clksrc_in_string,
&f_uac2_opts_attr_clksrc_out_string,
&f_uac2_opts_attr_usb_it_string,
&f_uac2_opts_attr_io_it_string,
&f_uac2_opts_attr_usb_ot_string,
&f_uac2_opts_attr_io_ot_string,
&f_uac2_opts_attr_fu_in_string,
&f_uac2_opts_attr_fu_out_string,
&f_uac2_opts_attr_as_out_alt0_string,
&f_uac2_opts_attr_as_out_alt1_string,
&f_uac2_opts_attr_as_in_alt0_string,
&f_uac2_opts_attr_as_in_alt1_string,
NULL,
};

Expand Down Expand Up @@ -2179,6 +2202,19 @@ static struct usb_function_instance *afunc_alloc_inst(void)
opts->fb_max = FBACK_FAST_MAX;

snprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink");
snprintf(opts->if_ctrl_string, sizeof(opts->if_ctrl_string), "Topology Control");
snprintf(opts->clksrc_in_string, sizeof(opts->clksrc_in_string), "Input Clock");
snprintf(opts->clksrc_out_string, sizeof(opts->clksrc_out_string), "Output Clock");
snprintf(opts->usb_it_string, sizeof(opts->usb_it_string), "USBH Out");
snprintf(opts->io_it_string, sizeof(opts->io_it_string), "USBD Out");
snprintf(opts->usb_ot_string, sizeof(opts->usb_ot_string), "USBH In");
snprintf(opts->io_ot_string, sizeof(opts->io_ot_string), "USBD In");
snprintf(opts->fu_in_string, sizeof(opts->fu_in_string), "Capture Volume");
snprintf(opts->fu_out_string, sizeof(opts->fu_out_string), "Playback Volume");
snprintf(opts->as_out_alt0_string, sizeof(opts->as_out_alt0_string), "Playback Inactive");
snprintf(opts->as_out_alt1_string, sizeof(opts->as_out_alt1_string), "Playback Active");
snprintf(opts->as_in_alt0_string, sizeof(opts->as_in_alt0_string), "Capture Inactive");
snprintf(opts->as_in_alt1_string, sizeof(opts->as_in_alt1_string), "Capture Active");

return &opts->func_inst;
}
Expand Down
15 changes: 14 additions & 1 deletion drivers/usb/gadget/function/u_uac2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,20 @@ struct f_uac2_opts {
int fb_max;
bool bound;

char function_name[32];
char function_name[USB_MAX_STRING_LEN];
char if_ctrl_string[USB_MAX_STRING_LEN];
char clksrc_in_string[USB_MAX_STRING_LEN];
char clksrc_out_string[USB_MAX_STRING_LEN];
char usb_it_string[USB_MAX_STRING_LEN];
char io_it_string[USB_MAX_STRING_LEN];
char usb_ot_string[USB_MAX_STRING_LEN];
char io_ot_string[USB_MAX_STRING_LEN];
char fu_in_string[USB_MAX_STRING_LEN];
char fu_out_string[USB_MAX_STRING_LEN];
char as_out_alt0_string[USB_MAX_STRING_LEN];
char as_out_alt1_string[USB_MAX_STRING_LEN];
char as_in_alt0_string[USB_MAX_STRING_LEN];
char as_in_alt1_string[USB_MAX_STRING_LEN];

struct mutex lock;
int refcnt;
Expand Down