[U-Boot] [PATCH v5 5/5] samsung: misc: remove download mode info screen

Minkyu Kang
2014-05-07T08:07:03Z

Dear Przemyslaw Marczak,

On 06/05/14 17:45, Przemyslaw Marczak wrote:
> Hello Minkyu,
>
> On 05/05/2014 03:27 PM, Minkyu Kang wrote:
>> Dear Przemyslaw Marczak,
>>
>>
>> On 30 April 2014 20:28, Przemyslaw Marczak <p.marczak@samsung.com
>> <mailto:p.marczak@samsung.com>> wrote:
>>
>> This change removes LCD menu download mode info screen.
>> Now key press timeout is checked in function download_menu()
>> and menu options are displayed directly after PWR + VOLUP keys.
>>
>> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com
>> <mailto:p.marczak@samsung.com>>
>> Cc: Minkyu Kang <mk7.kang at samsung.com <mailto:mk7.kang@samsung.com>>
>>
>> ---
>> Changes v4:
>> - new commit
>>
>> Changes v5:
>> - none
>>
>> ---
>> board/samsung/common/misc.c | 73
>> +++++++++++++++++++--------------------------
>> 1 file changed, 31 insertions(+), 42 deletions(-)
>>
>> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
>> index 2ea275e..03106fd 100644
>> --- a/board/samsung/common/misc.c
>> +++ b/board/samsung/common/misc.c
>> @@ -261,7 +261,7 @@ static void display_download_menu(int mode)
>> selection[mode] = "[=>]";
>>
>> lcd_clear();
>> - lcd_printf("\n\t\tDownload Mode Menu\n");
>> + lcd_printf("\n\n\t\tDownload Mode Menu\n\n");
>>
>> for (i = 0; i <= BOOT_MODE_EXIT; i++)
>> lcd_printf("\t%s %s - %s\n\n", selection[i],
>> @@ -274,10 +274,38 @@ static void download_menu(void)
>> int mode = 0;
>> int last_mode = 0;
>> int run;
>> - int key;
>> + int key = 0;
>> + int timeout = 15; /* sec */
>> + int i;
>>
>> display_download_menu(mode);
>>
>> + lcd_puts("\n");
>> +
>> + /* Start count if no key is pressed */
>> + while (check_keys())
>> + continue;
>> +
>> + while (timeout--) {
>> + lcd_printf("\r\tNormal boot will start in: %2.d
>> seconds.",
>> + timeout);
>> +
>> + /* about 1000 ms in for loop */
>> + for (i = 0; i < 10; i++) {
>> + mdelay(100);
>> + key = check_keys();
>> + if (key)
>> + break;
>> + }
>> + if (key)
>>
>>
>> maybe, unnecessary if statement.
>>
>
> Please take a notice that there are two loops: "while" and "for",
> so the second "if (key)" is necessary for break a "while" loop on "user event".

Ah, I see :)
actually, I doubt that need to two loops... anyway OK.

Thanks,
Minkyu Kang.