From: Koen Kooi <koen@openembedded.org>
Date: Thu, 22 Sep 2005 18:40:30 +0000 (+0000)
Subject: packages/pcmcia-cs/: apply patches from #287
X-Git-Tag: Release-2010-05/1~9453^2~3470
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eafb65a0941d5a695dedfd06416b4f197cbdb76;p=openembedded.git

packages/pcmcia-cs/: apply patches from #287
---

diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia
index d42bc84e77..05b381a5f9 100644
--- a/packages/pcmcia-cs/files/arm/pcmcia
+++ b/packages/pcmcia-cs/files/arm/pcmcia
@@ -1,12 +1,19 @@
+module_id() {
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+
 case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
   *XScale-PXA2*)
 
     case "`uname -r`" in
         2.4*)
 		PCIC=pxa_cs
+		DS=ds
 		;;
 	2.6*)
 		PCIC=pxa2xx_core
+		DS=pcmcia
 		;;
     esac
     ;;
@@ -19,12 +26,8 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
     ;;
 esac
 
-if grep -q iPAQ /proc/cpuinfo; then
-  case `module_id` in
-    "HP iPAQ H2200")
-	;;
-    *)
-	PCIC_EXTRA=h3600_generic_sleeve
-	;;
-  esac
-fi
+case `module_id` in
+  "HP iPAQ H3"* | "HP iPAQ H5"*)
+    PCIC_EXTRA=h3600_generic_sleeve
+    ;;
+esac
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
index e78d0c5c6b..541c4edf71 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
@@ -1,14 +1,11 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
 --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra
 +++ pcmcia-cs-3.2.8/etc/rc.pcmcia
-@@ -105,10 +105,16 @@
+@@ -104,11 +104,17 @@ for x in "1" ; do
+ 		  (/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
  		   echo "using yenta_socket instead of $PCIC") ||
  		  /sbin/modprobe $PCIC $PCIC_OPTS || break
- 		/sbin/modprobe ds || break
+-		/sbin/modprobe ds || break
++		/sbin/modprobe $DS || break
 +		if [ "x$PCIC_EXTRA" != "x" ]; then
 +		   /sbin/modprobe $PCIC_EXTRA
 +		fi
@@ -22,7 +19,7 @@
  	    else
  		echo "module directory $PC not found."
  		break
-@@ -154,7 +160,7 @@
+@@ -154,7 +160,7 @@ for x in "1" ; do
  	;;
  
      status)