len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-07 05:35:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Repair charging screen on archos. usb_detect() doesn't return a boolean since 2007-09-04. Fixed same problem in the m:robe 500 bootloader and in bootbox.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17955 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-07-06 12:14:13 +00:00
parent f2998a81f2
commit b1e16d2161
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/screens.c
View file

@ -373,7 +373,7 @@ int charging_screen(void)
button = get_action(CONTEXT_STD,HZ/3);
if (button == ACTION_STD_OK)
rc = 2;
else if (usb_detect())
else if (usb_detect() == USB_INSERTED)
rc = 3;
else if (!charger_inserted())
rc = 1;

12
bootloader/mrobe500.c
View file

@ -9,10 +9,10 @@
*
* Copyright (C) 2007 by Karl Kurbjun
*
* 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 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.
@ -220,7 +220,7 @@ void main(void)
usb_init();
/* Enter USB mode without USB thread */
if(usb_detect())
if(usb_detect() == USB_INSERTED)
{
const char msg[] = "Bootloader USB mode";
reset_screen();
@ -233,7 +233,7 @@ void main(void)
sleep(HZ/20);
usb_enable(true);
while (usb_detect())
while (usb_detect() == USB_INSERTED)
{
ata_spin(); /* Prevent the drive from spinning down */
sleep(HZ);

4
flash/bootbox/main.c
View file

@ -115,7 +115,7 @@ void charging_screen(void)
break; /* start */
else
{
if (usb_detect())
if (usb_detect() == USB_INSERTED)
break;
else if (!charger_inserted())
power_off(); /* charger removed: power down */
@ -192,7 +192,7 @@ void main(void)
//disk_init();
usb_start_monitoring();
while (usb_detect())
while (usb_detect() == USB_INSERTED)
{ /* enter USB mode early, before trying to mount */
if (button_get_w_tmo(HZ/10) == SYS_USB_CONNECTED)
{