5bdb2fccdb
Drop init_usb(), instead initialize USB early in the main function so the hardware is placed into a known good state after a USB boot. The impact on boot time should be minimal. Change-Id: I9774ddfc2c27811363bdb0c54cb0e57b5ca59d73
70 lines
2.2 KiB
C
70 lines
2.2 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2022 Aidan MacDonald
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
|
|
#include "x1000bootloader.h"
|
|
#include "storage.h"
|
|
#include "button.h"
|
|
#include "kernel.h"
|
|
#include "usb.h"
|
|
|
|
/* Set to true if a SYS_USB_CONNECTED event is seen
|
|
* Set to false if a SYS_USB_DISCONNECTED event is seen
|
|
* Handled by the gui code since that's how events are delivered
|
|
* TODO: this is an ugly kludge */
|
|
bool is_usb_connected = false;
|
|
|
|
/* this is both incorrect and incredibly racy... */
|
|
int check_disk(bool wait)
|
|
{
|
|
if(storage_present(IF_MD(0)))
|
|
return DISK_PRESENT;
|
|
if(!wait)
|
|
return DISK_ABSENT;
|
|
|
|
while(!storage_present(IF_MD(0))) {
|
|
splash2(0, "Insert SD card", "Press " BL_QUIT_NAME " to cancel");
|
|
if(get_button(HZ/4) == BL_QUIT)
|
|
return DISK_CANCELED;
|
|
}
|
|
|
|
/* a lie intended to give time for mounting the disk in the background */
|
|
splash(HZ, "Scanning disk");
|
|
|
|
return DISK_PRESENT;
|
|
}
|
|
|
|
void usb_mode(void)
|
|
{
|
|
if(!is_usb_connected)
|
|
splash2(0, "Waiting for USB", "Press " BL_QUIT_NAME " to cancel");
|
|
|
|
while(!is_usb_connected)
|
|
if(get_button(TIMEOUT_BLOCK) == BL_QUIT)
|
|
return;
|
|
|
|
splash(0, "USB mode");
|
|
usb_acknowledge(SYS_USB_CONNECTED_ACK);
|
|
|
|
while(is_usb_connected)
|
|
get_button(TIMEOUT_BLOCK);
|
|
|
|
splash(3*HZ, "USB disconnected");
|
|
}
|