diff options
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | recovery.fstab | 12 | ||||
| -rw-r--r-- | recovery/Android.mk | 15 | ||||
| -rw-r--r-- | recovery/recovery_ui.c | 115 |
4 files changed, 140 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index d8fde69..47de211 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -43,6 +43,10 @@ BOARD_EGL_CFG := device/samsung/tuna/egl.cfg #BOARD_USES_OVERLAY := true #USE_OPENGL_RENDERER := true +TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" +TARGET_RECOVERY_UI_LIB := librecovery_ui_tuna +TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/tuna + TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456 #BOARD_SYSTEMIMAGE_PARTITION_SIZE := 16777216 diff --git a/recovery.fstab b/recovery.fstab index e6f954b..b00e6a2 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -1,11 +1,11 @@ # mount point fstype device /sdcard vfat /dev/block/sda1 -/system ext4 /dev/block/platform/omap/omap_hsmmc.1/by-name/system -/cache ext4 /dev/block/platform/omap/omap_hsmmc.1/by-name/cache -/data ext4 /dev/block/platform/omap/omap_hsmmc.1/by-name/userdata -/misc mtd misc -/boot mtd boot -/recovery mtd recovery +/system ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/system +/cache ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/cache +/data ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/userdata +/misc emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/misc +/boot emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/boot +/recovery emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/recovery /bootloader mtd bootloader /radio mtd radio diff --git a/recovery/Android.mk b/recovery/Android.mk new file mode 100644 index 0000000..9e6b177 --- /dev/null +++ b/recovery/Android.mk @@ -0,0 +1,15 @@ +ifeq ($(TARGET_DEVICE),tuna) + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := eng +LOCAL_C_INCLUDES += bootable/recovery +LOCAL_SRC_FILES := recovery_ui.c + +# should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk +LOCAL_MODULE := librecovery_ui_tuna + +include $(BUILD_STATIC_LIBRARY) + +endif diff --git a/recovery/recovery_ui.c b/recovery/recovery_ui.c new file mode 100644 index 0000000..45b012b --- /dev/null +++ b/recovery/recovery_ui.c @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <linux/input.h> +#include <sys/stat.h> +#include <errno.h> +#include <string.h> + +#include "recovery_ui.h" +#include "common.h" + +char* MENU_HEADERS[] = { "Volume up/down to move highlight;", + "power button to select.", + "", + NULL }; + +char* MENU_ITEMS[] = { "reboot system now", + "apply update from /sdcard", + "wipe data/factory reset", + "wipe cache partition", + NULL }; + +void device_ui_init(UIParameters* ui_parameters) { +} + +int device_recovery_start() { + // recovery can get started before the kernel has created the EMMC + // devices, which will make the wipe_data operation fail (trying + // to open a device that doesn't exist). Hold up the start of + // recovery for up to 5 seconds waiting for the userdata partition + // block device to exist. + + const char* fn = "/dev/block/platform/omap/omap_hsmmc.0/by-name/userdata"; + + int tries = 0; + int ret; + struct stat buf; + do { + ++tries; + ret = stat(fn, &buf); + if (ret) { + printf("try %d: %s\n", tries, strerror(errno)); + sleep(1); + } + } while (ret && tries < 5); + if (!ret) { + printf("stat() of %s succeeded on try %d\n", fn, tries); + } else { + printf("failed to stat %s\n", fn); + } + + // We let recovery attempt to carry on even if the stat never + // succeeded. + + return 0; +} + +int device_toggle_display(volatile char* key_pressed, int key_code) { + // hold power and press volume-up + return key_pressed[KEY_POWER] && key_code == KEY_VOLUMEUP; +} + +int device_reboot_now(volatile char* key_pressed, int key_code) { + // Reboot if the power key is pressed five times in a row, with + // no other keys in between. + static int presses = 0; + if (key_code == KEY_POWER) { // power button + ++presses; + return presses == 5; + } else { + presses = 0; + return 0; + } +} + +int device_handle_key(int key_code, int visible) { + if (visible) { + switch (key_code) { + case KEY_DOWN: + case KEY_VOLUMEDOWN: + return HIGHLIGHT_DOWN; + + case KEY_UP: + case KEY_VOLUMEUP: + return HIGHLIGHT_UP; + + case KEY_ENTER: + case KEY_POWER: // crespo power + return SELECT_ITEM; + } + } + + return NO_ACTION; +} + +int device_perform_action(int which) { + return which; +} + +int device_wipe_data() { + return 0; +} |