Skip to contentSkip to conversation

refactoring of maestro continues

PATCH Warren Turkal 2 participants 3 messages Jul 19, 2003 – Jul 22, 2003

lore
Share & tools
lore
#0 lore raw

Here is a patch against the HEAD of linus' tree. This time there are no AC97 defines in maestro3.c for the generic AC97 support.

Warren Turkal

Signature · 2 lines
Treasurer, GOLUM, Inc.
http://www.golum.org
es1968.c +5 -3
Index: es1968.c
===================================================================
@@ -108,6 +108,7 @@
 #include <sound/ac97_codec.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+#include "maestro.h"
 
 #define chip_t es1968_t
 
@@ -280,12 +281,13 @@
 #define READABLE_MAP		0x64003F
 
 /* PCI Register */
-
+#if 0
 #define ESM_LEGACY_AUDIO_CONTROL 0x40
 #define ESM_ACPI_COMMAND	0x54
 #define ESM_CONFIG_A		0x50
 #define ESM_CONFIG_B		0x52
 #define ESM_DDMA		0x60
+#endif
 
 /* Bob Bits */
 #define ESM_BOB_ENABLE		0x0001
@@ -2276,9 +2278,9 @@
 
 	/* DDMA off */
 
-	pci_read_config_word(pci, ESM_DDMA, &w);
+	pci_read_config_word(pci, ESM_DDMA_CONTROL, &w);
 	w &= ~(1 << 0);
-	pci_write_config_word(pci, ESM_DDMA, w);
+	pci_write_config_word(pci, ESM_DDMA_CONTROL, w);
 
 	/*
 	 *	Legacy mode
maestro.h +439 -0

439 lines not on this page · raw message

maestro3.c +6 -77

141 lines not on this page · raw message

#1 lore raw

Hi Warren,

At Sat, 19 Jul 2003 01:59:44 -0500,

Quoted 3 lines · Warren Turkal

Here is a patch against the HEAD of linus' tree. This time there are no AC97 defines in maestro3.c for the generic AC97 support.

thanks.

but i thought we agreed to move ASSP things to maestro3 part..?

please let me know if you think it's enough good to merge into cvs.

ciao,

Takashi

-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine. WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the same time. Free trial click here: http://www.vmware.com/wl/offer/345/0

#2 lore raw
Quoted 11 lines · Takashi Iwai

Hi Warren,

At Sat, 19 Jul 2003 01:59:44 -0500,

Quoted 2 lines · Warren Turkal

Here is a patch against the HEAD of linus' tree. This time there are no AC97 defines in maestro3.c for the generic AC97 support.

thanks.

but i thought we agreed to move ASSP things to maestro3 part..?

I thought you said they were relevant for other maestros also...even if they weren't used yet.

Quoted 3 lines

please let me know if you think it's enough good to merge into cvs.

Not yet...I can get better separation, and I need to remove the huge comment in maestro.h.

Sayonara, Warren

Signature · 10 lines
Treasurer, GOLUM, Inc.
http://www.golum.org



-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0