From 994d37e860d36c07299519798ce412ae13642e25 Mon Sep 17 00:00:00 2001
From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Tue, 22 Jun 2010 01:30:39 +0200
Subject: [PATCH] Pandora-Scripts: Added check for g_cdc in op_storage.sh

---
 recipes/pandora-system/pandora-scripts.bb     |   4 ++-
 .../pandora-scripts/op_storage.sh             |  24 +++++++++++++++---
 .../pandora-scripts/pandorascripts.pnd        | Bin 10090 -> 10812 bytes
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 236a0d6..7efef41 100644
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r27"
+PR = "r28"
 
 SRC_URI = " \
           file://op_bright.sh \
@@ -35,6 +35,7 @@ SRC_URI = " \
           file://op_lcdsettings.sh \
 #          file://op_lcdsettings.desktop \
            file://op_lcdrate.sh \
+          file://op_storage.sh \
           file://op_nubmode.sh \
 #	  file://op_nubmode.desktop \
           file://gui.conf \
@@ -71,6 +72,7 @@ do_install() {
           install -m 0755 ${WORKDIR}/op_lcdsettings.sh ${D}${prefix}/pandora/scripts/
           install -m 0755 ${WORKDIR}/op_lcdrate.sh ${D}${prefix}/pandora/scripts/
 	  install -m 0755 ${WORKDIR}/op_nubmode.sh ${D}${prefix}/pandora/scripts/
+	  install -m 0755 ${WORKDIR}/op_storage.sh ${D}${prefix}/pandora/scripts/
 
           install -d ${D}${prefix}/pandora/menu/
           install -m 0755 ${WORKDIR}/pandorascripts.pnd ${D}${prefix}/pandora/menu/
diff --git a/recipes/pandora-system/pandora-scripts/op_storage.sh b/recipes/pandora-system/pandora-scripts/op_storage.sh
index 760cff6..d293cb5 100755
--- a/recipes/pandora-system/pandora-scripts/op_storage.sh
+++ b/recipes/pandora-system/pandora-scripts/op_storage.sh
@@ -6,11 +6,19 @@ while mainsel=$(zenity --title="SD Card Mass Storage" --width="380" --height="20
   if umount /dev/mmcblk0p1
   then
     # switch to mass storage
-    rmmod g_cdc
+    if lsmod | grep g_cdc &>/dev/null
+	then
+	echo Found g_cdc - removing...
+	rmmod g_cdc
+	ethernet=1
+    fi
     modprobe g_file_storage file=/dev/mmcblk0p1 stall=0
     zenity --title="SD Card 1 Mass Storage Mode" --info --text="SD Card Slot 1 is currently in Mass Storage Mode.\n\nClick on OK when you're finished with your data transfer\nand want to go back to normal mode."
     rmmod g_file_storage
-    modprobe g_cdc
+    if [ $ethernet=1 ]; then
+      echo Reloading g_cdc...
+      modprobe g_cdc
+    fi
     $remount
   else
      zenity --title="Error" --error --text="Error.\nEither there is no card in SD Slot 1 or some program\nis currently accessing the card.\n\nPlease make sure to close any programs that currently access te SD Card." --timeout 6
@@ -21,11 +29,19 @@ while mainsel=$(zenity --title="SD Card Mass Storage" --width="380" --height="20
   if umount /dev/mmcblk1p1
   then
     # switch to mass storage
-    rmmod g_cdc
+     if lsmod | grep g_cdc &>/dev/null
+	then
+	echo Found g_cdc - removing...
+	rmmod g_cdc
+	ethernet=1
+    fi
     modprobe g_file_storage file=/dev/mmcblk1p1 stall=0
     zenity --title="SD Card 2 Mass Storage Mode" --info --text="SD Card Slot 2 is currently in Mass Storage Mode.\n\nClick on OK when you're finished with your data transfer\nand want to go back to normal mode."
     rmmod g_file_storage
-    insmod g_cdc
+    if [ $ethernet=1 ]; then
+      echo Reloading g_cdc...
+      modprobe g_cdc
+    fi
     $remount
   else
      zenity --title="Error" --error --text="Error.\nEither there is no card in SD Slot 2 or some program\nis currently accessing the card.\n\nPlease make sure to close any programs that currently access te SD Card." --timeout 6
diff --git a/recipes/pandora-system/pandora-scripts/pandorascripts.pnd b/recipes/pandora-system/pandora-scripts/pandorascripts.pnd
index 2e46dad16b86414ae54c33614dc5535d3617cc1a..b777886f16b59ffb9b4d4667125c2b2b8ecf0025 100644
GIT binary patch
delta 1935
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

delta 1620
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
S286N@R0ET57!<QQ76KIBgXj+c

-- 
2.39.5