Simple cases of overlapping changes in the packet scheduler. Must easier to resolve this time. Which probably means that I screwed it up somehow.
Showing the changes to include/uapi (1 of 148 files). Show all
Unified · Split
| @@ -94,7 +94,7 @@ enum { · 93 unmodified lines | |||
| 94 | SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ | 94 | SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ |
| 95 | SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ | 95 | SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ |
| 96 | SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ | 96 | SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ |
| 97 | SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ | 97 | SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ |
| 98 | SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ | 98 | SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ |
| 99 | SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ | 99 | SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ |
| 100 | SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ | 100 | SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ |
| @@ -384,7 +384,7 @@ struct snd_mask { · 283 unmodified lines | |||
| 384 | 384 | ||
| 385 | struct snd_pcm_hw_params { | 385 | struct snd_pcm_hw_params { |
| 386 | unsigned int flags; | 386 | unsigned int flags; |
| 387 | struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - | 387 | struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - |
| 388 | SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; | 388 | SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; |
| 389 | struct snd_mask mres[5]; /* reserved masks */ | 389 | struct snd_mask mres[5]; /* reserved masks */ |
| 390 | struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - | 390 | struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - |
| @@ -857,7 +857,7 @@ typedef int __bitwise snd_ctl_elem_iface_t; · 466 unmodified lines | |||
| 857 | #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ | 857 | #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ |
| 858 | #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ | 858 | #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ |
| 859 | #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ | 859 | #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ |
| 860 | #define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ | 860 | #define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ |
| 861 | #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ | 861 | #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ |
| 862 | /* bits 30 and 31 are obsoleted (for indirect access) */ | 862 | /* bits 30 and 31 are obsoleted (for indirect access) */ |
| 863 | 863 | ||