Skip to content

L
linux-davinci
Commit c7ccfd06 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'topic/ioctl-use-define' into for-linus

parents ec6659c3 78a05b52
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 114 deletions
include/sound/asound.h
View file @ c7ccfd06
This diff is collapsed.
include/sound/sfnt_info.h
View file @ c7ccfd06
...@@ -202,13 +202,11 @@ struct snd_emux_misc_mode { ...@@ -202,13 +202,11 @@ struct snd_emux_misc_mode {
int value2; /* reserved */ int value2; /* reserved */
}; };
enum { #define SNDRV_EMUX_IOCTL_VERSION _IOR('H', 0x80, unsigned int)
SNDRV_EMUX_IOCTL_VERSION = _IOR('H', 0x80, unsigned int), #define SNDRV_EMUX_IOCTL_LOAD_PATCH _IOWR('H', 0x81, struct soundfont_patch_info)
SNDRV_EMUX_IOCTL_LOAD_PATCH = _IOWR('H', 0x81, struct soundfont_patch_info), #define SNDRV_EMUX_IOCTL_RESET_SAMPLES _IO('H', 0x82)
SNDRV_EMUX_IOCTL_RESET_SAMPLES = _IO('H', 0x82), #define SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES _IO('H', 0x83)
SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES = _IO('H', 0x83), #define SNDRV_EMUX_IOCTL_MEM_AVAIL _IOW('H', 0x84, int)
SNDRV_EMUX_IOCTL_MEM_AVAIL = _IOW('H', 0x84, int), #define SNDRV_EMUX_IOCTL_MISC_MODE _IOWR('H', 0x84, struct snd_emux_misc_mode)
SNDRV_EMUX_IOCTL_MISC_MODE = _IOWR('H', 0x84, struct snd_emux_misc_mode),
};
#endif /* __SOUND_SFNT_INFO_H */ #endif /* __SOUND_SFNT_INFO_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment