diff options
Diffstat (limited to 'include/sound/seq_device.h')
-rw-r--r-- | include/sound/seq_device.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h index 204ca540c28e..2b5f24cc7548 100644 --- a/include/sound/seq_device.h +++ b/include/sound/seq_device.h | |||
@@ -21,9 +21,6 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | typedef struct snd_seq_device snd_seq_device_t; | ||
25 | typedef struct snd_seq_dev_ops snd_seq_dev_ops_t; | ||
26 | |||
27 | /* | 24 | /* |
28 | * registered device information | 25 | * registered device information |
29 | */ | 26 | */ |
@@ -36,7 +33,7 @@ typedef struct snd_seq_dev_ops snd_seq_dev_ops_t; | |||
36 | 33 | ||
37 | struct snd_seq_device { | 34 | struct snd_seq_device { |
38 | /* device info */ | 35 | /* device info */ |
39 | snd_card_t *card; /* sound card */ | 36 | struct snd_card *card; /* sound card */ |
40 | int device; /* device number */ | 37 | int device; /* device number */ |
41 | char id[ID_LEN]; /* driver id */ | 38 | char id[ID_LEN]; /* driver id */ |
42 | char name[80]; /* device name */ | 39 | char name[80]; /* device name */ |
@@ -44,7 +41,7 @@ struct snd_seq_device { | |||
44 | void *driver_data; /* private data for driver */ | 41 | void *driver_data; /* private data for driver */ |
45 | int status; /* flag - read only */ | 42 | int status; /* flag - read only */ |
46 | void *private_data; /* private data for the caller */ | 43 | void *private_data; /* private data for the caller */ |
47 | void (*private_free)(snd_seq_device_t *device); | 44 | void (*private_free)(struct snd_seq_device *device); |
48 | struct list_head list; /* link to next device */ | 45 | struct list_head list; /* link to next device */ |
49 | }; | 46 | }; |
50 | 47 | ||
@@ -63,19 +60,19 @@ struct snd_seq_device { | |||
63 | * Typically, call snd_device_free(dev->card, dev->driver_data) | 60 | * Typically, call snd_device_free(dev->card, dev->driver_data) |
64 | */ | 61 | */ |
65 | struct snd_seq_dev_ops { | 62 | struct snd_seq_dev_ops { |
66 | int (*init_device)(snd_seq_device_t *dev); | 63 | int (*init_device)(struct snd_seq_device *dev); |
67 | int (*free_device)(snd_seq_device_t *dev); | 64 | int (*free_device)(struct snd_seq_device *dev); |
68 | }; | 65 | }; |
69 | 66 | ||
70 | /* | 67 | /* |
71 | * prototypes | 68 | * prototypes |
72 | */ | 69 | */ |
73 | void snd_seq_device_load_drivers(void); | 70 | void snd_seq_device_load_drivers(void); |
74 | int snd_seq_device_new(snd_card_t *card, int device, char *id, int argsize, snd_seq_device_t **result); | 71 | int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result); |
75 | int snd_seq_device_register_driver(char *id, snd_seq_dev_ops_t *entry, int argsize); | 72 | int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize); |
76 | int snd_seq_device_unregister_driver(char *id); | 73 | int snd_seq_device_unregister_driver(char *id); |
77 | 74 | ||
78 | #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(snd_seq_device_t)) | 75 | #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device)) |
79 | 76 | ||
80 | 77 | ||
81 | /* | 78 | /* |
@@ -84,5 +81,4 @@ int snd_seq_device_unregister_driver(char *id); | |||
84 | #define SNDRV_SEQ_DEV_ID_MIDISYNTH "seq-midi" | 81 | #define SNDRV_SEQ_DEV_ID_MIDISYNTH "seq-midi" |
85 | #define SNDRV_SEQ_DEV_ID_OPL3 "opl3-synth" | 82 | #define SNDRV_SEQ_DEV_ID_OPL3 "opl3-synth" |
86 | 83 | ||
87 | |||
88 | #endif /* __SOUND_SEQ_DEVICE_H */ | 84 | #endif /* __SOUND_SEQ_DEVICE_H */ |