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
vserver 1.9.3
[linux-2.6.git]
/
sound
/
isa
/
gus
/
gus_pcm.c
diff --git
a/sound/isa/gus/gus_pcm.c
b/sound/isa/gus/gus_pcm.c
index
040804c
..
aca7f3a
100644
(file)
--- a/
sound/isa/gus/gus_pcm.c
+++ b/
sound/isa/gus/gus_pcm.c
@@
-34,8
+34,6
@@
#include <sound/pcm_params.h>
#include "gus_tables.h"
#include <sound/pcm_params.h>
#include "gus_tables.h"
-#define chip_t snd_gus_card_t
-
/* maximum rate */
#define SNDRV_GF1_PCM_RATE 48000
/* maximum rate */
#define SNDRV_GF1_PCM_RATE 48000
@@
-66,7
+64,7
@@
static int snd_gf1_pcm_use_dma = 1;
static void snd_gf1_pcm_block_change_ack(snd_gus_card_t * gus, void *private_data)
{
static void snd_gf1_pcm_block_change_ack(snd_gus_card_t * gus, void *private_data)
{
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, private_data, return)
;
+ gus_pcm_private_t *pcmp =
private_data
;
if (pcmp) {
atomic_dec(&pcmp->dma_count);
if (pcmp) {
atomic_dec(&pcmp->dma_count);
@@
-81,7
+79,7
@@
static int snd_gf1_pcm_block_change(snd_pcm_substream_t * substream,
{
snd_gf1_dma_block_t block;
snd_pcm_runtime_t *runtime = substream->runtime;
{
snd_gf1_dma_block_t block;
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
count += offset & 31;
offset &= ~31;
count += offset & 31;
offset &= ~31;
@@
-106,7
+104,7
@@
static int snd_gf1_pcm_block_change(snd_pcm_substream_t * substream,
static void snd_gf1_pcm_trigger_up(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
static void snd_gf1_pcm_trigger_up(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
snd_gus_card_t * gus = pcmp->gus;
unsigned long flags;
unsigned char voice_ctrl, ramp_ctrl;
snd_gus_card_t * gus = pcmp->gus;
unsigned long flags;
unsigned char voice_ctrl, ramp_ctrl;
@@
-194,7
+192,7
@@
static void snd_gf1_pcm_interrupt_wave(snd_gus_card_t * gus, snd_gus_voice_t *pv
snd_gf1_smart_stop_voice(gus, pvoice->number);
return;
}
snd_gf1_smart_stop_voice(gus, pvoice->number);
return;
}
- pcmp =
snd_magic_cast(gus_pcm_private_t, pvoice->private_data, return)
;
+ pcmp =
pvoice->private_data
;
if (pcmp == NULL) {
snd_printd("snd_gf1_pcm: unknown wave irq?\n");
snd_gf1_smart_stop_voice(gus, pvoice->number);
if (pcmp == NULL) {
snd_printd("snd_gf1_pcm: unknown wave irq?\n");
snd_gf1_smart_stop_voice(gus, pvoice->number);
@@
-267,7
+265,7
@@
static void snd_gf1_pcm_interrupt_volume(snd_gus_card_t * gus, snd_gus_voice_t *
{
unsigned short vol;
int cvoice;
{
unsigned short vol;
int cvoice;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, pvoice->private_data, return)
;
+ gus_pcm_private_t *pcmp =
pvoice->private_data
;
/* stop ramp, but leave rollover bit untouched */
spin_lock(&gus->reg_lock);
/* stop ramp, but leave rollover bit untouched */
spin_lock(&gus->reg_lock);
@@
-350,7
+348,7
@@
static int snd_gf1_pcm_playback_copy(snd_pcm_substream_t *substream,
snd_pcm_uframes_t count)
{
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_uframes_t count)
{
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
unsigned int bpos, len;
bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
unsigned int bpos, len;
bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
@@
-379,7
+377,7
@@
static int snd_gf1_pcm_playback_silence(snd_pcm_substream_t *substream,
snd_pcm_uframes_t count)
{
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_uframes_t count)
{
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
unsigned int bpos, len;
bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
unsigned int bpos, len;
bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
@@
-406,7
+404,7
@@
static int snd_gf1_pcm_playback_hw_params(snd_pcm_substream_t * substream,
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
int err;
if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
int err;
if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
@@
-453,7
+451,7
@@
static int snd_gf1_pcm_playback_hw_params(snd_pcm_substream_t * substream,
static int snd_gf1_pcm_playback_hw_free(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
static int snd_gf1_pcm_playback_hw_free(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
snd_pcm_lib_free_pages(substream);
if (pcmp->pvoices[0]) {
snd_pcm_lib_free_pages(substream);
if (pcmp->pvoices[0]) {
@@
-474,7
+472,7
@@
static int snd_gf1_pcm_playback_hw_free(snd_pcm_substream_t * substream)
static int snd_gf1_pcm_playback_prepare(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
static int snd_gf1_pcm_playback_prepare(snd_pcm_substream_t * substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
pcmp->bpos = 0;
pcmp->dma_size = snd_pcm_lib_buffer_bytes(substream);
pcmp->bpos = 0;
pcmp->dma_size = snd_pcm_lib_buffer_bytes(substream);
@@
-488,7
+486,7
@@
static int snd_gf1_pcm_playback_trigger(snd_pcm_substream_t * substream,
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
int voice;
if (cmd == SNDRV_PCM_TRIGGER_START) {
int voice;
if (cmd == SNDRV_PCM_TRIGGER_START) {
@@
-513,7
+511,7
@@
static snd_pcm_uframes_t snd_gf1_pcm_playback_pointer(snd_pcm_substream_t * subs
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
unsigned int pos;
unsigned char voice_ctrl;
unsigned int pos;
unsigned char voice_ctrl;
@@
-657,8
+655,8
@@
static snd_pcm_hardware_t snd_gf1_pcm_capture =
static void snd_gf1_pcm_playback_free(snd_pcm_runtime_t *runtime)
{
static void snd_gf1_pcm_playback_free(snd_pcm_runtime_t *runtime)
{
- gus_pcm_private_t * pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return)
;
-
snd_magic_
kfree(pcmp);
+ gus_pcm_private_t * pcmp =
runtime->private_data
;
+ kfree(pcmp);
}
static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
}
static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
@@
-668,7
+666,7
@@
static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
snd_pcm_runtime_t *runtime = substream->runtime;
int err;
snd_pcm_runtime_t *runtime = substream->runtime;
int err;
- pcmp =
snd_magic_kcalloc(gus_pcm_private_t, 0
, GFP_KERNEL);
+ pcmp =
kcalloc(1, sizeof(*pcmp)
, GFP_KERNEL);
if (pcmp == NULL)
return -ENOMEM;
pcmp->gus = gus;
if (pcmp == NULL)
return -ENOMEM;
pcmp->gus = gus;
@@
-697,7
+695,7
@@
static int snd_gf1_pcm_playback_close(snd_pcm_substream_t * substream)
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
{
snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- gus_pcm_private_t *pcmp =
snd_magic_cast(gus_pcm_private_t, runtime->private_data, return -ENXIO)
;
+ gus_pcm_private_t *pcmp =
runtime->private_data
;
unsigned long jiffies_old;
jiffies_old = jiffies;
unsigned long jiffies_old;
jiffies_old = jiffies;
@@
-738,7
+736,7
@@
static int snd_gf1_pcm_capture_close(snd_pcm_substream_t * substream)
static void snd_gf1_pcm_free(snd_pcm_t *pcm)
{
static void snd_gf1_pcm_free(snd_pcm_t *pcm)
{
- snd_gus_card_t *gus =
snd_magic_cast(snd_gus_card_t, pcm->private_data, return)
;
+ snd_gus_card_t *gus =
pcm->private_data
;
gus->pcm = NULL;
snd_pcm_lib_preallocate_free_for_all(pcm);
}
gus->pcm = NULL;
snd_pcm_lib_preallocate_free_for_all(pcm);
}
@@
-790,7
+788,7
@@
static int snd_gf1_pcm_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
pvoice = &gus->gf1.voices[idx];
if (!pvoice->pcm)
continue;
pvoice = &gus->gf1.voices[idx];
if (!pvoice->pcm)
continue;
- pcmp =
snd_magic_cast(gus_pcm_private_t, pvoice->private_data, return -ENXIO)
;
+ pcmp =
pvoice->private_data
;
if (!(pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE))
continue;
/* load real volume - better precision */
if (!(pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE))
continue;
/* load real volume - better precision */