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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
drivers
/
opl4
/
opl4_lib.c
diff --git
a/sound/drivers/opl4/opl4_lib.c
b/sound/drivers/opl4/opl4_lib.c
index
ddfc10d
..
01997f2
100644
(file)
--- a/
sound/drivers/opl4/opl4_lib.c
+++ b/
sound/drivers/opl4/opl4_lib.c
@@
-43,6
+43,8
@@
void snd_opl4_write(struct snd_opl4 *opl4, u8 reg, u8 value)
outb(value, opl4->pcm_port + 1);
}
outb(value, opl4->pcm_port + 1);
}
+EXPORT_SYMBOL(snd_opl4_write);
+
u8 snd_opl4_read(struct snd_opl4 *opl4, u8 reg)
{
snd_opl4_wait(opl4);
u8 snd_opl4_read(struct snd_opl4 *opl4, u8 reg)
{
snd_opl4_wait(opl4);
@@
-52,6
+54,8
@@
u8 snd_opl4_read(struct snd_opl4 *opl4, u8 reg)
return inb(opl4->pcm_port + 1);
}
return inb(opl4->pcm_port + 1);
}
+EXPORT_SYMBOL(snd_opl4_read);
+
void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size)
{
unsigned long flags;
void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size)
{
unsigned long flags;
@@
-76,6
+80,8
@@
void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size
spin_unlock_irqrestore(&opl4->reg_lock, flags);
}
spin_unlock_irqrestore(&opl4->reg_lock, flags);
}
+EXPORT_SYMBOL(snd_opl4_read_memory);
+
void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, int size)
{
unsigned long flags;
void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, int size)
{
unsigned long flags;
@@
-100,6
+106,8
@@
void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, i
spin_unlock_irqrestore(&opl4->reg_lock, flags);
}
spin_unlock_irqrestore(&opl4->reg_lock, flags);
}
+EXPORT_SYMBOL(snd_opl4_write_memory);
+
static void snd_opl4_enable_opl4(struct snd_opl4 *opl4)
{
outb(OPL3_REG_MODE, opl4->fm_port + 2);
static void snd_opl4_enable_opl4(struct snd_opl4 *opl4)
{
outb(OPL3_REG_MODE, opl4->fm_port + 2);
@@
-214,7
+222,7
@@
int snd_opl4_create(struct snd_card *card,
opl4->fm_port = fm_port;
opl4->pcm_port = pcm_port;
spin_lock_init(&opl4->reg_lock);
opl4->fm_port = fm_port;
opl4->pcm_port = pcm_port;
spin_lock_init(&opl4->reg_lock);
-
init_MUTEX
(&opl4->access_mutex);
+
mutex_init
(&opl4->access_mutex);
err = snd_opl4_detect(opl4);
if (err < 0) {
err = snd_opl4_detect(opl4);
if (err < 0) {
@@
-256,10
+264,6
@@
int snd_opl4_create(struct snd_card *card,
return 0;
}
return 0;
}
-EXPORT_SYMBOL(snd_opl4_write);
-EXPORT_SYMBOL(snd_opl4_read);
-EXPORT_SYMBOL(snd_opl4_write_memory);
-EXPORT_SYMBOL(snd_opl4_read_memory);
EXPORT_SYMBOL(snd_opl4_create);
static int __init alsa_opl4_init(void)
EXPORT_SYMBOL(snd_opl4_create);
static int __init alsa_opl4_init(void)