From: Risto Suominen <Risto.Suominen@gmail.com>
To: tiwai@suse.de
Cc: alsa-devel@alsa-project.org, Risto Suominen <Risto.Suominen@gmail.com>
Subject: [PATCH - snd-powermac 2/5] Correct volume controls for PowerBook G3 Lombard
Date: Tue, 20 Jan 2009 22:01:14 +0200 [thread overview]
Message-ID: <1232481677-11579-2-git-send-email-Risto.Suominen@gmail.com> (raw)
In-Reply-To: <1232481677-11579-1-git-send-email-Risto.Suominen@gmail.com>
Correct volume controls for PowerBook G3 Lombard (Screamer).
Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 0258ccb..d89c23e 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -773,6 +773,7 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
|| machine_is_compatible("PowerMac4,1"))
#define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
+#define IS_LOMBARD (machine_is_compatible("PowerBook1,1"))
static int imac1, imac2;
@@ -862,6 +863,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
int pm5500 = IS_PM5500;
int beige = IS_BEIGE;
int g4agp = IS_G4AGP;
+ int lombard = IS_LOMBARD;
int imac;
int err, vol;
@@ -972,7 +974,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_beige),
snd_pmac_screamer_mixers_beige);
- else if (imac)
+ else if (imac || lombard)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_screamer_mixers_imac),
snd_pmac_screamer_mixers_imac);
@@ -986,7 +988,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
snd_pmac_awacs_mixers_pmac);
if (err < 0)
return err;
- chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp)
+ chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac || g4agp || lombard)
? &snd_pmac_awacs_master_sw_imac
: &snd_pmac_awacs_master_sw, chip);
err = snd_ctl_add(chip->card, chip->master_sw_ctl);
--
1.5.4.3
next prev parent reply other threads:[~2009-01-20 20:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 20:01 [PATCH - snd-powermac 1/5] Correct HP detection and input selectors for PMac 5500 Risto Suominen
2009-01-20 20:01 ` Risto Suominen [this message]
2009-01-20 20:01 ` [PATCH - snd-powermac 3/5] Correct volume controls and HP detection for PMac 8500/9500 Risto Suominen
2009-01-20 20:01 ` [PATCH - snd-powermac 4/5] Allow input from mic in iBook G3 Dual-USB Risto Suominen
2009-01-20 20:01 ` [PATCH - snd-powermac 5/5] Add vmaster controls for Pmac 5500, iMac G3 SL, and PBook G3 Lombard Risto Suominen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1232481677-11579-2-git-send-email-Risto.Suominen@gmail.com \
--to=risto.suominen@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.