There are a number of other ioctls that aren't used anywhere inside the Kernel tree. Get rid of them.
Showing the changes to include/uapi/linux (1 of 9 files). Show all
Unified · Split
| @@ -67,27 +67,6 @@ typedef struct audio_status { · 66 unmodified lines | |||
| 67 | } audio_status_t; /* separate decoder hardware */ | 67 | } audio_status_t; /* separate decoder hardware */ |
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | typedef | ||
| 71 | struct audio_karaoke { /* if Vocal1 or Vocal2 are non-zero, they get mixed */ | ||
| 72 | int vocal1; /* into left and right t at 70% each */ | ||
| 73 | int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ | ||
| 74 | int melody; /* mixed into the left channel and */ | ||
| 75 | /* Vocal2 into the right channel at 100% each. */ | ||
| 76 | /* if Melody is non-zero, the melody channel gets mixed*/ | ||
| 77 | } audio_karaoke_t; /* into left and right */ | ||
| 78 | |||
| 79 | |||
| 80 | typedef __u16 audio_attributes_t; | ||
| 81 | /* bits: descr. */ | ||
| 82 | /* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */ | ||
| 83 | /* 12 multichannel extension */ | ||
| 84 | /* 11-10 audio type (0=not spec, 1=language included) */ | ||
| 85 | /* 9- 8 audio application mode (0=not spec, 1=karaoke, 2=surround) */ | ||
| 86 | /* 7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit, */ | ||
| 87 | /* 5- 4 Sample frequency fs (0=48kHz, 1=96kHz) */ | ||
| 88 | /* 2- 0 number of audio channels (n+1 channels) */ | ||
| 89 | |||
| 90 | |||
| 91 | /* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */ | 70 | /* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */ |
| 92 | #define AUDIO_CAP_DTS 1 | 71 | #define AUDIO_CAP_DTS 1 |
| 93 | #define AUDIO_CAP_LPCM 2 | 72 | #define AUDIO_CAP_LPCM 2 |
| @@ -115,22 +94,6 @@ typedef __u16 audio_attributes_t; · 21 unmodified lines | |||
| 115 | #define AUDIO_SET_ID _IO('o', 13) | 94 | #define AUDIO_SET_ID _IO('o', 13) |
| 116 | #define AUDIO_SET_MIXER _IOW('o', 14, audio_mixer_t) | 95 | #define AUDIO_SET_MIXER _IOW('o', 14, audio_mixer_t) |
| 117 | #define AUDIO_SET_STREAMTYPE _IO('o', 15) | 96 | #define AUDIO_SET_STREAMTYPE _IO('o', 15) |
| 118 | #define AUDIO_SET_EXT_ID _IO('o', 16) | ||
| 119 | #define AUDIO_SET_ATTRIBUTES _IOW('o', 17, audio_attributes_t) | ||
| 120 | #define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t) | ||
| 121 | |||
| 122 | /** | ||
| 123 | * AUDIO_GET_PTS | ||
| 124 | * | ||
| 125 | * Read the 33 bit presentation time stamp as defined | ||
| 126 | * in ITU T-REC-H.222.0 / ISO/IEC 13818-1. | ||
| 127 | * | ||
| 128 | * The PTS should belong to the currently played | ||
| 129 | * frame if possible, but may also be a value close to it | ||
| 130 | * like the PTS of the last decoded frame or the last PTS | ||
| 131 | * extracted by the PES parser. | ||
| 132 | */ | ||
| 133 | #define AUDIO_GET_PTS _IOR('o', 19, __u64) | ||
| 134 | #define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20) | 97 | #define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20) |
| 135 | 98 | ||
| 136 | #endif /* _DVBAUDIO_H_ */ | 99 | #endif /* _DVBAUDIO_H_ */ |