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]
/
sound
/
pci
/
emu10k1
/
timer.c
diff --git
a/sound/pci/emu10k1/timer.c
b/sound/pci/emu10k1/timer.c
index
c9c421a
..
6295b2d
100644
(file)
--- a/
sound/pci/emu10k1/timer.c
+++ b/
sound/pci/emu10k1/timer.c
@@
-1,10
+1,8
@@
/*
* Copyright (c) by Lee Revell <rlrevell@joe-job.com>
/*
* Copyright (c) by Lee Revell <rlrevell@joe-job.com>
- *
+ *
Clemens Ladisch <clemens@ladisch.de>
* Routines for control of EMU10K1 chips
*
* Routines for control of EMU10K1 chips
*
- * Copied from similar code by Clemens Ladisch in the ymfpci driver
- *
* BUGS:
* --
*
* BUGS:
* --
*
@@
-32,9
+30,9
@@
#include <sound/core.h>
#include <sound/emu10k1.h>
#include <sound/core.h>
#include <sound/emu10k1.h>
-static int snd_emu10k1_timer_start(s
nd_timer_t
*timer)
+static int snd_emu10k1_timer_start(s
truct snd_timer
*timer)
{
{
-
emu10k1_t
*emu;
+
struct snd_emu10k1
*emu;
unsigned long flags;
unsigned int delay;
unsigned long flags;
unsigned int delay;
@@
-49,9
+47,9
@@
static int snd_emu10k1_timer_start(snd_timer_t *timer)
return 0;
}
return 0;
}
-static int snd_emu10k1_timer_stop(s
nd_timer_t
*timer)
+static int snd_emu10k1_timer_stop(s
truct snd_timer
*timer)
{
{
-
emu10k1_t
*emu;
+
struct snd_emu10k1
*emu;
unsigned long flags;
emu = snd_timer_chip(timer);
unsigned long flags;
emu = snd_timer_chip(timer);
@@
-61,7
+59,7
@@
static int snd_emu10k1_timer_stop(snd_timer_t *timer)
return 0;
}
return 0;
}
-static int snd_emu10k1_timer_precise_resolution(s
nd_timer_t
*timer,
+static int snd_emu10k1_timer_precise_resolution(s
truct snd_timer
*timer,
unsigned long *num, unsigned long *den)
{
*num = 1;
unsigned long *num, unsigned long *den)
{
*num = 1;
@@
-69,7
+67,7
@@
static int snd_emu10k1_timer_precise_resolution(snd_timer_t *timer,
return 0;
}
return 0;
}
-static struct
_
snd_timer_hardware snd_emu10k1_timer_hw = {
+static struct snd_timer_hardware snd_emu10k1_timer_hw = {
.flags = SNDRV_TIMER_HW_AUTO,
.resolution = 20833, /* 1 sample @ 48KHZ = 20.833...us */
.ticks = 1024,
.flags = SNDRV_TIMER_HW_AUTO,
.resolution = 20833, /* 1 sample @ 48KHZ = 20.833...us */
.ticks = 1024,
@@
-78,10
+76,10
@@
static struct _snd_timer_hardware snd_emu10k1_timer_hw = {
.precise_resolution = snd_emu10k1_timer_precise_resolution,
};
.precise_resolution = snd_emu10k1_timer_precise_resolution,
};
-int __devinit snd_emu10k1_timer(
emu10k1_t
*emu, int device)
+int __devinit snd_emu10k1_timer(
struct snd_emu10k1
*emu, int device)
{
{
- s
nd_timer_t
*timer = NULL;
- s
nd_timer_id_t
tid;
+ s
truct snd_timer
*timer = NULL;
+ s
truct snd_timer_id
tid;
int err;
tid.dev_class = SNDRV_TIMER_CLASS_CARD;
int err;
tid.dev_class = SNDRV_TIMER_CLASS_CARD;