linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Jaegermann <michal@harddata.com>
To: linux-kernel@vger.kernel.org
Cc: alan@lxorguk.ukuu.org.uk
Subject: [PATCH] Sound on Nautilus Alpha (UP1000, UP1100)
Date: Thu, 14 Jun 2001 20:31:49 -0600	[thread overview]
Message-ID: <20010614203149.A12949@mail.harddata.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

Somehow a code which does Nautilus specific magic to a Trident card
was forgotten for cases when a "generic" Alpha kernel is in use.
After a transfer of these few lines from 2.2.19 my sound card started
to play again.  Nautilus specific kernel should work but this is
not always in use.

Header comments in trident.c indicate that "#define DRIVER_VERSION"
was simply forgotten so I updated that as well.

This patch was done with 2.4.5-ac13 but it should fit all trident.c
from 2.4 kernels possibly with some small line offsets.  Alan, will
you push that to Linus?

   Michal

[-- Attachment #2: trident.patch --]
[-- Type: text/plain, Size: 1305 bytes --]

--- linux-2.4.5ac/drivers/sound/trident.c.orig	Tue Jun 12 16:31:13 2001
+++ linux-2.4.5ac/drivers/sound/trident.c	Thu Jun 14 18:33:34 2001
@@ -136,11 +136,15 @@
 #include <linux/bitops.h>
 #include <linux/proc_fs.h>
 
+#if defined CONFIG_ALPHA_NAUTILUS || CONFIG_ALPHA_GENERIC
+#include <asm/hwrpb.h>
+#endif
+
 #include "trident.h"
 
 #include <linux/pm.h>
 
-#define DRIVER_VERSION "0.14.6"
+#define DRIVER_VERSION "0.14.7a"
 
 /* magic numbers to protect our data structures */
 #define TRIDENT_CARD_MAGIC	0x5072696E /* "Prin" */
@@ -3607,10 +3611,17 @@
 
 	if (card->pci_id == PCI_DEVICE_ID_ALI_5451) {
 		/* edited by HMSEO for GT sound */
-#ifdef CONFIG_ALPHA_NAUTILUS
+#if defined CONFIG_ALPHA_NAUTILUS || CONFIG_ALPHA_GENERIC
 		u16 ac97_data;
-		ac97_data = ali_ac97_get (card->ac97_codec[0], AC97_POWER_CONTROL);
-		ali_ac97_set (card->ac97_codec[0], AC97_POWER_CONTROL, ac97_data | ALI_EAPD_POWER_DOWN);
+		extern struct hwrpb_struct *hwrpb;
+		
+		if ((hwrpb->sys_type) == 201) {
+			printk(KERN_INFO "trident: Running on Alpha system type Nautilus\n");
+			ac97_data = ali_ac97_get (card->ac97_codec[0],
+						  AC97_POWER_CONTROL);
+			ali_ac97_set (card->ac97_codec[0], AC97_POWER_CONTROL,
+				      ac97_data | ALI_EAPD_POWER_DOWN);
+		}
 #endif
 		/* edited by HMSEO for GT sound*/
 	}

                 reply	other threads:[~2001-06-15  2:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20010614203149.A12949@mail.harddata.com \
    --to=michal@harddata.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH] Sound on Nautilus Alpha (UP1000, UP1100)' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).