From 2115eac7bb599ccc321f43c3bfa1a11672fd4b3a Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sat, 31 Dec 2011 18:43:59 +0000 Subject: usb_plugged() is PP only git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31489 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/gigabeat-s.c | 4 ++-- bootloader/imx233.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bootloader') diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 8483170522..7e28f55f09 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c @@ -110,7 +110,7 @@ static void handle_usb(int connect_timeout) break; } - if (!usb_plugged()) + if (usb_detect() == USB_EXTRACTED) break; /* Cable pulled */ } @@ -377,7 +377,7 @@ void main(void) /* Do USB first since a tar or binary could be added to the MTP directory * at the time and we can untar or move after unplugging. */ - if (usb_plugged()) + if (usb_detect() == USB_INSERTED) handle_usb(HZ*2); handle_untar(); diff --git a/bootloader/imx233.c b/bootloader/imx233.c index 276a334c56..3d66403cc0 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c @@ -73,7 +73,7 @@ static void usb_mode(int connect_timeout) break; } - if(!usb_plugged()) + if(usb_detect() == USB_EXTRACTED) break; /* Cable pulled */ } @@ -149,7 +149,7 @@ void main(uint32_t arg, uint32_t addr) if((ret = disk_mount_all()) <= 0) error(EDISK, ret, false); - if(usb_plugged()) + if(usb_detect() == USB_INSERTED) usb_mode(HZ); printf("Loading firmware"); -- cgit v1.2.3