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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
isa
/
gus
/
gus_main.c
diff --git
a/sound/isa/gus/gus_main.c
b/sound/isa/gus/gus_main.c
index
73f81c1
..
b680fdd
100644
(file)
--- a/
sound/isa/gus/gus_main.c
+++ b/
sound/isa/gus/gus_main.c
@@
-35,21
+35,21
@@
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards");
MODULE_LICENSE("GPL");
-static int snd_gus_init_dma_irq(s
nd_gus_card_t
* gus, int latches);
+static int snd_gus_init_dma_irq(s
truct snd_gus_card
* gus, int latches);
-int snd_gus_use_inc(s
nd_gus_card_t
* gus)
+int snd_gus_use_inc(s
truct snd_gus_card
* gus)
{
if (!try_module_get(gus->card->module))
return 0;
return 1;
}
{
if (!try_module_get(gus->card->module))
return 0;
return 1;
}
-void snd_gus_use_dec(s
nd_gus_card_t
* gus)
+void snd_gus_use_dec(s
truct snd_gus_card
* gus)
{
module_put(gus->card->module);
}
{
module_put(gus->card->module);
}
-static int snd_gus_joystick_info(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+static int snd_gus_joystick_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
@@
-58,17
+58,17
@@
static int snd_gus_joystick_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0;
}
return 0;
}
-static int snd_gus_joystick_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_gus_joystick_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
{
- s
nd_gus_card_t
*gus = snd_kcontrol_chip(kcontrol);
+ s
truct snd_gus_card
*gus = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = gus->joystick_dac & 31;
return 0;
}
ucontrol->value.integer.value[0] = gus->joystick_dac & 31;
return 0;
}
-static int snd_gus_joystick_put(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_gus_joystick_put(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
{
- s
nd_gus_card_t
*gus = snd_kcontrol_chip(kcontrol);
+ s
truct snd_gus_card
*gus = snd_kcontrol_chip(kcontrol);
unsigned long flags;
int change;
unsigned char nval;
unsigned long flags;
int change;
unsigned char nval;
@@
-82,7
+82,7
@@
static int snd_gus_joystick_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return change;
}
return change;
}
-static s
nd_kcontrol_new_t
snd_gus_joystick_control = {
+static s
truct snd_kcontrol_new
snd_gus_joystick_control = {
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
.name = "Joystick Speed",
.info = snd_gus_joystick_info,
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
.name = "Joystick Speed",
.info = snd_gus_joystick_info,
@@
-90,7
+90,7
@@
static snd_kcontrol_new_t snd_gus_joystick_control = {
.put = snd_gus_joystick_put
};
.put = snd_gus_joystick_put
};
-static void snd_gus_init_control(s
nd_gus_card_t
*gus)
+static void snd_gus_init_control(s
truct snd_gus_card
*gus)
{
if (!gus->ace_flag)
snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
{
if (!gus->ace_flag)
snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
@@
-100,7
+100,7
@@
static void snd_gus_init_control(snd_gus_card_t *gus)
*
*/
*
*/
-static int snd_gus_free(s
nd_gus_card_t
*gus)
+static int snd_gus_free(s
truct snd_gus_card
*gus)
{
if (gus->gf1.res_port2 == NULL)
goto __hw_end;
{
if (gus->gf1.res_port2 == NULL)
goto __hw_end;
@@
-113,14
+113,8
@@
static int snd_gus_free(snd_gus_card_t *gus)
snd_gf1_stop(gus);
snd_gus_init_dma_irq(gus, 0);
__hw_end:
snd_gf1_stop(gus);
snd_gus_init_dma_irq(gus, 0);
__hw_end:
- if (gus->gf1.res_port1) {
- release_resource(gus->gf1.res_port1);
- kfree_nocheck(gus->gf1.res_port1);
- }
- if (gus->gf1.res_port2) {
- release_resource(gus->gf1.res_port2);
- kfree_nocheck(gus->gf1.res_port2);
- }
+ release_and_free_resource(gus->gf1.res_port1);
+ release_and_free_resource(gus->gf1.res_port2);
if (gus->gf1.irq >= 0)
free_irq(gus->gf1.irq, (void *) gus);
if (gus->gf1.dma1 >= 0) {
if (gus->gf1.irq >= 0)
free_irq(gus->gf1.irq, (void *) gus);
if (gus->gf1.dma1 >= 0) {
@@
-135,29
+129,29
@@
static int snd_gus_free(snd_gus_card_t *gus)
return 0;
}
return 0;
}
-static int snd_gus_dev_free(s
nd_device_t
*device)
+static int snd_gus_dev_free(s
truct snd_device
*device)
{
{
- s
nd_gus_card_t
*gus = device->device_data;
+ s
truct snd_gus_card
*gus = device->device_data;
return snd_gus_free(gus);
}
return snd_gus_free(gus);
}
-int snd_gus_create(s
nd_card_t *
card,
+int snd_gus_create(s
truct snd_card *
card,
unsigned long port,
int irq, int dma1, int dma2,
int timer_dev,
int voices,
int pcm_channels,
int effect,
unsigned long port,
int irq, int dma1, int dma2,
int timer_dev,
int voices,
int pcm_channels,
int effect,
- s
nd_gus_card_t
**rgus)
+ s
truct snd_gus_card
**rgus)
{
{
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
int err;
int err;
- static s
nd_device_ops_t
ops = {
+ static s
truct snd_device_ops
ops = {
.dev_free = snd_gus_dev_free,
};
*rgus = NULL;
.dev_free = snd_gus_dev_free,
};
*rgus = NULL;
- gus = k
calloc(1,
sizeof(*gus), GFP_KERNEL);
+ gus = k
zalloc(
sizeof(*gus), GFP_KERNEL);
if (gus == NULL)
return -ENOMEM;
gus->gf1.irq = -1;
if (gus == NULL)
return -ENOMEM;
gus->gf1.irq = -1;
@@
-185,7
+179,7
@@
int snd_gus_create(snd_card_t * card,
snd_gus_free(gus);
return -EBUSY;
}
snd_gus_free(gus);
return -EBUSY;
}
- if (irq >= 0 && request_irq(irq, snd_gus_interrupt,
SA_INTERRUPT
, "GUS GF1", (void *) gus)) {
+ if (irq >= 0 && request_irq(irq, snd_gus_interrupt,
IRQF_DISABLED
, "GUS GF1", (void *) gus)) {
snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
snd_gus_free(gus);
return -EBUSY;
snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
snd_gus_free(gus);
return -EBUSY;
@@
-231,7
+225,7
@@
int snd_gus_create(snd_card_t * card,
spin_lock_init(&gus->dma_lock);
spin_lock_init(&gus->pcm_volume_level_lock);
spin_lock_init(&gus->uart_cmd_lock);
spin_lock_init(&gus->dma_lock);
spin_lock_init(&gus->pcm_volume_level_lock);
spin_lock_init(&gus->uart_cmd_lock);
-
init_MUTEX
(&gus->dma_mutex);
+
mutex_init
(&gus->dma_mutex);
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {
snd_gus_free(gus);
return err;
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {
snd_gus_free(gus);
return err;
@@
-244,7
+238,7
@@
int snd_gus_create(snd_card_t * card,
* Memory detection routine for plain GF1 soundcards
*/
* Memory detection routine for plain GF1 soundcards
*/
-static int snd_gus_detect_memory(s
nd_gus_card_t
* gus)
+static int snd_gus_detect_memory(s
truct snd_gus_card
* gus)
{
int l, idx, local;
unsigned char d;
{
int l, idx, local;
unsigned char d;
@@
-252,7
+246,7
@@
static int snd_gus_detect_memory(snd_gus_card_t * gus)
snd_gf1_poke(gus, 0L, 0xaa);
snd_gf1_poke(gus, 1L, 0x55);
if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) {
snd_gf1_poke(gus, 0L, 0xaa);
snd_gf1_poke(gus, 1L, 0x55);
if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) {
- snd_printk("plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port);
+ snd_printk(
KERN_ERR
"plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port);
return -ENOMEM;
}
for (idx = 1, d = 0xab; idx < 4; idx++, d++) {
return -ENOMEM;
}
for (idx = 1, d = 0xab; idx < 4; idx++, d++) {
@@
-279,9
+273,9
@@
static int snd_gus_detect_memory(snd_gus_card_t * gus)
return 0; /* some memory were detected */
}
return 0; /* some memory were detected */
}
-static int snd_gus_init_dma_irq(s
nd_gus_card_t
* gus, int latches)
+static int snd_gus_init_dma_irq(s
truct snd_gus_card
* gus, int latches)
{
{
- s
nd_card_t
*card;
+ s
truct snd_card
*card;
unsigned long flags;
int irq, dma1, dma2;
static unsigned char irqs[16] =
unsigned long flags;
int irq, dma1, dma2;
static unsigned char irqs[16] =
@@
-305,20
+299,17
@@
static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches)
dma2 = gus->gf1.dma2;
dma2 = dma2 < 0 ? -dma2 : dma2;
dma2 = dmas[dma2 & 7];
dma2 = gus->gf1.dma2;
dma2 = dma2 < 0 ? -dma2 : dma2;
dma2 = dmas[dma2 & 7];
-#if 0
- printk("dma1 = %i, dma2 = %i\n", gus->gf1.dma1, gus->gf1.dma2);
-#endif
dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3);
if ((dma1 & 7) == 0 || (dma2 & 7) == 0) {
dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3);
if ((dma1 & 7) == 0 || (dma2 & 7) == 0) {
- snd_printk("Error! DMA isn't defined.\n");
+ snd_printk(
KERN_ERR
"Error! DMA isn't defined.\n");
return -EINVAL;
}
irq = gus->gf1.irq;
irq = irq < 0 ? -irq : irq;
irq = irqs[irq & 0x0f];
if (irq == 0) {
return -EINVAL;
}
irq = gus->gf1.irq;
irq = irq < 0 ? -irq : irq;
irq = irqs[irq & 0x0f];
if (irq == 0) {
- snd_printk("Error! IRQ isn't defined.\n");
+ snd_printk(
KERN_ERR
"Error! IRQ isn't defined.\n");
return -EINVAL;
}
irq |= 0x40;
return -EINVAL;
}
irq |= 0x40;
@@
-369,11
+360,11
@@
static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches)
return 0;
}
return 0;
}
-static int snd_gus_check_version(s
nd_gus_card_t
* gus)
+static int snd_gus_check_version(s
truct snd_gus_card
* gus)
{
unsigned long flags;
unsigned char val, rev;
{
unsigned long flags;
unsigned char val, rev;
- s
nd_card_t
*card;
+ s
truct snd_card
*card;
card = gus->card;
spin_lock_irqsave(&gus->reg_lock, flags);
card = gus->card;
spin_lock_irqsave(&gus->reg_lock, flags);
@@
-406,8
+397,8
@@
static int snd_gus_check_version(snd_gus_card_t * gus)
strcpy(card->longname, "Gravis UltraSound Extreme");
gus->ess_flag = 1;
} else {
strcpy(card->longname, "Gravis UltraSound Extreme");
gus->ess_flag = 1;
} else {
- snd_printk("unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
- snd_printk(" please - report to <perex@suse.cz>\n");
+ snd_printk(
KERN_ERR
"unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
+ snd_printk(
KERN_ERR
" please - report to <perex@suse.cz>\n");
}
}
}
}
}
}
@@
-417,19
+408,21
@@
static int snd_gus_check_version(snd_gus_card_t * gus)
return 0;
}
return 0;
}
-static void snd_gus_seq_dev_free(snd_seq_device_t *seq_dev)
+#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+static void snd_gus_seq_dev_free(struct snd_seq_device *seq_dev)
{
{
- s
nd_gus_card_t
*gus = seq_dev->private_data;
+ s
truct snd_gus_card
*gus = seq_dev->private_data;
gus->seq_dev = NULL;
}
gus->seq_dev = NULL;
}
+#endif
-int snd_gus_initialize(s
nd_gus_card_t
*gus)
+int snd_gus_initialize(s
truct snd_gus_card
*gus)
{
int err;
if (!gus->interwave) {
if ((err = snd_gus_check_version(gus)) < 0) {
{
int err;
if (!gus->interwave) {
if ((err = snd_gus_check_version(gus)) < 0) {
- snd_printk("version check failed\n");
+ snd_printk(
KERN_ERR
"version check failed\n");
return err;
}
if ((err = snd_gus_detect_memory(gus)) < 0)
return err;
}
if ((err = snd_gus_detect_memory(gus)) < 0)
@@
-439,9
+432,9
@@
int snd_gus_initialize(snd_gus_card_t *gus)
return err;
#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
if (snd_seq_device_new(gus->card, 1, SNDRV_SEQ_DEV_ID_GUS,
return err;
#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
if (snd_seq_device_new(gus->card, 1, SNDRV_SEQ_DEV_ID_GUS,
- sizeof(s
nd_gus_card_t
*), &gus->seq_dev) >= 0) {
+ sizeof(s
truct snd_gus_card
*), &gus->seq_dev) >= 0) {
strcpy(gus->seq_dev->name, "GUS");
strcpy(gus->seq_dev->name, "GUS");
- *(s
nd_gus_card_t
**)SNDRV_SEQ_DEVICE_ARGPTR(gus->seq_dev) = gus;
+ *(s
truct snd_gus_card
**)SNDRV_SEQ_DEVICE_ARGPTR(gus->seq_dev) = gus;
gus->seq_dev->private_data = gus;
gus->seq_dev->private_free = snd_gus_seq_dev_free;
}
gus->seq_dev->private_data = gus;
gus->seq_dev->private_free = snd_gus_seq_dev_free;
}
@@
-459,7
+452,6
@@
EXPORT_SYMBOL(snd_gf1_write16);
EXPORT_SYMBOL(snd_gf1_look16);
EXPORT_SYMBOL(snd_gf1_i_write8);
EXPORT_SYMBOL(snd_gf1_i_look8);
EXPORT_SYMBOL(snd_gf1_look16);
EXPORT_SYMBOL(snd_gf1_i_write8);
EXPORT_SYMBOL(snd_gf1_i_look8);
-EXPORT_SYMBOL(snd_gf1_i_write16);
EXPORT_SYMBOL(snd_gf1_i_look16);
EXPORT_SYMBOL(snd_gf1_dram_addr);
EXPORT_SYMBOL(snd_gf1_write_addr);
EXPORT_SYMBOL(snd_gf1_i_look16);
EXPORT_SYMBOL(snd_gf1_dram_addr);
EXPORT_SYMBOL(snd_gf1_write_addr);
@@
-470,8
+462,6
@@
EXPORT_SYMBOL(snd_gf1_alloc_voice);
EXPORT_SYMBOL(snd_gf1_free_voice);
EXPORT_SYMBOL(snd_gf1_ctrl_stop);
EXPORT_SYMBOL(snd_gf1_stop_voice);
EXPORT_SYMBOL(snd_gf1_free_voice);
EXPORT_SYMBOL(snd_gf1_ctrl_stop);
EXPORT_SYMBOL(snd_gf1_stop_voice);
-EXPORT_SYMBOL(snd_gf1_start);
-EXPORT_SYMBOL(snd_gf1_stop);
/* gus_mixer.c */
EXPORT_SYMBOL(snd_gf1_new_mixer);
/* gus_pcm.c */
/* gus_mixer.c */
EXPORT_SYMBOL(snd_gf1_new_mixer);
/* gus_pcm.c */