diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:13:14 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:04 -0500 |
commit | 5b1646a8eceff0a4ff06f309abb6e7f43f99a498 (patch) | |
tree | ecbb7c1d5ffdf2f3f732a18aae3ed6b2a3752e9e /include/sound/asound_fm.h | |
parent | e1fad17bb4084dc7c435360185417aed55656ec8 (diff) |
[ALSA] Remove xxx_t typedefs: OPL3
Modules: OPL3,Raw OPL FM
Remove xxx_t typedefs from the OPL3 driver
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/asound_fm.h')
-rw-r--r-- | include/sound/asound_fm.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/sound/asound_fm.h b/include/sound/asound_fm.h index b0da677f8f75..956fdc23c595 100644 --- a/include/sound/asound_fm.h +++ b/include/sound/asound_fm.h | |||
@@ -29,16 +29,16 @@ | |||
29 | #define SNDRV_DM_FM_MODE_OPL2 0x00 | 29 | #define SNDRV_DM_FM_MODE_OPL2 0x00 |
30 | #define SNDRV_DM_FM_MODE_OPL3 0x01 | 30 | #define SNDRV_DM_FM_MODE_OPL3 0x01 |
31 | 31 | ||
32 | typedef struct snd_dm_fm_info { | 32 | struct snd_dm_fm_info { |
33 | unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ | 33 | unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ |
34 | unsigned char rhythm; /* percussion mode flag */ | 34 | unsigned char rhythm; /* percussion mode flag */ |
35 | } snd_dm_fm_info_t; | 35 | }; |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Data structure composing an FM "note" or sound event. | 38 | * Data structure composing an FM "note" or sound event. |
39 | */ | 39 | */ |
40 | 40 | ||
41 | typedef struct snd_dm_fm_voice { | 41 | struct snd_dm_fm_voice { |
42 | unsigned char op; /* operator cell (0 or 1) */ | 42 | unsigned char op; /* operator cell (0 or 1) */ |
43 | unsigned char voice; /* FM voice (0 to 17) */ | 43 | unsigned char voice; /* FM voice (0 to 17) */ |
44 | 44 | ||
@@ -60,25 +60,25 @@ typedef struct snd_dm_fm_voice { | |||
60 | unsigned char left; /* stereo left */ | 60 | unsigned char left; /* stereo left */ |
61 | unsigned char right; /* stereo right */ | 61 | unsigned char right; /* stereo right */ |
62 | unsigned char waveform; /* 3 bits: waveform shape */ | 62 | unsigned char waveform; /* 3 bits: waveform shape */ |
63 | } snd_dm_fm_voice_t; | 63 | }; |
64 | 64 | ||
65 | /* | 65 | /* |
66 | * This describes an FM note by its voice, octave, frequency number (10bit) | 66 | * This describes an FM note by its voice, octave, frequency number (10bit) |
67 | * and key on/off. | 67 | * and key on/off. |
68 | */ | 68 | */ |
69 | 69 | ||
70 | typedef struct snd_dm_fm_note { | 70 | struct snd_dm_fm_note { |
71 | unsigned char voice; /* 0-17 voice channel */ | 71 | unsigned char voice; /* 0-17 voice channel */ |
72 | unsigned char octave; /* 3 bits: what octave to play */ | 72 | unsigned char octave; /* 3 bits: what octave to play */ |
73 | unsigned int fnum; /* 10 bits: frequency number */ | 73 | unsigned int fnum; /* 10 bits: frequency number */ |
74 | unsigned char key_on; /* set for active, clear for silent */ | 74 | unsigned char key_on; /* set for active, clear for silent */ |
75 | } snd_dm_fm_note_t; | 75 | }; |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * FM parameters that apply globally to all voices, and thus are not "notes" | 78 | * FM parameters that apply globally to all voices, and thus are not "notes" |
79 | */ | 79 | */ |
80 | 80 | ||
81 | typedef struct snd_dm_fm_params { | 81 | struct snd_dm_fm_params { |
82 | unsigned char am_depth; /* amplitude modulation depth (1=hi) */ | 82 | unsigned char am_depth; /* amplitude modulation depth (1=hi) */ |
83 | unsigned char vib_depth; /* vibrato depth (1=hi) */ | 83 | unsigned char vib_depth; /* vibrato depth (1=hi) */ |
84 | unsigned char kbd_split; /* keyboard split */ | 84 | unsigned char kbd_split; /* keyboard split */ |
@@ -90,17 +90,17 @@ typedef struct snd_dm_fm_params { | |||
90 | unsigned char tomtom; | 90 | unsigned char tomtom; |
91 | unsigned char cymbal; | 91 | unsigned char cymbal; |
92 | unsigned char hihat; | 92 | unsigned char hihat; |
93 | } snd_dm_fm_params_t; | 93 | }; |
94 | 94 | ||
95 | /* | 95 | /* |
96 | * FM mode ioctl settings | 96 | * FM mode ioctl settings |
97 | */ | 97 | */ |
98 | 98 | ||
99 | #define SNDRV_DM_FM_IOCTL_INFO _IOR('H', 0x20, snd_dm_fm_info_t) | 99 | #define SNDRV_DM_FM_IOCTL_INFO _IOR('H', 0x20, struct snd_dm_fm_info) |
100 | #define SNDRV_DM_FM_IOCTL_RESET _IO ('H', 0x21) | 100 | #define SNDRV_DM_FM_IOCTL_RESET _IO ('H', 0x21) |
101 | #define SNDRV_DM_FM_IOCTL_PLAY_NOTE _IOW('H', 0x22, snd_dm_fm_note_t) | 101 | #define SNDRV_DM_FM_IOCTL_PLAY_NOTE _IOW('H', 0x22, struct snd_dm_fm_note) |
102 | #define SNDRV_DM_FM_IOCTL_SET_VOICE _IOW('H', 0x23, snd_dm_fm_voice_t) | 102 | #define SNDRV_DM_FM_IOCTL_SET_VOICE _IOW('H', 0x23, struct snd_dm_fm_voice) |
103 | #define SNDRV_DM_FM_IOCTL_SET_PARAMS _IOW('H', 0x24, snd_dm_fm_params_t) | 103 | #define SNDRV_DM_FM_IOCTL_SET_PARAMS _IOW('H', 0x24, struct snd_dm_fm_params) |
104 | #define SNDRV_DM_FM_IOCTL_SET_MODE _IOW('H', 0x25, int) | 104 | #define SNDRV_DM_FM_IOCTL_SET_MODE _IOW('H', 0x25, int) |
105 | /* for OPL3 only */ | 105 | /* for OPL3 only */ |
106 | #define SNDRV_DM_FM_IOCTL_SET_CONNECTION _IOW('H', 0x26, int) | 106 | #define SNDRV_DM_FM_IOCTL_SET_CONNECTION _IOW('H', 0x26, int) |