tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

usb: gadget: f_uac1: Change volume name and remove alt names

This changes the UAPI to align with disussion of alt settings work.

fu_name is renamed to fu_vol_name, and alt settings mode names
are removed for now in favor of future work where they will be
settable in subdirectories for each alt mode.

discussion thread for api changes for alt mode settings:
https://lore.kernel.org/linux-usb/35be4668-58d3-894a-72cf-de1afaacae45@ivitera.com/T/

Signed-off-by: Chris Wulff <crwulff@gmail.com>
Link: https://lore.kernel.org/r/20240804002912.3293177-2-crwulff@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Chris Wulff and committed by
Greg Kroah-Hartman 82313624 c26cee81

+30 -54
+2 -6
Documentation/ABI/testing/configfs-usb-gadget-uac1
··· 33 33 p_it_name playback input terminal name 34 34 p_it_ch_name playback channels name 35 35 p_ot_name playback output terminal name 36 - p_fu_name playback functional unit name 37 - p_alt0_name playback alt mode 0 name 38 - p_alt1_name playback alt mode 1 name 36 + p_fu_vol_name playback mute/volume functional unit name 39 37 c_it_name capture input terminal name 40 38 c_it_ch_name capture channels name 41 39 c_ot_name capture output terminal name 42 - c_fu_name capture functional unit name 43 - c_alt0_name capture alt mode 0 name 44 - c_alt1_name capture alt mode 1 name 40 + c_fu_vol_name capture mute/volume functional unit name 45 41 ===================== =======================================
+2 -6
Documentation/usb/gadget-testing.rst
··· 971 971 p_it_name playback input terminal name 972 972 p_it_ch_name playback channels name 973 973 p_ot_name playback output terminal name 974 - p_fu_name playback functional unit name 975 - p_alt0_name playback alt mode 0 name 976 - p_alt1_name playback alt mode 1 name 974 + p_fu_vol_name playback mute/volume functional unit name 977 975 c_it_name capture input terminal name 978 976 c_it_ch_name capture channels name 979 977 c_ot_name capture output terminal name 980 - c_fu_name capture functional unit name 981 - c_alt0_name capture alt mode 0 name 982 - c_alt1_name capture alt mode 1 name 978 + c_fu_vol_name capture mute/volume functional unit name 983 979 ================ ==================================================== 984 980 985 981 The attributes have sane default values.
+24 -36
drivers/usb/gadget/function/f_uac1.c
··· 1251 1251 1252 1252 strings_uac1[STR_AC_IF].s = audio_opts->function_name; 1253 1253 1254 - strings_uac1[STR_USB_OUT_IT].s = audio_opts->p_it_name; 1255 - strings_uac1[STR_USB_OUT_IT_CH_NAMES].s = audio_opts->p_it_ch_name; 1256 - strings_uac1[STR_IO_OUT_OT].s = audio_opts->p_ot_name; 1257 - strings_uac1[STR_FU_OUT].s = audio_opts->p_fu_name; 1258 - strings_uac1[STR_AS_OUT_IF_ALT0].s = audio_opts->p_alt0_name; 1259 - strings_uac1[STR_AS_OUT_IF_ALT1].s = audio_opts->p_alt1_name; 1254 + strings_uac1[STR_USB_OUT_IT].s = audio_opts->c_it_name; 1255 + strings_uac1[STR_USB_OUT_IT_CH_NAMES].s = audio_opts->c_it_ch_name; 1256 + strings_uac1[STR_IO_OUT_OT].s = audio_opts->c_ot_name; 1257 + strings_uac1[STR_FU_OUT].s = audio_opts->c_fu_vol_name; 1258 + strings_uac1[STR_AS_OUT_IF_ALT0].s = "Playback Inactive"; 1259 + strings_uac1[STR_AS_OUT_IF_ALT1].s = "Playback Active"; 1260 1260 1261 - strings_uac1[STR_IO_IN_IT].s = audio_opts->c_it_name; 1262 - strings_uac1[STR_IO_IN_IT_CH_NAMES].s = audio_opts->c_it_ch_name; 1263 - strings_uac1[STR_USB_IN_OT].s = audio_opts->c_ot_name; 1264 - strings_uac1[STR_FU_IN].s = audio_opts->c_fu_name; 1265 - strings_uac1[STR_AS_IN_IF_ALT0].s = audio_opts->c_alt0_name; 1266 - strings_uac1[STR_AS_IN_IF_ALT1].s = audio_opts->c_alt1_name; 1261 + strings_uac1[STR_IO_IN_IT].s = audio_opts->p_it_name; 1262 + strings_uac1[STR_IO_IN_IT_CH_NAMES].s = audio_opts->p_it_ch_name; 1263 + strings_uac1[STR_USB_IN_OT].s = audio_opts->p_ot_name; 1264 + strings_uac1[STR_FU_IN].s = audio_opts->p_fu_vol_name; 1265 + strings_uac1[STR_AS_IN_IF_ALT0].s = "Capture Inactive"; 1266 + strings_uac1[STR_AS_IN_IF_ALT1].s = "Capture Active"; 1267 1267 1268 1268 us = usb_gstrings_attach(cdev, uac1_strings, ARRAY_SIZE(strings_uac1)); 1269 1269 if (IS_ERR(us)) ··· 1687 1687 UAC1_ATTRIBUTE_STRING(p_it_name); 1688 1688 UAC1_ATTRIBUTE_STRING(p_it_ch_name); 1689 1689 UAC1_ATTRIBUTE_STRING(p_ot_name); 1690 - UAC1_ATTRIBUTE_STRING(p_fu_name); 1691 - UAC1_ATTRIBUTE_STRING(p_alt0_name); 1692 - UAC1_ATTRIBUTE_STRING(p_alt1_name); 1690 + UAC1_ATTRIBUTE_STRING(p_fu_vol_name); 1693 1691 1694 1692 UAC1_ATTRIBUTE_STRING(c_it_name); 1695 1693 UAC1_ATTRIBUTE_STRING(c_it_ch_name); 1696 1694 UAC1_ATTRIBUTE_STRING(c_ot_name); 1697 - UAC1_ATTRIBUTE_STRING(c_fu_name); 1698 - UAC1_ATTRIBUTE_STRING(c_alt0_name); 1699 - UAC1_ATTRIBUTE_STRING(c_alt1_name); 1695 + UAC1_ATTRIBUTE_STRING(c_fu_vol_name); 1700 1696 1701 1697 static struct configfs_attribute *f_uac1_attrs[] = { 1702 1698 &f_uac1_opts_attr_c_chmask, ··· 1720 1724 &f_uac1_opts_attr_p_it_name, 1721 1725 &f_uac1_opts_attr_p_it_ch_name, 1722 1726 &f_uac1_opts_attr_p_ot_name, 1723 - &f_uac1_opts_attr_p_fu_name, 1724 - &f_uac1_opts_attr_p_alt0_name, 1725 - &f_uac1_opts_attr_p_alt1_name, 1727 + &f_uac1_opts_attr_p_fu_vol_name, 1726 1728 1727 1729 &f_uac1_opts_attr_c_it_name, 1728 1730 &f_uac1_opts_attr_c_it_ch_name, 1729 1731 &f_uac1_opts_attr_c_ot_name, 1730 - &f_uac1_opts_attr_c_fu_name, 1731 - &f_uac1_opts_attr_c_alt0_name, 1732 - &f_uac1_opts_attr_c_alt1_name, 1732 + &f_uac1_opts_attr_c_fu_vol_name, 1733 1733 1734 1734 NULL, 1735 1735 }; ··· 1781 1789 1782 1790 scnprintf(opts->function_name, sizeof(opts->function_name), "AC Interface"); 1783 1791 1784 - scnprintf(opts->p_it_name, sizeof(opts->p_it_name), "Playback Input terminal"); 1785 - scnprintf(opts->p_it_ch_name, sizeof(opts->p_it_ch_name), "Playback Channels"); 1786 - scnprintf(opts->p_ot_name, sizeof(opts->p_ot_name), "Playback Output terminal"); 1787 - scnprintf(opts->p_fu_name, sizeof(opts->p_fu_name), "Playback Volume"); 1788 - scnprintf(opts->p_alt0_name, sizeof(opts->p_alt0_name), "Playback Inactive"); 1789 - scnprintf(opts->p_alt1_name, sizeof(opts->p_alt1_name), "Playback Active"); 1792 + scnprintf(opts->p_it_name, sizeof(opts->p_it_name), "Capture Input terminal"); 1793 + scnprintf(opts->p_it_ch_name, sizeof(opts->p_it_ch_name), "Capture Channels"); 1794 + scnprintf(opts->p_ot_name, sizeof(opts->p_ot_name), "Capture Output terminal"); 1795 + scnprintf(opts->p_fu_vol_name, sizeof(opts->p_fu_vol_name), "Capture Volume"); 1790 1796 1791 - scnprintf(opts->c_it_name, sizeof(opts->c_it_name), "Capture Input terminal"); 1792 - scnprintf(opts->c_it_ch_name, sizeof(opts->c_it_ch_name), "Capture Channels"); 1793 - scnprintf(opts->c_ot_name, sizeof(opts->c_ot_name), "Capture Output terminal"); 1794 - scnprintf(opts->c_fu_name, sizeof(opts->c_fu_name), "Capture Volume"); 1795 - scnprintf(opts->c_alt0_name, sizeof(opts->c_alt0_name), "Capture Inactive"); 1796 - scnprintf(opts->c_alt1_name, sizeof(opts->c_alt1_name), "Capture Active"); 1797 + scnprintf(opts->c_it_name, sizeof(opts->c_it_name), "Playback Input terminal"); 1798 + scnprintf(opts->c_it_ch_name, sizeof(opts->c_it_ch_name), "Playback Channels"); 1799 + scnprintf(opts->c_ot_name, sizeof(opts->c_ot_name), "Playback Output terminal"); 1800 + scnprintf(opts->c_fu_vol_name, sizeof(opts->c_fu_vol_name), "Playback Volume"); 1797 1801 1798 1802 return &opts->func_inst; 1799 1803 }
+2 -6
drivers/usb/gadget/function/u_uac1.h
··· 57 57 char p_it_name[USB_MAX_STRING_LEN]; 58 58 char p_it_ch_name[USB_MAX_STRING_LEN]; 59 59 char p_ot_name[USB_MAX_STRING_LEN]; 60 - char p_fu_name[USB_MAX_STRING_LEN]; 61 - char p_alt0_name[USB_MAX_STRING_LEN]; 62 - char p_alt1_name[USB_MAX_STRING_LEN]; 60 + char p_fu_vol_name[USB_MAX_STRING_LEN]; 63 61 64 62 char c_it_name[USB_MAX_STRING_LEN]; 65 63 char c_it_ch_name[USB_MAX_STRING_LEN]; 66 64 char c_ot_name[USB_MAX_STRING_LEN]; 67 - char c_fu_name[USB_MAX_STRING_LEN]; 68 - char c_alt0_name[USB_MAX_STRING_LEN]; 69 - char c_alt1_name[USB_MAX_STRING_LEN]; 65 + char c_fu_vol_name[USB_MAX_STRING_LEN]; 70 66 71 67 struct mutex lock; 72 68 int refcnt;