the changes in the v3 (for easy to review, divide change into 4 patches): - address the comment about the snd_jack_report() and _snd_jack_report(), the v2 design is hard to understand and is hard to review, in the v3, separate the jack_report to snd_jack_report() and snd_jack_inject_report(), hw jack events call snd_jack_report() as before, if a jack contains multi jack_kctl and the jack_kctl's sw_inject is enabled, the status and the related input-dev's events will not be reproted. The injection events call snd_jack_inject_report(). This change is squashed to 0001-xxx.patch, the rest part of 0001-xxx.patch is same as v2.
- address the comment about folders'name in the 0002-xxx.patch, so far, drop the '/', ',', '=' and ' ' from the folders' name.
- address the comment about adding more debugfs nodes in the 0003-xxx.patch, it adds kctl_id, mask_bits, status and type.
- address the comment about save-n-restore jack's hw status in the 0004-xxx.patch, adding a hw_status_cache and save the last reported jack hw event, once the sw_inject is disabled, will restore all jack_kctl's state under the same snd_jack with hw_status_cache.
Now the layout of folders looks like below: /sys/kernel/debug# tree sound-core/ sound-core/ └── card0 ├── HDMIDPpcm3Jack │ ├── jackin_inject │ ├── kctl_id │ ├── mask_bits │ ├── status │ ├── sw_inject_enable │ └── type ├── HDMIDPpcm4Jack │ ├── jackin_inject │ ├── kctl_id │ ├── mask_bits │ ├── status │ ├── sw_inject_enable │ └── type ├── HDMIDPpcm5Jack │ ├── jackin_inject │ ├── kctl_id │ ├── mask_bits │ ├── status │ ├── sw_inject_enable │ └── type ├── HeadphoneJack │ ├── jackin_inject │ ├── kctl_id │ ├── mask_bits │ ├── status │ ├── sw_inject_enable │ └── type └── MicJack ├── jackin_inject ├── kctl_id ├── mask_bits ├── status ├── sw_inject_enable └── type
/sys/kernel/debug# cat sound-core/card0/HeadphoneJack/kctl_id Headphone Jack /sys/kernel/debug# cat sound-core/card0/HeadphoneJack/mask_bits 0x0001 HEADPHONE(0x0001) /sys/kernel/debug# cat sound-core/card0/HeadphoneJack/status 0x0000 /sys/kernel/debug# cat sound-core/card0/HeadphoneJack/sw_inject_enable Jack: Headphone Jack Inject Enabled: 0 /sys/kernel/debug# cat sound-core/card0/HeadphoneJack/type 0x0001 HEADPHONE(0x0001)
the changes in the V2: - using debugfs instead of sysfs - using jack_ctrl to create a folder instead of snd_jack, since ASoC drivers could create multi jack_ctrls within a snd_jack - create a folder for each jack_ctrl instead for all jack_ctrls
[ snip ]
Hui Wang (4): alsa: jack: implement software jack injection via debugfs alsa: jack: adjust jack_kctl debugfs folder's name alsa: jack: add more jack_kctl debugfs nodes alsa: jack: implement save-and-restore for jack's hw status
include/sound/core.h | 2 + include/sound/jack.h | 1 + sound/core/init.c | 7 + sound/core/jack.c | 351 ++++++++++++++++++++++++++++++++++++++++++- sound/core/sound.c | 8 + 5 files changed, 365 insertions(+), 4 deletions(-)