diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/gigabeat-s.c | 4 | ||||
-rw-r--r-- | bootloader/imx233.c | 4 |
2 files changed, 4 insertions, 4 deletions
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) | |||
110 | break; | 110 | break; |
111 | } | 111 | } |
112 | 112 | ||
113 | if (!usb_plugged()) | 113 | if (usb_detect() == USB_EXTRACTED) |
114 | break; /* Cable pulled */ | 114 | break; /* Cable pulled */ |
115 | } | 115 | } |
116 | 116 | ||
@@ -377,7 +377,7 @@ void main(void) | |||
377 | 377 | ||
378 | /* Do USB first since a tar or binary could be added to the MTP directory | 378 | /* Do USB first since a tar or binary could be added to the MTP directory |
379 | * at the time and we can untar or move after unplugging. */ | 379 | * at the time and we can untar or move after unplugging. */ |
380 | if (usb_plugged()) | 380 | if (usb_detect() == USB_INSERTED) |
381 | handle_usb(HZ*2); | 381 | handle_usb(HZ*2); |
382 | 382 | ||
383 | handle_untar(); | 383 | 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) | |||
73 | break; | 73 | break; |
74 | } | 74 | } |
75 | 75 | ||
76 | if(!usb_plugged()) | 76 | if(usb_detect() == USB_EXTRACTED) |
77 | break; /* Cable pulled */ | 77 | break; /* Cable pulled */ |
78 | } | 78 | } |
79 | 79 | ||
@@ -149,7 +149,7 @@ void main(uint32_t arg, uint32_t addr) | |||
149 | if((ret = disk_mount_all()) <= 0) | 149 | if((ret = disk_mount_all()) <= 0) |
150 | error(EDISK, ret, false); | 150 | error(EDISK, ret, false); |
151 | 151 | ||
152 | if(usb_plugged()) | 152 | if(usb_detect() == USB_INSERTED) |
153 | usb_mode(HZ); | 153 | usb_mode(HZ); |
154 | 154 | ||
155 | printf("Loading firmware"); | 155 | printf("Loading firmware"); |