projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-update from upstream
[powerpc.git]
/
sound
/
ppc
/
beep.c
diff --git
a/sound/ppc/beep.c
b/sound/ppc/beep.c
index
d4ec6cc
..
5fec1e5
100644
(file)
--- a/
sound/ppc/beep.c
+++ b/
sound/ppc/beep.c
@@
-30,7
+30,7
@@
#include <sound/control.h>
#include "pmac.h"
#include <sound/control.h>
#include "pmac.h"
-struct
snd_
pmac_beep {
+struct pmac_beep {
int running; /* boolean */
int volume; /* mixer volume: 0-100 */
int volume_play; /* currently playing volume */
int running; /* boolean */
int volume; /* mixer volume: 0-100 */
int volume_play; /* currently playing volume */
@@
-44,9
+44,9
@@
struct snd_pmac_beep {
/*
* stop beep if running
*/
/*
* stop beep if running
*/
-void snd_pmac_beep_stop(
pmac_t
*chip)
+void snd_pmac_beep_stop(
struct snd_pmac
*chip)
{
{
-
pmac_beep_t
*beep = chip->beep;
+
struct pmac_beep
*beep = chip->beep;
if (beep && beep->running) {
beep->running = 0;
snd_pmac_beep_dma_stop(chip);
if (beep && beep->running) {
beep->running = 0;
snd_pmac_beep_dma_stop(chip);
@@
-97,10
+97,11
@@
static short beep_wform[256] = {
#define BEEP_BUFLEN 512
#define BEEP_VOLUME 15 /* 0 - 100 */
#define BEEP_BUFLEN 512
#define BEEP_VOLUME 15 /* 0 - 100 */
-static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigned int code, int hz)
+static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
+ unsigned int code, int hz)
{
{
-
pmac_t
*chip;
-
pmac_beep_t
*beep;
+
struct snd_pmac
*chip;
+
struct pmac_beep
*beep;
unsigned long flags;
int beep_speed = 0;
int srate;
unsigned long flags;
int beep_speed = 0;
int srate;
@@
-171,7
+172,8
@@
static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigne
* beep volume mixer
*/
* beep volume mixer
*/
-static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_pmac_info_beep(struct 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;
@@
-180,17
+182,19
@@
static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uin
return 0;
}
return 0;
}
-static int snd_pmac_get_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_pmac_get_beep(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
{
{
-
pmac_t
*chip = snd_kcontrol_chip(kcontrol);
+
struct snd_pmac
*chip = snd_kcontrol_chip(kcontrol);
snd_assert(chip->beep, return -ENXIO);
ucontrol->value.integer.value[0] = chip->beep->volume;
return 0;
}
snd_assert(chip->beep, return -ENXIO);
ucontrol->value.integer.value[0] = chip->beep->volume;
return 0;
}
-static int snd_pmac_put_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_pmac_put_beep(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
{
{
-
pmac_t
*chip = snd_kcontrol_chip(kcontrol);
+
struct snd_pmac
*chip = snd_kcontrol_chip(kcontrol);
int oval;
snd_assert(chip->beep, return -ENXIO);
oval = chip->beep->volume;
int oval;
snd_assert(chip->beep, return -ENXIO);
oval = chip->beep->volume;
@@
-198,7
+202,7
@@
static int snd_pmac_put_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco
return oval != chip->beep->volume;
}
return oval != chip->beep->volume;
}
-static s
nd_kcontrol_new_t
snd_pmac_beep_mixer = {
+static s
truct snd_kcontrol_new
snd_pmac_beep_mixer = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Beep Playback Volume",
.info = snd_pmac_info_beep,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Beep Playback Volume",
.info = snd_pmac_info_beep,
@@
-207,9
+211,9
@@
static snd_kcontrol_new_t snd_pmac_beep_mixer = {
};
/* Initialize beep stuff */
};
/* Initialize beep stuff */
-int __init snd_pmac_attach_beep(
pmac_t
*chip)
+int __init snd_pmac_attach_beep(
struct snd_pmac
*chip)
{
{
-
pmac_beep_t
*beep;
+
struct pmac_beep
*beep;
struct input_dev *input_dev;
void *dmabuf;
int err = -ENOMEM;
struct input_dev *input_dev;
void *dmabuf;
int err = -ENOMEM;
@@
-255,7
+259,7
@@
int __init snd_pmac_attach_beep(pmac_t *chip)
return err;
}
return err;
}
-void snd_pmac_detach_beep(
pmac_t
*chip)
+void snd_pmac_detach_beep(
struct snd_pmac
*chip)
{
if (chip->beep) {
input_unregister_device(chip->beep->dev);
{
if (chip->beep) {
input_unregister_device(chip->beep->dev);