diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 15:44:32 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 15:44:32 +0000 |
commit | 249218a5c2133d4520c23ebfa541cd2f2310cf8f (patch) | |
tree | d24b92d620040a27fcfd14c2477d384f7ade7a1f /firmware/target/arm/usb-s3c6400x.c | |
parent | ab475d121c6e53aeb811c34d2c0049ba3c1775a5 (diff) | |
download | rockbox-249218a5c2133d4520c23ebfa541cd2f2310cf8f.tar.gz rockbox-249218a5c2133d4520c23ebfa541cd2f2310cf8f.zip |
usb-s3c6400x.c: move usb_detect and usb_enable
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31477 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/usb-s3c6400x.c')
-rw-r--r-- | firmware/target/arm/usb-s3c6400x.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c index 4b0382d2cd..cf346f1de1 100644 --- a/firmware/target/arm/usb-s3c6400x.c +++ b/firmware/target/arm/usb-s3c6400x.c | |||
@@ -390,24 +390,11 @@ void usb_init_device(void) | |||
390 | usb_drv_exit(); | 390 | usb_drv_exit(); |
391 | } | 391 | } |
392 | 392 | ||
393 | void usb_enable(bool on) | ||
394 | { | ||
395 | if (on) usb_core_init(); | ||
396 | else usb_core_exit(); | ||
397 | } | ||
398 | |||
399 | void usb_attach(void) | 393 | void usb_attach(void) |
400 | { | 394 | { |
401 | usb_enable(true); | 395 | usb_enable(true); |
402 | } | 396 | } |
403 | 397 | ||
404 | int usb_detect(void) | ||
405 | { | ||
406 | if (charger_inserted()) | ||
407 | return USB_INSERTED; | ||
408 | return USB_EXTRACTED; | ||
409 | } | ||
410 | |||
411 | #else | 398 | #else |
412 | void usb_init_device(void) | 399 | void usb_init_device(void) |
413 | { | 400 | { |
@@ -425,15 +412,4 @@ void usb_init_device(void) | |||
425 | PWRCON(1) |= 0x8; | 412 | PWRCON(1) |= 0x8; |
426 | #endif | 413 | #endif |
427 | } | 414 | } |
428 | |||
429 | void usb_enable(bool on) | ||
430 | { | ||
431 | (void)on; | ||
432 | } | ||
433 | |||
434 | /* Always return false for now */ | ||
435 | int usb_detect(void) | ||
436 | { | ||
437 | return USB_EXTRACTED; | ||
438 | } | ||
439 | #endif | 415 | #endif |