Bump. now includes fix for lockups when entering C3 state with ACPI

5 files changed, 102 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 8bc15b785577..225190eea47b 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.6 2004/03/17 03:21:07 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.7 2004/03/17 21:22:03 latexer Exp $
+
+*ipw2100-0.33-r1 (17 Mar 2004)
+
+  17 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.33-r1.ebuild,
+  files/ipw2100-0.33-acpi-fix.diff:
+  Bump. Added a fix to prevent locking when entering C3 state with acpi! (thanks
+  to james for such great work)
 
 *ipw2100-0.33 (16 Mar 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index abe5063772aa..d97364c38227 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,11 +1,14 @@
 MD5 bacfed597a8a2393d4cfc6d22148b5a6 ipw2100-0.32.ebuild 1510
+MD5 fc5a0b28a0f0512510e48f83003e30c7 ipw2100-0.33-r1.ebuild 1336
 MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
 MD5 8fe3f7faed305f56b8872a49a9ac8865 ipw2100-0.33.ebuild 1237
 MD5 a54d36b57412d5b2477ebe9b11df402c ipw2100-0.29.ebuild 1496
-MD5 a8c02c854397c38b21e3a6f3de1fc10a ChangeLog 1565
+MD5 823c52e3f7f50f5a2fa85dab2ccc98b9 ChangeLog 1822
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 c25ca603853e256cd2067a2e13a540b3 ipw2100-0.30.ebuild 1503
+MD5 1cf135e6f2a48d58c39f62e3e49ccfd3 files/ipw2100-0.33-acpi-fix.diff 863
 MD5 1d1276f437b0101f8283429a0c048ec7 files/ipw2100-0.31-sched-fix.diff 1232
+MD5 5f17d2de90a1512f71b1d9285d830215 files/digest-ipw2100-0.33-r1 128
 MD5 b8a2ee5b58b07a06d43eee780062c44f files/digest-ipw2100-0.29 128
 MD5 368679a4039ed10926222fce17e426e9 files/digest-ipw2100-0.30 128
 MD5 f161ddf8b6d1e61b46ddfaa5da0d52e9 files/digest-ipw2100-0.31 128
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1
new file mode 100644
index 000000000000..5dee2d0a9282
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.33-r1
@@ -0,0 +1,2 @@
+MD5 98c8cf2aaf8fb724e490c8e3b6b9542d ipw2100-full-0.33.tgz 718118
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/ipw2100-0.33-acpi-fix.diff b/net-wireless/ipw2100/files/ipw2100-0.33-acpi-fix.diff
new file mode 100644
index 000000000000..9c957348d307
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.33-acpi-fix.diff
@@ -0,0 +1,27 @@
+diff -u -r1.565 ipw2100_main.c
+--- ipw2100_main.c	16 Mar 2004 21:42:52 -0000	1.565
++++ ipw2100_main.c	17 Mar 2004 21:10:56 -0000
+@@ -4867,6 +5105,7 @@
+ 	struct ipw2100_priv *priv = NULL;
+ 	int err = 0;
+ 	int registered = 0;
++	u32 val;
+ 
+ 	IPW2100_DEBUG_INFO("enter\n");
+ 
+@@ -4891,6 +5130,15 @@
+ 		pci_disable_device(pdev);
+ 		return err;
+ 	}
++	
++	/* I'm not sure what this does, but loading the Windows driver under
++	 * ndiswrapper was clearing these bits of the PCI config table--and 
++	 * doing so seems to fix the C3 conflict.  If anyone knows what these 
++	 * bits do in the PCI table, let me know so I can update this comment 
++	 * :) */
++	pci_read_config_dword(pdev, 0x40, &val); 
++	if ((val & 0x0000fff00) != 0) 
++		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 
+ 	mem_start = pci_resource_start(pdev, 0);
+ 	mem_len = pci_resource_len(pdev, 0);
diff --git a/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild
new file mode 100644
index 000000000000..69abe5c545f0
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.33-r1.ebuild,v 1.1 2004/03/17 21:22:03 latexer Exp $
+
+inherit kernel-mod eutils
+
+MY_P=${P/ipw2100/ipw2100-full}
+FW_VERSION="1.0"
+
+DESCRIPTION="Driver for the Intel Centrino wireless chipset"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	kernel-mod_getversion
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-fix.diff
+	EPATCH_SINGLE_MSG="Patch to fix locks with C3 state" \
+		epatch ${FILESDIR}/${P}-acpi-fix.diff
+}
+src_compile() {
+	unset ARCH
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+
+	dodoc ISSUES README.ipw2100 DESIGN
+
+	insinto /lib/modules/${KV}/net
+	doins ipw2100.${KV_OBJ}
+	doins av5100.${KV_OBJ}
+
+	insinto /etc/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependancies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}