[ALSA] Remove xxx_t typedefs: Core component
Modules: ALSA Core Remove xxx_t typedefs from the core component. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
committed by
Jaroslav Kysela
Jaroslav Kysela
parent
3f05f868f1
commit
512bbd6a85
@ -28,13 +28,6 @@
|
||||
#include <linux/workqueue.h> /* struct workqueue_struct */
|
||||
#include <linux/pm.h> /* pm_message_t */
|
||||
|
||||
/* Typedef's */
|
||||
typedef struct sndrv_interval snd_interval_t;
|
||||
typedef enum sndrv_card_type snd_card_type;
|
||||
typedef struct sndrv_xferi snd_xferi_t;
|
||||
typedef struct sndrv_xfern snd_xfern_t;
|
||||
typedef struct sndrv_xferv snd_xferv_t;
|
||||
|
||||
/* forward declarations */
|
||||
#ifdef CONFIG_PCI
|
||||
struct pci_dev;
|
||||
@ -47,76 +40,50 @@ struct sbus_dev;
|
||||
|
||||
#define SNDRV_DEV_TYPE_RANGE_SIZE 0x1000
|
||||
|
||||
typedef enum {
|
||||
SNDRV_DEV_TOPLEVEL = (0*SNDRV_DEV_TYPE_RANGE_SIZE),
|
||||
SNDRV_DEV_CONTROL,
|
||||
SNDRV_DEV_LOWLEVEL_PRE,
|
||||
SNDRV_DEV_LOWLEVEL_NORMAL = (1*SNDRV_DEV_TYPE_RANGE_SIZE),
|
||||
SNDRV_DEV_PCM,
|
||||
SNDRV_DEV_RAWMIDI,
|
||||
SNDRV_DEV_TIMER,
|
||||
SNDRV_DEV_SEQUENCER,
|
||||
SNDRV_DEV_HWDEP,
|
||||
SNDRV_DEV_INFO,
|
||||
SNDRV_DEV_BUS,
|
||||
SNDRV_DEV_CODEC,
|
||||
SNDRV_DEV_LOWLEVEL = (2*SNDRV_DEV_TYPE_RANGE_SIZE)
|
||||
} snd_device_type_t;
|
||||
typedef int __bitwise snd_device_type_t;
|
||||
#define SNDRV_DEV_TOPLEVEL ((__force snd_device_type_t) 0)
|
||||
#define SNDRV_DEV_CONTROL ((__force snd_device_type_t) 1)
|
||||
#define SNDRV_DEV_LOWLEVEL_PRE ((__force snd_device_type_t) 2)
|
||||
#define SNDRV_DEV_LOWLEVEL_NORMAL ((__force snd_device_type_t) 0x1000)
|
||||
#define SNDRV_DEV_PCM ((__force snd_device_type_t) 0x1001)
|
||||
#define SNDRV_DEV_RAWMIDI ((__force snd_device_type_t) 0x1002)
|
||||
#define SNDRV_DEV_TIMER ((__force snd_device_type_t) 0x1003)
|
||||
#define SNDRV_DEV_SEQUENCER ((__force snd_device_type_t) 0x1004)
|
||||
#define SNDRV_DEV_HWDEP ((__force snd_device_type_t) 0x1005)
|
||||
#define SNDRV_DEV_INFO ((__force snd_device_type_t) 0x1006)
|
||||
#define SNDRV_DEV_BUS ((__force snd_device_type_t) 0x1007)
|
||||
#define SNDRV_DEV_CODEC ((__force snd_device_type_t) 0x1008)
|
||||
#define SNDRV_DEV_LOWLEVEL ((__force snd_device_type_t) 0x2000)
|
||||
|
||||
typedef enum {
|
||||
SNDRV_DEV_BUILD,
|
||||
SNDRV_DEV_REGISTERED,
|
||||
SNDRV_DEV_DISCONNECTED
|
||||
} snd_device_state_t;
|
||||
typedef int __bitwise snd_device_state_t;
|
||||
#define SNDRV_DEV_BUILD ((__force snd_device_state_t) 0)
|
||||
#define SNDRV_DEV_REGISTERED ((__force snd_device_state_t) 1)
|
||||
#define SNDRV_DEV_DISCONNECTED ((__force snd_device_state_t) 2)
|
||||
|
||||
typedef enum {
|
||||
SNDRV_DEV_CMD_PRE = 0,
|
||||
SNDRV_DEV_CMD_NORMAL = 1,
|
||||
SNDRV_DEV_CMD_POST = 2
|
||||
} snd_device_cmd_t;
|
||||
typedef int __bitwise snd_device_cmd_t;
|
||||
#define SNDRV_DEV_CMD_PRE ((__force snd_device_cmd_t) 0)
|
||||
#define SNDRV_DEV_CMD_NORMAL ((__force snd_device_cmd_t) 1)
|
||||
#define SNDRV_DEV_CMD_POST ((__force snd_device_cmd_t) 2)
|
||||
|
||||
typedef struct _snd_card snd_card_t;
|
||||
typedef struct _snd_device snd_device_t;
|
||||
struct snd_device;
|
||||
|
||||
typedef int (snd_dev_free_t)(snd_device_t *device);
|
||||
typedef int (snd_dev_register_t)(snd_device_t *device);
|
||||
typedef int (snd_dev_disconnect_t)(snd_device_t *device);
|
||||
typedef int (snd_dev_unregister_t)(snd_device_t *device);
|
||||
struct snd_device_ops {
|
||||
int (*dev_free)(struct snd_device *dev);
|
||||
int (*dev_register)(struct snd_device *dev);
|
||||
int (*dev_disconnect)(struct snd_device *dev);
|
||||
int (*dev_unregister)(struct snd_device *dev);
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
snd_dev_free_t *dev_free;
|
||||
snd_dev_register_t *dev_register;
|
||||
snd_dev_disconnect_t *dev_disconnect;
|
||||
snd_dev_unregister_t *dev_unregister;
|
||||
} snd_device_ops_t;
|
||||
|
||||
struct _snd_device {
|
||||
struct snd_device {
|
||||
struct list_head list; /* list of registered devices */
|
||||
snd_card_t *card; /* card which holds this device */
|
||||
struct snd_card *card; /* card which holds this device */
|
||||
snd_device_state_t state; /* state of the device */
|
||||
snd_device_type_t type; /* device type */
|
||||
void *device_data; /* device structure */
|
||||
snd_device_ops_t *ops; /* operations */
|
||||
struct snd_device_ops *ops; /* operations */
|
||||
};
|
||||
|
||||
#define snd_device(n) list_entry(n, snd_device_t, list)
|
||||
|
||||
/* various typedefs */
|
||||
|
||||
typedef struct snd_info_entry snd_info_entry_t;
|
||||
typedef struct _snd_pcm snd_pcm_t;
|
||||
typedef struct _snd_pcm_str snd_pcm_str_t;
|
||||
typedef struct _snd_pcm_substream snd_pcm_substream_t;
|
||||
typedef struct _snd_mixer snd_kmixer_t;
|
||||
typedef struct _snd_rawmidi snd_rawmidi_t;
|
||||
typedef struct _snd_ctl_file snd_ctl_file_t;
|
||||
typedef struct _snd_kcontrol snd_kcontrol_t;
|
||||
typedef struct _snd_timer snd_timer_t;
|
||||
typedef struct _snd_timer_instance snd_timer_instance_t;
|
||||
typedef struct _snd_hwdep snd_hwdep_t;
|
||||
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
|
||||
typedef struct _snd_oss_mixer snd_mixer_oss_t;
|
||||
#endif
|
||||
#define snd_device(n) list_entry(n, struct snd_device, list)
|
||||
|
||||
/* monitor files for graceful shutdown (hotplug) */
|
||||
|
||||
@ -129,7 +96,7 @@ struct snd_shutdown_f_ops; /* define it later in init.c */
|
||||
|
||||
/* main structure for soundcard */
|
||||
|
||||
struct _snd_card {
|
||||
struct snd_card {
|
||||
int number; /* number of soundcard (index to
|
||||
snd_cards) */
|
||||
|
||||
@ -143,7 +110,7 @@ struct _snd_card {
|
||||
struct module *module; /* top-level module */
|
||||
|
||||
void *private_data; /* private data for soundcard */
|
||||
void (*private_free) (snd_card_t *card); /* callback for freeing of
|
||||
void (*private_free) (struct snd_card *card); /* callback for freeing of
|
||||
private data */
|
||||
struct list_head devices; /* devices */
|
||||
|
||||
@ -155,8 +122,8 @@ struct _snd_card {
|
||||
struct list_head controls; /* all controls for this card */
|
||||
struct list_head ctl_files; /* active control files */
|
||||
|
||||
snd_info_entry_t *proc_root; /* root for soundcard specific files */
|
||||
snd_info_entry_t *proc_id; /* the card id */
|
||||
struct snd_info_entry *proc_root; /* root for soundcard specific files */
|
||||
struct snd_info_entry *proc_id; /* the card id */
|
||||
struct proc_dir_entry *proc_root_link; /* number link to real id */
|
||||
|
||||
struct snd_monitor_file *files; /* all files associated to this card */
|
||||
@ -172,8 +139,8 @@ struct _snd_card {
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
int (*pm_suspend)(snd_card_t *card, pm_message_t state);
|
||||
int (*pm_resume)(snd_card_t *card);
|
||||
int (*pm_suspend)(struct snd_card *card, pm_message_t state);
|
||||
int (*pm_resume)(struct snd_card *card);
|
||||
void *pm_private_data;
|
||||
unsigned int power_state; /* power state */
|
||||
struct semaphore power_lock; /* power lock */
|
||||
@ -181,43 +148,43 @@ struct _snd_card {
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
|
||||
snd_mixer_oss_t *mixer_oss;
|
||||
struct snd_mixer_oss *mixer_oss;
|
||||
int mixer_oss_change_count;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static inline void snd_power_lock(snd_card_t *card)
|
||||
static inline void snd_power_lock(struct snd_card *card)
|
||||
{
|
||||
down(&card->power_lock);
|
||||
}
|
||||
|
||||
static inline void snd_power_unlock(snd_card_t *card)
|
||||
static inline void snd_power_unlock(struct snd_card *card)
|
||||
{
|
||||
up(&card->power_lock);
|
||||
}
|
||||
|
||||
static inline unsigned int snd_power_get_state(snd_card_t *card)
|
||||
static inline unsigned int snd_power_get_state(struct snd_card *card)
|
||||
{
|
||||
return card->power_state;
|
||||
}
|
||||
|
||||
static inline void snd_power_change_state(snd_card_t *card, unsigned int state)
|
||||
static inline void snd_power_change_state(struct snd_card *card, unsigned int state)
|
||||
{
|
||||
card->power_state = state;
|
||||
wake_up(&card->power_sleep);
|
||||
}
|
||||
|
||||
/* init.c */
|
||||
int snd_power_wait(snd_card_t *card, unsigned int power_state, struct file *file);
|
||||
int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file *file);
|
||||
|
||||
int snd_card_set_pm_callback(snd_card_t *card,
|
||||
int (*suspend)(snd_card_t *, pm_message_t),
|
||||
int (*resume)(snd_card_t *),
|
||||
int snd_card_set_pm_callback(struct snd_card *card,
|
||||
int (*suspend)(struct snd_card *, pm_message_t),
|
||||
int (*resume)(struct snd_card *),
|
||||
void *private_data);
|
||||
int snd_card_set_generic_pm_callback(snd_card_t *card,
|
||||
int (*suspend)(snd_card_t *, pm_message_t),
|
||||
int (*resume)(snd_card_t *),
|
||||
int snd_card_set_generic_pm_callback(struct snd_card *card,
|
||||
int (*suspend)(struct snd_card *, pm_message_t),
|
||||
int (*resume)(struct snd_card *),
|
||||
void *private_data);
|
||||
#define snd_card_set_isa_pm_callback(card,suspend,resume,data) \
|
||||
snd_card_set_generic_pm_callback(card, suspend, resume, data)
|
||||
@ -231,7 +198,7 @@ int snd_card_pci_resume(struct pci_dev *dev);
|
||||
|
||||
#define snd_power_lock(card) do { (void)(card); } while (0)
|
||||
#define snd_power_unlock(card) do { (void)(card); } while (0)
|
||||
static inline int snd_power_wait(snd_card_t *card, unsigned int state, struct file *file) { return 0; }
|
||||
static inline int snd_power_wait(struct snd_card *card, unsigned int state, struct file *file) { return 0; }
|
||||
#define snd_power_get_state(card) SNDRV_CTL_POWER_D0
|
||||
#define snd_power_change_state(card, state) do { (void)(card); } while (0)
|
||||
#define snd_card_set_pm_callback(card,suspend,resume,data)
|
||||
@ -241,7 +208,7 @@ static inline int snd_power_wait(snd_card_t *card, unsigned int state, struct fi
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
struct _snd_minor {
|
||||
struct snd_minor {
|
||||
struct list_head list; /* list of all minors per card */
|
||||
int number; /* minor number */
|
||||
int device; /* device number */
|
||||
@ -251,8 +218,6 @@ struct _snd_minor {
|
||||
structure) */
|
||||
};
|
||||
|
||||
typedef struct _snd_minor snd_minor_t;
|
||||
|
||||
/* sound.c */
|
||||
|
||||
extern int snd_major;
|
||||
@ -260,12 +225,12 @@ extern int snd_ecards_limit;
|
||||
|
||||
void snd_request_card(int card);
|
||||
|
||||
int snd_register_device(int type, snd_card_t *card, int dev, snd_minor_t *reg, const char *name);
|
||||
int snd_unregister_device(int type, snd_card_t *card, int dev);
|
||||
int snd_register_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name);
|
||||
int snd_unregister_device(int type, struct snd_card *card, int dev);
|
||||
|
||||
#ifdef CONFIG_SND_OSSEMUL
|
||||
int snd_register_oss_device(int type, snd_card_t *card, int dev, snd_minor_t *reg, const char *name);
|
||||
int snd_unregister_oss_device(int type, snd_card_t *card, int dev);
|
||||
int snd_register_oss_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name);
|
||||
int snd_unregister_oss_device(int type, struct snd_card *card, int dev);
|
||||
#endif
|
||||
|
||||
int snd_minor_info_init(void);
|
||||
@ -291,43 +256,43 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
|
||||
/* init.c */
|
||||
|
||||
extern unsigned int snd_cards_lock;
|
||||
extern snd_card_t *snd_cards[SNDRV_CARDS];
|
||||
extern struct snd_card *snd_cards[SNDRV_CARDS];
|
||||
extern rwlock_t snd_card_rwlock;
|
||||
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
|
||||
#define SND_MIXER_OSS_NOTIFY_REGISTER 0
|
||||
#define SND_MIXER_OSS_NOTIFY_DISCONNECT 1
|
||||
#define SND_MIXER_OSS_NOTIFY_FREE 2
|
||||
extern int (*snd_mixer_oss_notify_callback)(snd_card_t *card, int cmd);
|
||||
extern int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int cmd);
|
||||
#endif
|
||||
|
||||
snd_card_t *snd_card_new(int idx, const char *id,
|
||||
struct snd_card *snd_card_new(int idx, const char *id,
|
||||
struct module *module, int extra_size);
|
||||
int snd_card_disconnect(snd_card_t *card);
|
||||
int snd_card_free(snd_card_t *card);
|
||||
int snd_card_free_in_thread(snd_card_t *card);
|
||||
int snd_card_register(snd_card_t *card);
|
||||
int snd_card_disconnect(struct snd_card *card);
|
||||
int snd_card_free(struct snd_card *card);
|
||||
int snd_card_free_in_thread(struct snd_card *card);
|
||||
int snd_card_register(struct snd_card *card);
|
||||
int snd_card_info_init(void);
|
||||
int snd_card_info_done(void);
|
||||
int snd_component_add(snd_card_t *card, const char *component);
|
||||
int snd_card_file_add(snd_card_t *card, struct file *file);
|
||||
int snd_card_file_remove(snd_card_t *card, struct file *file);
|
||||
int snd_component_add(struct snd_card *card, const char *component);
|
||||
int snd_card_file_add(struct snd_card *card, struct file *file);
|
||||
int snd_card_file_remove(struct snd_card *card, struct file *file);
|
||||
|
||||
#ifndef snd_card_set_dev
|
||||
#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))
|
||||
#endif
|
||||
/* register a generic device (for ISA, etc) */
|
||||
int snd_card_set_generic_dev(snd_card_t *card);
|
||||
int snd_card_set_generic_dev(struct snd_card *card);
|
||||
|
||||
/* device.c */
|
||||
|
||||
int snd_device_new(snd_card_t *card, snd_device_type_t type,
|
||||
void *device_data, snd_device_ops_t *ops);
|
||||
int snd_device_register(snd_card_t *card, void *device_data);
|
||||
int snd_device_register_all(snd_card_t *card);
|
||||
int snd_device_disconnect(snd_card_t *card, void *device_data);
|
||||
int snd_device_disconnect_all(snd_card_t *card);
|
||||
int snd_device_free(snd_card_t *card, void *device_data);
|
||||
int snd_device_free_all(snd_card_t *card, snd_device_cmd_t cmd);
|
||||
int snd_device_new(struct snd_card *card, snd_device_type_t type,
|
||||
void *device_data, struct snd_device_ops *ops);
|
||||
int snd_device_register(struct snd_card *card, void *device_data);
|
||||
int snd_device_register_all(struct snd_card *card);
|
||||
int snd_device_disconnect(struct snd_card *card, void *device_data);
|
||||
int snd_device_disconnect_all(struct snd_card *card);
|
||||
int snd_device_free(struct snd_card *card, void *device_data);
|
||||
int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd);
|
||||
|
||||
/* isadma.c */
|
||||
|
||||
@ -443,4 +408,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "typedefs.h"
|
||||
|
||||
#endif /* __SOUND_CORE_H */
|
||||
|
||||
Reference in New Issue
Block a user