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 | |
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')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/usb-nano2g-6g.c | 51 | ||||
-rw-r--r-- | firmware/target/arm/usb-s3c6400x.c | 24 |
3 files changed, 53 insertions, 24 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index e792bee89f..3b49206728 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1479,6 +1479,7 @@ target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | |||
1479 | target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 1479 | target/arm/s5l8700/ipodnano2g/nand-nano2g.c |
1480 | target/arm/s5l8700/ipodnano2g/pmu-nano2g.c | 1480 | target/arm/s5l8700/ipodnano2g/pmu-nano2g.c |
1481 | target/arm/s5l8700/ipodnano2g/rtc-nano2g.c | 1481 | target/arm/s5l8700/ipodnano2g/rtc-nano2g.c |
1482 | target/arm/s5l8700/usb-nano2g-6g.c | ||
1482 | #ifndef BOOTLOADER | 1483 | #ifndef BOOTLOADER |
1483 | target/arm/s5l8700/ipodnano2g/audio-nano2g.c | 1484 | target/arm/s5l8700/ipodnano2g/audio-nano2g.c |
1484 | target/arm/s5l8700/ipodnano2g/piezo-nano2g.c | 1485 | target/arm/s5l8700/ipodnano2g/piezo-nano2g.c |
@@ -1501,6 +1502,7 @@ target/arm/s5l8702/postmortemstub.S | |||
1501 | #endif | 1502 | #endif |
1502 | target/arm/s5l8702/ipod6g/pmu-ipod6g.c | 1503 | target/arm/s5l8702/ipod6g/pmu-ipod6g.c |
1503 | target/arm/s5l8702/ipod6g/rtc-ipod6g.c | 1504 | target/arm/s5l8702/ipod6g/rtc-ipod6g.c |
1505 | target/arm/s5l8700/usb-nano2g-6g.c | ||
1504 | #ifndef BOOTLOADER | 1506 | #ifndef BOOTLOADER |
1505 | target/arm/s5l8702/timer-s5l8702.c | 1507 | target/arm/s5l8702/timer-s5l8702.c |
1506 | target/arm/s5l8702/debug-s5l8702.c | 1508 | target/arm/s5l8702/debug-s5l8702.c |
diff --git a/firmware/target/arm/s5l8700/usb-nano2g-6g.c b/firmware/target/arm/s5l8700/usb-nano2g-6g.c new file mode 100644 index 0000000000..7f5d38a5ae --- /dev/null +++ b/firmware/target/arm/s5l8700/usb-nano2g-6g.c | |||
@@ -0,0 +1,51 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2009 by Michael Sparmann | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "config.h" | ||
23 | #include "usb.h" | ||
24 | |||
25 | #ifdef HAVE_USBSTACK | ||
26 | #include "usb_core.h" | ||
27 | #include "power.h" | ||
28 | |||
29 | void usb_enable(bool on) | ||
30 | { | ||
31 | if (on) usb_core_init(); | ||
32 | else usb_core_exit(); | ||
33 | } | ||
34 | |||
35 | int usb_detect(void) | ||
36 | { | ||
37 | if (charger_inserted()) | ||
38 | return USB_INSERTED; | ||
39 | return USB_EXTRACTED; | ||
40 | } | ||
41 | #else | ||
42 | void usb_enable(bool on) | ||
43 | { | ||
44 | (void)on; | ||
45 | } | ||
46 | |||
47 | int usb_detect(void) | ||
48 | { | ||
49 | return USB_EXTRACTED; | ||
50 | } | ||
51 | #endif | ||
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 |