diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:24:47 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:14 -0500 |
commit | 03da312ac080b4f5c9359c233b8812cc93a035fe (patch) | |
tree | 1a6767ca18964b53442ecfd538141b12e81b23be /include/sound/util_mem.h | |
parent | ee42381e71c56328db9e9d64d19a4de7a2f09a93 (diff) |
[ALSA] Remove xxx_t typedefs: Emu-X synth
Modules: Common EMU synth,SoundFont,Synth
Remove xxx_t typedefs from the Emu-X synth support.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/util_mem.h')
-rw-r--r-- | include/sound/util_mem.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/include/sound/util_mem.h b/include/sound/util_mem.h index 9d2cdfa0c42a..69944bbb5445 100644 --- a/include/sound/util_mem.h +++ b/include/sound/util_mem.h | |||
@@ -20,29 +20,25 @@ | |||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | typedef struct snd_util_memblk snd_util_memblk_t; | ||
24 | typedef struct snd_util_memhdr snd_util_memhdr_t; | ||
25 | typedef unsigned int snd_util_unit_t; | ||
26 | |||
27 | /* | 23 | /* |
28 | * memory block | 24 | * memory block |
29 | */ | 25 | */ |
30 | struct snd_util_memblk { | 26 | struct snd_util_memblk { |
31 | snd_util_unit_t size; /* size of this block */ | 27 | unsigned int size; /* size of this block */ |
32 | snd_util_unit_t offset; /* zero-offset of this block */ | 28 | unsigned int offset; /* zero-offset of this block */ |
33 | struct list_head list; /* link */ | 29 | struct list_head list; /* link */ |
34 | }; | 30 | }; |
35 | 31 | ||
36 | #define snd_util_memblk_argptr(blk) (void*)((char*)(blk) + sizeof(snd_util_memblk_t)) | 32 | #define snd_util_memblk_argptr(blk) (void*)((char*)(blk) + sizeof(struct snd_util_memblk)) |
37 | 33 | ||
38 | /* | 34 | /* |
39 | * memory management information | 35 | * memory management information |
40 | */ | 36 | */ |
41 | struct snd_util_memhdr { | 37 | struct snd_util_memhdr { |
42 | snd_util_unit_t size; /* size of whole data */ | 38 | unsigned int size; /* size of whole data */ |
43 | struct list_head block; /* block linked-list header */ | 39 | struct list_head block; /* block linked-list header */ |
44 | int nblocks; /* # of allocated blocks */ | 40 | int nblocks; /* # of allocated blocks */ |
45 | snd_util_unit_t used; /* used memory size */ | 41 | unsigned int used; /* used memory size */ |
46 | int block_extra_size; /* extra data size of chunk */ | 42 | int block_extra_size; /* extra data size of chunk */ |
47 | struct semaphore block_mutex; /* lock */ | 43 | struct semaphore block_mutex; /* lock */ |
48 | }; | 44 | }; |
@@ -50,15 +46,17 @@ struct snd_util_memhdr { | |||
50 | /* | 46 | /* |
51 | * prototypes | 47 | * prototypes |
52 | */ | 48 | */ |
53 | snd_util_memhdr_t *snd_util_memhdr_new(int memsize); | 49 | struct snd_util_memhdr *snd_util_memhdr_new(int memsize); |
54 | void snd_util_memhdr_free(snd_util_memhdr_t *hdr); | 50 | void snd_util_memhdr_free(struct snd_util_memhdr *hdr); |
55 | snd_util_memblk_t *snd_util_mem_alloc(snd_util_memhdr_t *hdr, int size); | 51 | struct snd_util_memblk *snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size); |
56 | int snd_util_mem_free(snd_util_memhdr_t *hdr, snd_util_memblk_t *blk); | 52 | int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk); |
57 | int snd_util_mem_avail(snd_util_memhdr_t *hdr); | 53 | int snd_util_mem_avail(struct snd_util_memhdr *hdr); |
58 | 54 | ||
59 | /* functions without mutex */ | 55 | /* functions without mutex */ |
60 | snd_util_memblk_t *__snd_util_mem_alloc(snd_util_memhdr_t *hdr, int size); | 56 | struct snd_util_memblk *__snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size); |
61 | void __snd_util_mem_free(snd_util_memhdr_t *hdr, snd_util_memblk_t *blk); | 57 | void __snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk); |
62 | snd_util_memblk_t *__snd_util_memblk_new(snd_util_memhdr_t *hdr, snd_util_unit_t units, struct list_head *prev); | 58 | struct snd_util_memblk *__snd_util_memblk_new(struct snd_util_memhdr *hdr, |
59 | unsigned int units, | ||
60 | struct list_head *prev); | ||
63 | 61 | ||
64 | #endif /* __SOUND_UTIL_MEM_H */ | 62 | #endif /* __SOUND_UTIL_MEM_H */ |