git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
sound
/
es1688.h
diff --git
a/include/sound/es1688.h
b/include/sound/es1688.h
index
d390c64
..
fc1c47d
100644
(file)
--- a/
include/sound/es1688.h
+++ b/
include/sound/es1688.h
@@
-30,7
+30,7
@@
#define ES1688_HW_688 0x0001
#define ES1688_HW_1688 0x0002
#define ES1688_HW_688 0x0001
#define ES1688_HW_1688 0x0002
-struct
_
snd_es1688 {
+struct snd_es1688 {
unsigned long port; /* port of ESS chip */
struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */
unsigned long port; /* port of ESS chip */
struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */
@@
-44,19
+44,15
@@
struct _snd_es1688 {
unsigned char pad;
unsigned int dma_size;
unsigned char pad;
unsigned int dma_size;
- s
nd_card_t
*card;
- s
nd_pcm_t
*pcm;
- s
nd_pcm_substream_t
*playback_substream;
- s
nd_pcm_substream_t
*capture_substream;
+ s
truct snd_card
*card;
+ s
truct snd_pcm
*pcm;
+ s
truct snd_pcm_substream
*playback_substream;
+ s
truct snd_pcm_substream
*capture_substream;
spinlock_t reg_lock;
spinlock_t mixer_lock;
};
spinlock_t reg_lock;
spinlock_t mixer_lock;
};
-typedef struct _snd_es1688 es1688_t;
-
-#define chip_t es1688_t
-
/* I/O ports */
#define ES1688P(codec, x) ((codec)->port + e_s_s_ESS1688##x)
/* I/O ports */
#define ES1688P(codec, x) ((codec)->port + e_s_s_ESS1688##x)
@@
-109,20
+105,17
@@
typedef struct _snd_es1688 es1688_t;
*/
*/
-void snd_es1688_mixer_write(es1688_t *chip, unsigned char reg, unsigned char data);
-unsigned char snd_es1688_mixer_read(es1688_t *chip, unsigned char reg);
-
-irqreturn_t snd_es1688_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+void snd_es1688_mixer_write(struct snd_es1688 *chip, unsigned char reg, unsigned char data);
-int snd_es1688_create(s
nd_card_t *
card,
+int snd_es1688_create(s
truct snd_card *
card,
unsigned long port,
unsigned long mpu_port,
int irq,
int mpu_irq,
int dma8,
unsigned short hardware,
unsigned long port,
unsigned long mpu_port,
int irq,
int mpu_irq,
int dma8,
unsigned short hardware,
-
es1688_t
** rchip);
-int snd_es1688_pcm(
es1688_t *chip, int device, snd_pcm_t
** rpcm);
-int snd_es1688_mixer(
es1688_t
*chip);
+
struct snd_es1688
** rchip);
+int snd_es1688_pcm(
struct snd_es1688 *chip, int device, struct snd_pcm
** rpcm);
+int snd_es1688_mixer(
struct snd_es1688
*chip);
#endif /* __SOUND_ES1688_H */
#endif /* __SOUND_ES1688_H */