Skip to content

Commit

Permalink
tools headers: Update the linux/unaligned.h copy with the kernel sources
Browse files Browse the repository at this point in the history
To pick up the changes in:

  3846699 ALSA: rawmidi: Make tied_device=0 as default / unknown
  7bb49d2 ALSA: rawmidi: Bump protocol version to 2.0.5
  b8fefed ALSA: rawmidi: Show substream activity in info ioctl
  bdf4644 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>
  • Loading branch information
Namhyung Kim committed Apr 10, 2025
1 parent 4056cf4 commit 7470998
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions tools/perf/trace/beauty/include/uapi/sound/asound.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 */
Expand All @@ -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)
Expand Down

0 comments on commit 7470998

Please sign in to comment.