diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:05:16 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:17:57 -0500 |
commit | 080dece3460b534bedc4ef4ba3abaa57e9486331 (patch) | |
tree | 7e35242b3d716cd29f62d96e0920230147cb5c03 /include/sound | |
parent | 19ac31e82cc7328c01bf26f824f33c7c38cb6075 (diff) |
[ALSA] Remove xxx_t typedefs: Sequencer OSS-emulation
Modules: ALSA<-OSS sequencer,ALSA sequencer
Remove xxx_t typedefs from the core sequencer OSS-emulation codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/seq_oss.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/include/sound/seq_oss.h b/include/sound/seq_oss.h index bd7e57322ab6..9b060bbd6e02 100644 --- a/include/sound/seq_oss.h +++ b/include/sound/seq_oss.h | |||
@@ -25,22 +25,16 @@ | |||
25 | #include "seq_kernel.h" | 25 | #include "seq_kernel.h" |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * type definitions | ||
29 | */ | ||
30 | typedef struct snd_seq_oss_arg_t snd_seq_oss_arg_t; | ||
31 | typedef struct snd_seq_oss_callback_t snd_seq_oss_callback_t; | ||
32 | |||
33 | /* | ||
34 | * argument structure for synthesizer operations | 28 | * argument structure for synthesizer operations |
35 | */ | 29 | */ |
36 | struct snd_seq_oss_arg_t { | 30 | struct snd_seq_oss_arg { |
37 | /* given by OSS sequencer */ | 31 | /* given by OSS sequencer */ |
38 | int app_index; /* application unique index */ | 32 | int app_index; /* application unique index */ |
39 | int file_mode; /* file mode - see below */ | 33 | int file_mode; /* file mode - see below */ |
40 | int seq_mode; /* sequencer mode - see below */ | 34 | int seq_mode; /* sequencer mode - see below */ |
41 | 35 | ||
42 | /* following must be initialized in open callback */ | 36 | /* following must be initialized in open callback */ |
43 | snd_seq_addr_t addr; /* opened port address */ | 37 | struct snd_seq_addr addr; /* opened port address */ |
44 | void *private_data; /* private data for lowlevel drivers */ | 38 | void *private_data; /* private data for lowlevel drivers */ |
45 | 39 | ||
46 | /* note-on event passing mode: initially given by OSS seq, | 40 | /* note-on event passing mode: initially given by OSS seq, |
@@ -53,14 +47,14 @@ struct snd_seq_oss_arg_t { | |||
53 | /* | 47 | /* |
54 | * synthesizer operation callbacks | 48 | * synthesizer operation callbacks |
55 | */ | 49 | */ |
56 | struct snd_seq_oss_callback_t { | 50 | struct snd_seq_oss_callback { |
57 | struct module *owner; | 51 | struct module *owner; |
58 | int (*open)(snd_seq_oss_arg_t *p, void *closure); | 52 | int (*open)(struct snd_seq_oss_arg *p, void *closure); |
59 | int (*close)(snd_seq_oss_arg_t *p); | 53 | int (*close)(struct snd_seq_oss_arg *p); |
60 | int (*ioctl)(snd_seq_oss_arg_t *p, unsigned int cmd, unsigned long arg); | 54 | int (*ioctl)(struct snd_seq_oss_arg *p, unsigned int cmd, unsigned long arg); |
61 | int (*load_patch)(snd_seq_oss_arg_t *p, int format, const char __user *buf, int offs, int count); | 55 | int (*load_patch)(struct snd_seq_oss_arg *p, int format, const char __user *buf, int offs, int count); |
62 | int (*reset)(snd_seq_oss_arg_t *p); | 56 | int (*reset)(struct snd_seq_oss_arg *p); |
63 | int (*raw_event)(snd_seq_oss_arg_t *p, unsigned char *data); | 57 | int (*raw_event)(struct snd_seq_oss_arg *p, unsigned char *data); |
64 | }; | 58 | }; |
65 | 59 | ||
66 | /* flag: file_mode */ | 60 | /* flag: file_mode */ |
@@ -88,13 +82,13 @@ struct snd_seq_oss_callback_t { | |||
88 | /* | 82 | /* |
89 | * data pointer to snd_seq_register_device | 83 | * data pointer to snd_seq_register_device |
90 | */ | 84 | */ |
91 | typedef struct snd_seq_oss_reg { | 85 | struct snd_seq_oss_reg { |
92 | int type; | 86 | int type; |
93 | int subtype; | 87 | int subtype; |
94 | int nvoices; | 88 | int nvoices; |
95 | snd_seq_oss_callback_t oper; | 89 | struct snd_seq_oss_callback oper; |
96 | void *private_data; | 90 | void *private_data; |
97 | } snd_seq_oss_reg_t; | 91 | }; |
98 | 92 | ||
99 | /* device id */ | 93 | /* device id */ |
100 | #define SNDRV_SEQ_DEV_ID_OSS "seq-oss" | 94 | #define SNDRV_SEQ_DEV_ID_OSS "seq-oss" |