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
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 114 deletions
include/sound/asound.h
View file @ c7ccfd06
...@@ -126,12 +126,10 @@ struct snd_hwdep_dsp_image { ...@@ -126,12 +126,10 @@ struct snd_hwdep_dsp_image {
unsigned long driver_data; /* W: driver-specific data */ unsigned long driver_data; /* W: driver-specific data */
}; };
enum { #define SNDRV_HWDEP_IOCTL_PVERSION _IOR ('H', 0x00, int)
SNDRV_HWDEP_IOCTL_PVERSION = _IOR ('H', 0x00, int), #define SNDRV_HWDEP_IOCTL_INFO _IOR ('H', 0x01, struct snd_hwdep_info)
SNDRV_HWDEP_IOCTL_INFO = _IOR ('H', 0x01, struct snd_hwdep_info), #define SNDRV_HWDEP_IOCTL_DSP_STATUS _IOR('H', 0x02, struct snd_hwdep_dsp_status)
SNDRV_HWDEP_IOCTL_DSP_STATUS = _IOR('H', 0x02, struct snd_hwdep_dsp_status), #define SNDRV_HWDEP_IOCTL_DSP_LOAD _IOW('H', 0x03, struct snd_hwdep_dsp_image)
SNDRV_HWDEP_IOCTL_DSP_LOAD = _IOW('H', 0x03, struct snd_hwdep_dsp_image)
};
/***************************************************************************** /*****************************************************************************
* * * *
...@@ -451,40 +449,35 @@ enum { ...@@ -451,40 +449,35 @@ enum {
SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
}; };
enum { #define SNDRV_PCM_IOCTL_PVERSION _IOR('A', 0x00, int)
SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int), #define SNDRV_PCM_IOCTL_INFO _IOR('A', 0x01, struct snd_pcm_info)
SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info), #define SNDRV_PCM_IOCTL_TSTAMP _IOW('A', 0x02, int)
SNDRV_PCM_IOCTL_TSTAMP = _IOW('A', 0x02, int), #define SNDRV_PCM_IOCTL_TTSTAMP _IOW('A', 0x03, int)
SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int), #define SNDRV_PCM_IOCTL_HW_REFINE _IOWR('A', 0x10, struct snd_pcm_hw_params)
SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params), #define SNDRV_PCM_IOCTL_HW_PARAMS _IOWR('A', 0x11, struct snd_pcm_hw_params)
SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params), #define SNDRV_PCM_IOCTL_HW_FREE _IO('A', 0x12)
SNDRV_PCM_IOCTL_HW_FREE = _IO('A', 0x12), #define SNDRV_PCM_IOCTL_SW_PARAMS _IOWR('A', 0x13, struct snd_pcm_sw_params)
SNDRV_PCM_IOCTL_SW_PARAMS = _IOWR('A', 0x13, struct snd_pcm_sw_params), #define SNDRV_PCM_IOCTL_STATUS _IOR('A', 0x20, struct snd_pcm_status)
SNDRV_PCM_IOCTL_STATUS = _IOR('A', 0x20, struct snd_pcm_status), #define SNDRV_PCM_IOCTL_DELAY _IOR('A', 0x21, snd_pcm_sframes_t)
SNDRV_PCM_IOCTL_DELAY = _IOR('A', 0x21, snd_pcm_sframes_t), #define SNDRV_PCM_IOCTL_HWSYNC _IO('A', 0x22)
SNDRV_PCM_IOCTL_HWSYNC = _IO('A', 0x22), #define SNDRV_PCM_IOCTL_SYNC_PTR _IOWR('A', 0x23, struct snd_pcm_sync_ptr)
SNDRV_PCM_IOCTL_SYNC_PTR = _IOWR('A', 0x23, struct snd_pcm_sync_ptr), #define SNDRV_PCM_IOCTL_CHANNEL_INFO _IOR('A', 0x32, struct snd_pcm_channel_info)
SNDRV_PCM_IOCTL_CHANNEL_INFO = _IOR('A', 0x32, struct snd_pcm_channel_info), #define SNDRV_PCM_IOCTL_PREPARE _IO('A', 0x40)
SNDRV_PCM_IOCTL_PREPARE = _IO('A', 0x40), #define SNDRV_PCM_IOCTL_RESET _IO('A', 0x41)
SNDRV_PCM_IOCTL_RESET = _IO('A', 0x41), #define SNDRV_PCM_IOCTL_START _IO('A', 0x42)
SNDRV_PCM_IOCTL_START = _IO('A', 0x42), #define SNDRV_PCM_IOCTL_DROP _IO('A', 0x43)
SNDRV_PCM_IOCTL_DROP = _IO('A', 0x43), #define SNDRV_PCM_IOCTL_DRAIN _IO('A', 0x44)
SNDRV_PCM_IOCTL_DRAIN = _IO('A', 0x44), #define SNDRV_PCM_IOCTL_PAUSE _IOW('A', 0x45, int)
SNDRV_PCM_IOCTL_PAUSE = _IOW('A', 0x45, int), #define SNDRV_PCM_IOCTL_REWIND _IOW('A', 0x46, snd_pcm_uframes_t)
SNDRV_PCM_IOCTL_REWIND = _IOW('A', 0x46, snd_pcm_uframes_t), #define SNDRV_PCM_IOCTL_RESUME _IO('A', 0x47)
SNDRV_PCM_IOCTL_RESUME = _IO('A', 0x47), #define SNDRV_PCM_IOCTL_XRUN _IO('A', 0x48)
SNDRV_PCM_IOCTL_XRUN = _IO('A', 0x48), #define SNDRV_PCM_IOCTL_FORWARD _IOW('A', 0x49, snd_pcm_uframes_t)
SNDRV_PCM_IOCTL_FORWARD = _IOW('A', 0x49, snd_pcm_uframes_t), #define SNDRV_PCM_IOCTL_WRITEI_FRAMES _IOW('A', 0x50, struct snd_xferi)
SNDRV_PCM_IOCTL_WRITEI_FRAMES = _IOW('A', 0x50, struct snd_xferi), #define SNDRV_PCM_IOCTL_READI_FRAMES _IOR('A', 0x51, struct snd_xferi)
SNDRV_PCM_IOCTL_READI_FRAMES = _IOR('A', 0x51, struct snd_xferi), #define SNDRV_PCM_IOCTL_WRITEN_FRAMES _IOW('A', 0x52, struct snd_xfern)
SNDRV_PCM_IOCTL_WRITEN_FRAMES = _IOW('A', 0x52, struct snd_xfern), #define SNDRV_PCM_IOCTL_READN_FRAMES _IOR('A', 0x53, struct snd_xfern)
SNDRV_PCM_IOCTL_READN_FRAMES = _IOR('A', 0x53, struct snd_xfern), #define SNDRV_PCM_IOCTL_LINK _IOW('A', 0x60, int)
SNDRV_PCM_IOCTL_LINK = _IOW('A', 0x60, int), #define SNDRV_PCM_IOCTL_UNLINK _IO('A', 0x61)
SNDRV_PCM_IOCTL_UNLINK = _IO('A', 0x61),
};
/* Trick to make alsa-lib/acinclude.m4 happy */
#define SNDRV_PCM_IOCTL_REWIND SNDRV_PCM_IOCTL_REWIND
/***************************************************************************** /*****************************************************************************
* * * *
...@@ -538,14 +531,12 @@ struct snd_rawmidi_status { ...@@ -538,14 +531,12 @@ struct snd_rawmidi_status {
unsigned char reserved[16]; /* reserved for future use */ unsigned char reserved[16]; /* reserved for future use */
}; };
enum { #define SNDRV_RAWMIDI_IOCTL_PVERSION _IOR('W', 0x00, int)
SNDRV_RAWMIDI_IOCTL_PVERSION = _IOR('W', 0x00, int), #define SNDRV_RAWMIDI_IOCTL_INFO _IOR('W', 0x01, struct snd_rawmidi_info)
SNDRV_RAWMIDI_IOCTL_INFO = _IOR('W', 0x01, struct snd_rawmidi_info), #define SNDRV_RAWMIDI_IOCTL_PARAMS _IOWR('W', 0x10, struct snd_rawmidi_params)
SNDRV_RAWMIDI_IOCTL_PARAMS = _IOWR('W', 0x10, struct snd_rawmidi_params), #define SNDRV_RAWMIDI_IOCTL_STATUS _IOWR('W', 0x20, struct snd_rawmidi_status)
SNDRV_RAWMIDI_IOCTL_STATUS = _IOWR('W', 0x20, struct snd_rawmidi_status), #define SNDRV_RAWMIDI_IOCTL_DROP _IOW('W', 0x30, int)
SNDRV_RAWMIDI_IOCTL_DROP = _IOW('W', 0x30, int), #define SNDRV_RAWMIDI_IOCTL_DRAIN _IOW('W', 0x31, int)
SNDRV_RAWMIDI_IOCTL_DRAIN = _IOW('W', 0x31, int),
};
/* /*
* Timer section - /dev/snd/timer * Timer section - /dev/snd/timer
...@@ -654,23 +645,21 @@ struct snd_timer_status { ...@@ -654,23 +645,21 @@ struct snd_timer_status {
unsigned char reserved[64]; /* reserved */ unsigned char reserved[64]; /* reserved */
}; };
enum { #define SNDRV_TIMER_IOCTL_PVERSION _IOR('T', 0x00, int)
SNDRV_TIMER_IOCTL_PVERSION = _IOR('T', 0x00, int), #define SNDRV_TIMER_IOCTL_NEXT_DEVICE _IOWR('T', 0x01, struct snd_timer_id)
SNDRV_TIMER_IOCTL_NEXT_DEVICE = _IOWR('T', 0x01, struct snd_timer_id), #define SNDRV_TIMER_IOCTL_TREAD _IOW('T', 0x02, int)
SNDRV_TIMER_IOCTL_TREAD = _IOW('T', 0x02, int), #define SNDRV_TIMER_IOCTL_GINFO _IOWR('T', 0x03, struct snd_timer_ginfo)
SNDRV_TIMER_IOCTL_GINFO = _IOWR('T', 0x03, struct snd_timer_ginfo), #define SNDRV_TIMER_IOCTL_GPARAMS _IOW('T', 0x04, struct snd_timer_gparams)
SNDRV_TIMER_IOCTL_GPARAMS = _IOW('T', 0x04, struct snd_timer_gparams), #define SNDRV_TIMER_IOCTL_GSTATUS _IOWR('T', 0x05, struct snd_timer_gstatus)
SNDRV_TIMER_IOCTL_GSTATUS = _IOWR('T', 0x05, struct snd_timer_gstatus), #define SNDRV_TIMER_IOCTL_SELECT _IOW('T', 0x10, struct snd_timer_select)
SNDRV_TIMER_IOCTL_SELECT = _IOW('T', 0x10, struct snd_timer_select), #define SNDRV_TIMER_IOCTL_INFO _IOR('T', 0x11, struct snd_timer_info)
SNDRV_TIMER_IOCTL_INFO = _IOR('T', 0x11, struct snd_timer_info), #define SNDRV_TIMER_IOCTL_PARAMS _IOW('T', 0x12, struct snd_timer_params)
SNDRV_TIMER_IOCTL_PARAMS = _IOW('T', 0x12, struct snd_timer_params), #define SNDRV_TIMER_IOCTL_STATUS _IOR('T', 0x14, struct snd_timer_status)
SNDRV_TIMER_IOCTL_STATUS = _IOR('T', 0x14, struct snd_timer_status), /* The following four ioctls are changed since 1.0.9 due to confliction */
/* The following four ioctls are changed since 1.0.9 due to confliction */ #define SNDRV_TIMER_IOCTL_START _IO('T', 0xa0)
SNDRV_TIMER_IOCTL_START = _IO('T', 0xa0), #define SNDRV_TIMER_IOCTL_STOP _IO('T', 0xa1)
SNDRV_TIMER_IOCTL_STOP = _IO('T', 0xa1), #define SNDRV_TIMER_IOCTL_CONTINUE _IO('T', 0xa2)
SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0xa2), #define SNDRV_TIMER_IOCTL_PAUSE _IO('T', 0xa3)
SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0xa3),
};
struct snd_timer_read { struct snd_timer_read {
unsigned int resolution; unsigned int resolution;
...@@ -847,33 +836,31 @@ struct snd_ctl_tlv { ...@@ -847,33 +836,31 @@ struct snd_ctl_tlv {
unsigned int tlv[0]; /* first TLV */ unsigned int tlv[0]; /* first TLV */
}; };
enum { #define SNDRV_CTL_IOCTL_PVERSION _IOR('U', 0x00, int)
SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int), #define SNDRV_CTL_IOCTL_CARD_INFO _IOR('U', 0x01, struct snd_ctl_card_info)
SNDRV_CTL_IOCTL_CARD_INFO = _IOR('U', 0x01, struct snd_ctl_card_info), #define SNDRV_CTL_IOCTL_ELEM_LIST _IOWR('U', 0x10, struct snd_ctl_elem_list)
SNDRV_CTL_IOCTL_ELEM_LIST = _IOWR('U', 0x10, struct snd_ctl_elem_list), #define SNDRV_CTL_IOCTL_ELEM_INFO _IOWR('U', 0x11, struct snd_ctl_elem_info)
SNDRV_CTL_IOCTL_ELEM_INFO = _IOWR('U', 0x11, struct snd_ctl_elem_info), #define SNDRV_CTL_IOCTL_ELEM_READ _IOWR('U', 0x12, struct snd_ctl_elem_value)
SNDRV_CTL_IOCTL_ELEM_READ = _IOWR('U', 0x12, struct snd_ctl_elem_value), #define SNDRV_CTL_IOCTL_ELEM_WRITE _IOWR('U', 0x13, struct snd_ctl_elem_value)
SNDRV_CTL_IOCTL_ELEM_WRITE = _IOWR('U', 0x13, struct snd_ctl_elem_value), #define SNDRV_CTL_IOCTL_ELEM_LOCK _IOW('U', 0x14, struct snd_ctl_elem_id)
SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct snd_ctl_elem_id), #define SNDRV_CTL_IOCTL_ELEM_UNLOCK _IOW('U', 0x15, struct snd_ctl_elem_id)
SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct snd_ctl_elem_id), #define SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS _IOWR('U', 0x16, int)
SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int), #define SNDRV_CTL_IOCTL_ELEM_ADD _IOWR('U', 0x17, struct snd_ctl_elem_info)
SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct snd_ctl_elem_info), #define SNDRV_CTL_IOCTL_ELEM_REPLACE _IOWR('U', 0x18, struct snd_ctl_elem_info)
SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct snd_ctl_elem_info), #define SNDRV_CTL_IOCTL_ELEM_REMOVE _IOWR('U', 0x19, struct snd_ctl_elem_id)
SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id), #define SNDRV_CTL_IOCTL_TLV_READ _IOWR('U', 0x1a, struct snd_ctl_tlv)
SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv), #define SNDRV_CTL_IOCTL_TLV_WRITE _IOWR('U', 0x1b, struct snd_ctl_tlv)
SNDRV_CTL_IOCTL_TLV_WRITE = _IOWR('U', 0x1b, struct snd_ctl_tlv), #define SNDRV_CTL_IOCTL_TLV_COMMAND _IOWR('U', 0x1c, struct snd_ctl_tlv)
SNDRV_CTL_IOCTL_TLV_COMMAND = _IOWR('U', 0x1c, struct snd_ctl_tlv), #define SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE _IOWR('U', 0x20, int)
SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int), #define SNDRV_CTL_IOCTL_HWDEP_INFO _IOR('U', 0x21, struct snd_hwdep_info)
SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info), #define SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE _IOR('U', 0x30, int)
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int), #define SNDRV_CTL_IOCTL_PCM_INFO _IOWR('U', 0x31, struct snd_pcm_info)
SNDRV_CTL_IOCTL_PCM_INFO = _IOWR('U', 0x31, struct snd_pcm_info), #define SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE _IOW('U', 0x32, int)
SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE = _IOW('U', 0x32, int), #define SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE _IOWR('U', 0x40, int)
SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE = _IOWR('U', 0x40, int), #define SNDRV_CTL_IOCTL_RAWMIDI_INFO _IOWR('U', 0x41, struct snd_rawmidi_info)
SNDRV_CTL_IOCTL_RAWMIDI_INFO = _IOWR('U', 0x41, struct snd_rawmidi_info), #define SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE _IOW('U', 0x42, int)
SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE = _IOW('U', 0x42, int), #define SNDRV_CTL_IOCTL_POWER _IOWR('U', 0xd0, int)
SNDRV_CTL_IOCTL_POWER = _IOWR('U', 0xd0, int), #define SNDRV_CTL_IOCTL_POWER_STATE _IOR('U', 0xd1, int)
SNDRV_CTL_IOCTL_POWER_STATE = _IOR('U', 0xd1, int),
};
/* /*
* Read interface. * Read interface.
...@@ -919,18 +906,4 @@ struct snd_ctl_event { ...@@ -919,18 +906,4 @@ struct snd_ctl_event {
#define SNDRV_CTL_NAME_IEC958_PCM_STREAM "PCM Stream" #define SNDRV_CTL_NAME_IEC958_PCM_STREAM "PCM Stream"
#define SNDRV_CTL_NAME_IEC958(expl,direction,what) "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what #define SNDRV_CTL_NAME_IEC958(expl,direction,what) "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what
/*
*
*/
struct snd_xferv {
const struct iovec *vector;
unsigned long count;
};
enum {
SNDRV_IOCTL_READV = _IOW('K', 0x00, struct snd_xferv),
SNDRV_IOCTL_WRITEV = _IOW('K', 0x01, struct snd_xferv),
};
#endif /* __SOUND_ASOUND_H */ #endif /* __SOUND_ASOUND_H */
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