aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/hwdep.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 07:58:21 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:17:38 -0500
commitd9a98de218ce18befabb5782c43cb4a2766b4b02 (patch)
tree4fbacff1ed8122c4a6a6d2d281b62203987e0a47 /include/sound/hwdep.h
parent48c9d417d7269da2a2da5b602fcb5fdbee36305e (diff)
[ALSA] Remove xxx_t typedefs: Hwdep
Modules: HWDEP Midlevel Remove xxx_t typedefs from the core hwdep codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/hwdep.h')
-rw-r--r--include/sound/hwdep.h42
1 files changed, 20 insertions, 22 deletions
diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index 043876348fa1..04b20bc4f144 100644
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -25,27 +25,24 @@
25#include <sound/asound.h> 25#include <sound/asound.h>
26#include <linux/poll.h> 26#include <linux/poll.h>
27 27
28typedef enum sndrv_hwdep_iface snd_hwdep_iface_t; 28struct snd_hwdep;
29typedef struct sndrv_hwdep_info snd_hwdep_info_t;
30typedef struct sndrv_hwdep_dsp_status snd_hwdep_dsp_status_t;
31typedef struct sndrv_hwdep_dsp_image snd_hwdep_dsp_image_t;
32 29
33typedef struct _snd_hwdep_ops { 30struct snd_hwdep_ops {
34 long long (*llseek) (snd_hwdep_t *hw, struct file * file, long long offset, int orig); 31 long long (*llseek) (struct snd_hwdep *hw, struct file * file, long long offset, int orig);
35 long (*read) (snd_hwdep_t * hw, char __user *buf, long count, loff_t *offset); 32 long (*read) (struct snd_hwdep *hw, char __user *buf, long count, loff_t *offset);
36 long (*write) (snd_hwdep_t * hw, const char __user *buf, long count, loff_t *offset); 33 long (*write) (struct snd_hwdep *hw, const char __user *buf, long count, loff_t *offset);
37 int (*open) (snd_hwdep_t * hw, struct file * file); 34 int (*open) (struct snd_hwdep * hw, struct file * file);
38 int (*release) (snd_hwdep_t * hw, struct file * file); 35 int (*release) (struct snd_hwdep *hw, struct file * file);
39 unsigned int (*poll) (snd_hwdep_t * hw, struct file * file, poll_table * wait); 36 unsigned int (*poll) (struct snd_hwdep *hw, struct file * file, poll_table * wait);
40 int (*ioctl) (snd_hwdep_t * hw, struct file * file, unsigned int cmd, unsigned long arg); 37 int (*ioctl) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
41 int (*ioctl_compat) (snd_hwdep_t * hw, struct file * file, unsigned int cmd, unsigned long arg); 38 int (*ioctl_compat) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
42 int (*mmap) (snd_hwdep_t * hw, struct file * file, struct vm_area_struct * vma); 39 int (*mmap) (struct snd_hwdep *hw, struct file * file, struct vm_area_struct * vma);
43 int (*dsp_status) (snd_hwdep_t * hw, snd_hwdep_dsp_status_t * status); 40 int (*dsp_status) (struct snd_hwdep *hw, struct snd_hwdep_dsp_status *status);
44 int (*dsp_load) (snd_hwdep_t * hw, snd_hwdep_dsp_image_t * image); 41 int (*dsp_load) (struct snd_hwdep *hw, struct snd_hwdep_dsp_image *image);
45} snd_hwdep_ops_t; 42};
46 43
47struct _snd_hwdep { 44struct snd_hwdep {
48 snd_card_t *card; 45 struct snd_card *card;
49 int device; 46 int device;
50 char id[32]; 47 char id[32];
51 char name[80]; 48 char name[80];
@@ -57,10 +54,10 @@ struct _snd_hwdep {
57 int ossreg; 54 int ossreg;
58#endif 55#endif
59 56
60 snd_hwdep_ops_t ops; 57 struct snd_hwdep_ops ops;
61 wait_queue_head_t open_wait; 58 wait_queue_head_t open_wait;
62 void *private_data; 59 void *private_data;
63 void (*private_free) (snd_hwdep_t *hwdep); 60 void (*private_free) (struct snd_hwdep *hwdep);
64 61
65 struct semaphore open_mutex; 62 struct semaphore open_mutex;
66 int used; 63 int used;
@@ -68,6 +65,7 @@ struct _snd_hwdep {
68 unsigned int exclusive: 1; 65 unsigned int exclusive: 1;
69}; 66};
70 67
71extern int snd_hwdep_new(snd_card_t * card, char *id, int device, snd_hwdep_t ** rhwdep); 68extern int snd_hwdep_new(struct snd_card *card, char *id, int device,
69 struct snd_hwdep **rhwdep);
72 70
73#endif /* __SOUND_HWDEP_H */ 71#endif /* __SOUND_HWDEP_H */