]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tools headers: Update the linux/unaligned.h copy with the kernel sources
authorNamhyung Kim <namhyung@kernel.org>
Thu, 10 Apr 2025 00:11:23 +0000 (17:11 -0700)
committerNamhyung Kim <namhyung@kernel.org>
Thu, 10 Apr 2025 16:28:25 +0000 (09:28 -0700)
To pick up the changes in:

  3846699217798061 ALSA: rawmidi: Make tied_device=0 as default / unknown
  7bb49d2e8b52adac ALSA: rawmidi: Bump protocol version to 2.0.5
  b8fefed73a952a33 ALSA: rawmidi: Show substream activity in info ioctl
  bdf46443f350dd5d ALSA: rawmidi: Expose the tied device number in info ioctl

Addressing this perf tools build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/perf/trace/beauty/include/uapi/sound/asound.h include/uapi/sound/asound.h

Please see tools/include/uapi/README for further details.

Acked-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Cc: linux-sound@vger.kernel.org
Link: https://lore.kernel.org/r/20250410001125.391820-9-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/trace/beauty/include/uapi/sound/asound.h

index 4cd513215bcd8f74b56fbff8376d0b891babb22d..5a049eeaeccea59f690755abc7164aa23fecdded 100644 (file)
@@ -716,7 +716,7 @@ enum {
  *  Raw MIDI section - /dev/snd/midi??
  */
 
-#define SNDRV_RAWMIDI_VERSION          SNDRV_PROTOCOL_VERSION(2, 0, 4)
+#define SNDRV_RAWMIDI_VERSION          SNDRV_PROTOCOL_VERSION(2, 0, 5)
 
 enum {
        SNDRV_RAWMIDI_STREAM_OUTPUT = 0,
@@ -728,6 +728,9 @@ enum {
 #define SNDRV_RAWMIDI_INFO_INPUT               0x00000002
 #define SNDRV_RAWMIDI_INFO_DUPLEX              0x00000004
 #define SNDRV_RAWMIDI_INFO_UMP                 0x00000008
+#define SNDRV_RAWMIDI_INFO_STREAM_INACTIVE     0x00000010
+
+#define SNDRV_RAWMIDI_DEVICE_UNKNOWN           0
 
 struct snd_rawmidi_info {
        unsigned int device;            /* RO/WR (control): device number */
@@ -740,7 +743,8 @@ struct snd_rawmidi_info {
        unsigned char subname[32];      /* name of active or selected subdevice */
        unsigned int subdevices_count;
        unsigned int subdevices_avail;
-       unsigned char reserved[64];     /* reserved for future use */
+       int tied_device;                /* R: tied rawmidi device (UMP/legacy) */
+       unsigned char reserved[60];     /* reserved for future use */
 };
 
 #define SNDRV_RAWMIDI_MODE_FRAMING_MASK                (7<<0)