[maemo-commits] [maemo-commits] r18114 - in projects/haf/trunk/ke-recv: debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Apr 20 17:40:51 EEST 2009
- Previous message: [maemo-commits] r18113 - in projects/haf/trunk/hildon-control-panel: . debian src
- Next message: [maemo-commits] r18115 - projects/haf/tags/ke-recv
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2009-04-20 17:40:39 +0300 (Mon, 20 Apr 2009) New Revision: 18114 Modified: projects/haf/trunk/ke-recv/debian/changelog projects/haf/trunk/ke-recv/src/events.c projects/haf/trunk/ke-recv/src/events.h projects/haf/trunk/ke-recv/src/ke-recv.c projects/haf/trunk/ke-recv/src/mmc-format.c projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh Log: fix for Lokesh's card Modified: projects/haf/trunk/ke-recv/debian/changelog =================================================================== --- projects/haf/trunk/ke-recv/debian/changelog 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/debian/changelog 2009-04-20 14:40:39 UTC (rev 18114) @@ -1,7 +1,14 @@ -ke-recv (3.14-1~unreleased) unstable; urgency=low +ke-recv (3.14-1) unstable; urgency=low * Added dependencies to various l10n packages whose translations are used. * Removed a number of unused l10n strings. + * Fix USB sharing failure messages to match the new UI specification. + * Disable swap on/off functions. + * Remove "-s 128" format option because Lokesh's card failed to format with + it. + * Fixes: NB#112053 - Formatting mmc throws no banner and actually doesnt + format anything. + * Fix a small typo in osso-mmc-mount.sh partition type checking code. -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Mon, 20 Apr 2009 12:38:07 +0300 Modified: projects/haf/trunk/ke-recv/src/events.c =================================================================== --- projects/haf/trunk/ke-recv/src/events.c 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/src/events.c 2009-04-20 14:40:39 UTC (rev 18114) @@ -41,7 +41,7 @@ GConfClient* gconfclient; -static void usb_share_card(mmc_info_t *mmc, gboolean show); +static int usb_share_card(mmc_info_t *mmc, gboolean show); static int mount_volumes(mmc_info_t *mmc, gboolean show_errors); static int do_unmount(const char *mountpoint, gboolean lazy); static void open_dialog_helper(mmc_info_t *mmc); @@ -339,6 +339,7 @@ static gboolean possibly_turn_swap_on(const mmc_info_t *mmc) { +#if 0 int ret; if (mmc->swap_location == NULL) { @@ -368,6 +369,8 @@ } inform_mmc_swapping(TRUE, mmc); return TRUE; +#endif + return FALSE; } static void check_swap_dialog(mmc_info_t *mmc) @@ -404,6 +407,7 @@ static void possibly_turn_swap_off(swap_dialog_t dialog, mmc_info_t *mmc) { +#if 0 if (mmc->swap_location == NULL) { return; } @@ -458,10 +462,12 @@ "close apps"); } } +#endif } void possibly_turn_swap_off_simple(mmc_info_t *mmc) { +#if 0 if (mmc->swap_location == NULL) { return; } @@ -489,10 +495,12 @@ } else { ULOG_DEBUG_F("cannot safely turn %s swap off", mmc->name); } +#endif } static gboolean possibly_turn_swap_off_nocheck(mmc_info_t *mmc) { +#if 0 int ret; if (mmc->swap_location == NULL) { @@ -516,6 +524,7 @@ return FALSE; } inform_mmc_swapping(FALSE, mmc); +#endif return TRUE; } @@ -568,7 +577,7 @@ } } -static void usb_share_card(mmc_info_t *mmc, gboolean show) +static int usb_share_card(mmc_info_t *mmc, gboolean show) { const char *args[] = {NULL, NULL}; char *dev; @@ -585,9 +594,9 @@ ULOG_DEBUG_F("falling back to partition 1!"); vol = get_nth_volume(mmc, 1); if (vol == NULL || vol->dev_name == NULL) - return; + return 0; } else - return; + return 0; } dev = vol->dev_name; } else @@ -595,12 +604,12 @@ if (dev == NULL) { ULOG_DEBUG_F("dev unknown for %s", mmc->name); - return; + return 0; } if (mmc->storage_udi == NULL) { ULOG_DEBUG_F("device is not ready yet"); - return; + return 0; } args[0] = dev; @@ -612,9 +621,11 @@ } */ inform_mmc_used_over_usb(TRUE, mmc); + return 1; } else { ULOG_ERR_F("failed to load USB mass storage module for %s", dev); + return 0; } } @@ -1074,7 +1085,7 @@ inform_mmc_cover_open(FALSE, mmc); if (!ignore_cable && in_mass_storage_mode() && !device_locked) { - usb_share_card(mmc, TRUE); + ret = usb_share_card(mmc, TRUE); } else { init_mmc_volumes(mmc); update_mmc_label(mmc); @@ -1178,7 +1189,8 @@ } } -void show_usb_sharing_failed_dialog(mmc_info_t *in, mmc_info_t *ex) +void show_usb_sharing_failed_dialog(mmc_info_t *in, mmc_info_t *ex, + gboolean ext_failed) { char buf[MAX_MSG_LEN + 1]; buf[0] = '\0'; @@ -1193,19 +1205,22 @@ snprintf(buf, MAX_MSG_LEN, MSG_USB_MEMORY_CARDS_IN_USE, ex->display_name); + display_system_note(buf); } else { - if (ex) { - /* - mmc_info_t *mmc = in; - mmc = ex; - */ - /* error string missing for this case */ - return; - } else + if (ext_failed) { + /* external card in use */ snprintf(buf, MAX_MSG_LEN, - MSG_USB_MEMORY_CARD_IN_USE); + _("card_connected_via_usb_card"), + ex->display_name); + display_dialog(buf); + } else { + /* internal card in use */ + snprintf(buf, MAX_MSG_LEN, + _("card_connected_via_usb_device"), + ex->display_name); + display_dialog(buf); + } } - display_system_note(buf); } static void open_dialog_helper(mmc_info_t *mmc) @@ -1249,7 +1264,7 @@ if (!unmount_volumes(mmc, FALSE)) { ret = 0; } else { - usb_share_card(mmc, TRUE); + ret = usb_share_card(mmc, TRUE); } } break; @@ -1302,7 +1317,7 @@ inform_device_present(TRUE, mmc); if (!ignore_cable && in_mass_storage_mode() && !device_locked) { - usb_share_card(mmc, TRUE); + ret = usb_share_card(mmc, TRUE); } break; case E_DEVICE_REMOVED: @@ -1330,7 +1345,7 @@ inform_device_present(TRUE, mmc); if (!ignore_cable && in_mass_storage_mode() && !device_locked) { - usb_share_card(mmc, FALSE); + ret = usb_share_card(mmc, FALSE); } else if (!in_peripheral_wait_mode()) { update_mmc_label(mmc); mount_volumes(mmc, TRUE); @@ -1359,7 +1374,7 @@ CLOSE_SWAP_DIALOG if (!ignore_cable && in_mass_storage_mode() && !device_locked) { - usb_share_card(mmc, TRUE); + ret = usb_share_card(mmc, TRUE); } else { init_mmc_volumes(mmc); /* re-read volumes */ mount_volumes(mmc, TRUE); Modified: projects/haf/trunk/ke-recv/src/events.h =================================================================== --- projects/haf/trunk/ke-recv/src/events.h 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/src/events.h 2009-04-20 14:40:39 UTC (rev 18114) @@ -134,7 +134,8 @@ void inform_slide_keyboard(gboolean value); void inform_usb_cable_attached(gboolean value); void unshare_usb_shared_card(mmc_info_t *mmc); -void show_usb_sharing_failed_dialog(mmc_info_t *in, mmc_info_t *ex); +void show_usb_sharing_failed_dialog(mmc_info_t *in, mmc_info_t *ex, + gboolean ext_failed); void set_mmc_corrupted_flag(gboolean value, const mmc_info_t *mmc); void update_mmc_label(mmc_info_t *mmc); void possibly_turn_swap_off_simple(mmc_info_t *mmc); Modified: projects/haf/trunk/ke-recv/src/ke-recv.c =================================================================== --- projects/haf/trunk/ke-recv/src/ke-recv.c 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/src/ke-recv.c 2009-04-20 14:40:39 UTC (rev 18114) @@ -2827,11 +2827,11 @@ er = handle_event(E_PLUGGED, &ext_mmc, NULL); if (!er && !ir) { - show_usb_sharing_failed_dialog(&int_mmc, &ext_mmc); + show_usb_sharing_failed_dialog(&int_mmc, &ext_mmc, 0); } else if (!er) { - show_usb_sharing_failed_dialog(NULL, &ext_mmc); + show_usb_sharing_failed_dialog(NULL, &ext_mmc, 1); } else if (!ir) { - show_usb_sharing_failed_dialog(&int_mmc, NULL); + show_usb_sharing_failed_dialog(NULL, &ext_mmc, 0); } else if (ext_mmc.whole_device && int_mmc.whole_device) { /* both succeeded */ display_dialog(_("cards_connected_via_usb")); Modified: projects/haf/trunk/ke-recv/src/mmc-format.c =================================================================== --- projects/haf/trunk/ke-recv/src/mmc-format.c 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/src/mmc-format.c 2009-04-20 14:40:39 UTC (rev 18114) @@ -164,7 +164,9 @@ "-n", NULL, /* volume label */ "-S", NULL, /* logical sector size */ "-R", "38", /* reserved sectors */ +#if 0 /* some cards fail with "-s 128" */ "-s", "128", /* sectors per cluster */ +#endif NULL}; ULOG_DEBUG_F("entered"); Modified: projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh =================================================================== --- projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh 2009-04-20 14:29:50 UTC (rev 18113) +++ projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh 2009-04-20 14:40:39 UTC (rev 18114) @@ -37,7 +37,7 @@ mkdir -p $MP fi -if ! [ $PDEV = /dev/mmcblk0 -o $PDEV = /dev/mmcblk0 ]; then +if ! [ $PDEV = /dev/mmcblk0 -o $PDEV = /dev/mmcblk1 ]; then # check the FAT magic number PNUM=$(echo $PDEV | sed "s#/dev/mmcblk[01]p##") DEV=$(echo $PDEV | sed "s#p[1234]##")
- Previous message: [maemo-commits] r18113 - in projects/haf/trunk/hildon-control-panel: . debian src
- Next message: [maemo-commits] r18115 - projects/haf/tags/ke-recv
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]