[maemo-commits] [maemo-commits] r16325 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-10-03 12:53:26 +0300 (Fri, 03 Oct 2008)
New Revision: 16325

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/debian/init.d
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
detect memory card type in the right way again


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2008-10-03 09:42:49 UTC (rev 16324)
+++ projects/haf/trunk/ke-recv/debian/changelog	2008-10-03 09:53:26 UTC (rev 16325)
@@ -1,8 +1,10 @@
 ke-recv (3.1-1~unreleased) unstable; urgency=low
 
   * Add noatime and nodiratime mount options.
+  * Now that HAL is fixed, re-enable slot_name and cover detection code.
+  * Use g_nokia instead of g_ether in the startup script.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 14 Aug 2008 15:06:32 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 03 Oct 2008 12:35:43 +0300
 
 ke-recv (3.0-2) unstable; urgency=low
 

Modified: projects/haf/trunk/ke-recv/debian/init.d
===================================================================
--- projects/haf/trunk/ke-recv/debian/init.d	2008-10-03 09:42:49 UTC (rev 16324)
+++ projects/haf/trunk/ke-recv/debian/init.d	2008-10-03 09:53:26 UTC (rev 16325)
@@ -2,7 +2,7 @@
 # 
 # ke-recv	HAL-based automatic mounting etc.
 #
-# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
+# Copyright (C) 2004-2008 Nokia Corporation. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License 
@@ -46,9 +46,9 @@
 export MMC_MOUNTPOINT='/media/mmc1'
 export INTERNAL_MMC_MOUNTPOINT='/media/mmc2'
 
-/sbin/lsmod | grep g_ether > /dev/null
+/sbin/lsmod | grep g_nokia > /dev/null
 if [ $? = 0 ]; then
-  echo "$DESC: g_ether loaded, ignoring USB cable"
+  echo "$DESC: g_nokia loaded, ignoring USB cable"
   export OSSO_KE_RECV_IGNORE_CABLE=1
 fi
 

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2008-10-03 09:42:49 UTC (rev 16324)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2008-10-03 09:53:26 UTC (rev 16325)
@@ -1423,10 +1423,10 @@
         mmc_keys_set = TRUE;
 }
 
-static int init_card(const char *udi, int internal)
+static int init_card(const char *udi)
 {
         mmc_info_t *mmc;
-#if 0  /* slot_name is not provided yet */
+        int internal;
         char *slot;
 
         slot = get_prop_string(udi, "mmc_host.slot_name");
@@ -1444,7 +1444,6 @@
                 return 0;
         }
         libhal_free_string(slot);
-#endif
 
         /* NOTE: keep these in the same order as in the mmc_info_t
          * struct, so that nothing is missed */
@@ -1523,8 +1522,6 @@
         ULOG_DEBUG_F("%s cover_udi == %s", mmc->name, mmc->cover_udi);
 
         if (mmc->cover_udi != NULL) {
-                /* FIXME: this property is missing from HAL */
-#if 0
                 int state;
                 state = get_prop_bool(mmc->cover_udi,
                                       "button.state.value");
@@ -1533,8 +1530,6 @@
                 } else {
                         mmc->state = S_COVER_OPEN;
                 }
-#endif
-                mmc->state = S_COVER_CLOSED;
         }
 
         mmc->unmount_pending_timer_id = 0;
@@ -1593,26 +1588,7 @@
         ULOG_DEBUG_F("number of mmc_hosts: %d", num_hosts);
 
         for (i = 0; i < num_hosts; ++i) {
-                /* FIXME workaround HAL bug for detecting int/ext MMC */
-                char **clist;
-                int internal, nchildren;
-                internal = nchildren = 0;
-                clist = libhal_manager_find_device_string_match(hal_ctx,
-                         "info.parent", list[i], &nchildren, NULL);
-                if (clist != NULL && nchildren == 1) {
-                        char *s;
-                        s = get_prop_string(clist[0], "info.product");
-                        if (s && strcmp(s, "MMC16G") == 0) {
-                                ULOG_DEBUG_F("%s is the internal", list[i]);
-                                internal = 1;
-                        }
-                        libhal_free_string(s);
-                } else {
-                        ULOG_ERR_F("%p, %d children", clist, nchildren);
-                } 
-                libhal_free_string_array(clist);
-
-                init_card(list[i], internal);
+                init_card(list[i]);
         }
 
         if (int_mmc.udi != NULL) {