Date: Mon, 29 Mar 2004 18:35:13 -0500 From: Mathew Kanner <mat@cnd.mcgill.ca> To: freebsd-multimedia@freebsd.org Subject: please review snd_ich patch Message-ID: <20040329233513.GA6187@cnd.mcgill.ca>
next in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello All,
I'm going to commit a patch by Autrijus Tang
<autrijus@autrijus.org> that fixes snd_ich for him. I've asked for
comments from the list and haven't really heard much so I thought I
would try a second time.
So.
I'm going to commit the following patch tommorow, please let
me know if it doesn't work for you.
--Mat
--
The state has no business in the bedrooms of the
nation.
- Pierre Elliott Trudeau
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="snd_ich5.patch"
Index: sys/dev/sound/pci/ich.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sound/pci/ich.c,v
retrieving revision 1.39
diff -u -r1.39 ich.c
--- sys/dev/sound/pci/ich.c 17 Mar 2004 17:50:44 -0000 1.39
+++ sys/dev/sound/pci/ich.c 28 Mar 2004 14:14:57 -0000
@@ -693,12 +693,23 @@
}
/*
+ * By default, ich4 has NAMBAR and NABMBAR i/o spaces as
+ * read-only. Need to enable "legacy support", by poking into
+ * pci config space. The driver should use MMBAR and MBBAR,
+ * but doing so will mess things up here. ich4 has enough new
+ * features it warrants it's own driver.
+ */
+ if (pci_get_devid(dev) == ICH4ID) {
+ pci_write_config(dev, PCIR_ICH_LEGACY, ICH_LEGACY_ENABLE, 1);
+ }
+
+ /*
* Enable bus master. On ich4/5 this may prevent the detection of
* the primary codec becoming ready in ich_init().
*/
pci_enable_busmaster(dev);
- if ((pci_get_devid(dev) == ICH4ID) || (pci_get_devid(dev) == ICH5ID)) {
+ if (pci_get_devid(dev) == ICH5ID) {
sc->nambarid = PCIR_MMBAR;
sc->nabmbarid = PCIR_MBBAR;
sc->regtype = SYS_RES_MEMORY;
--NzB8fVQJ5HfG6fxh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040329233513.GA6187>