diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/as3525/system-target.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-target.h | 27 | ||||
-rw-r--r-- | firmware/target/arm/imx233/system-target.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/usb-target.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/system-target.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-target.h | 3 |
6 files changed, 9 insertions, 33 deletions
diff --git a/firmware/target/arm/as3525/system-target.h b/firmware/target/arm/as3525/system-target.h index cdcc2e6687..db5bb892ef 100644 --- a/firmware/target/arm/as3525/system-target.h +++ b/firmware/target/arm/as3525/system-target.h | |||
@@ -64,4 +64,8 @@ static inline void mdelay(unsigned msecs) | |||
64 | { | 64 | { |
65 | udelay(1000 * msecs); | 65 | udelay(1000 * msecs); |
66 | } | 66 | } |
67 | |||
68 | void usb_insert_int(void); | ||
69 | void usb_remove_int(void); | ||
70 | |||
67 | #endif /* SYSTEM_TARGET_H */ | 71 | #endif /* SYSTEM_TARGET_H */ |
diff --git a/firmware/target/arm/as3525/usb-target.h b/firmware/target/arm/as3525/usb-target.h index 673fb176c6..e69de29bb2 100644 --- a/firmware/target/arm/as3525/usb-target.h +++ b/firmware/target/arm/as3525/usb-target.h | |||
@@ -1,27 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardelll | ||
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 | #ifndef USB_TARGET_H | ||
22 | #define USB_TARGET_H | ||
23 | |||
24 | void usb_insert_int(void); | ||
25 | void usb_remove_int(void); | ||
26 | |||
27 | #endif /* USB_TARGET_H */ | ||
diff --git a/firmware/target/arm/imx233/system-target.h b/firmware/target/arm/imx233/system-target.h index 90a2966f2f..a01c05febd 100644 --- a/firmware/target/arm/imx233/system-target.h +++ b/firmware/target/arm/imx233/system-target.h | |||
@@ -114,4 +114,7 @@ static inline void mdelay(unsigned msecs) | |||
114 | udelay(1000 * msecs); | 114 | udelay(1000 * msecs); |
115 | } | 115 | } |
116 | 116 | ||
117 | void usb_insert_int(void); | ||
118 | void usb_remove_int(void); | ||
119 | |||
117 | #endif /* SYSTEM_TARGET_H */ | 120 | #endif /* SYSTEM_TARGET_H */ |
diff --git a/firmware/target/arm/imx233/usb-target.h b/firmware/target/arm/imx233/usb-target.h index 600fc990ed..89ccaee85d 100644 --- a/firmware/target/arm/imx233/usb-target.h +++ b/firmware/target/arm/imx233/usb-target.h | |||
@@ -27,7 +27,4 @@ | |||
27 | #define USB_DRIVER_CLOSE | 27 | #define USB_DRIVER_CLOSE |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | void usb_insert_int(void); | ||
31 | void usb_remove_int(void); | ||
32 | |||
33 | #endif /* USB_TARGET_H */ | 30 | #endif /* USB_TARGET_H */ |
diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h index 022baa1466..e7f9ce0245 100644 --- a/firmware/target/arm/system-target.h +++ b/firmware/target/arm/system-target.h | |||
@@ -52,6 +52,8 @@ | |||
52 | 52 | ||
53 | void usb_pin_init(void); | 53 | void usb_pin_init(void); |
54 | bool usb_plugged(void); | 54 | bool usb_plugged(void); |
55 | void firewire_insert_int(void); | ||
56 | void usb_insert_int(void); | ||
55 | 57 | ||
56 | static inline void udelay(unsigned usecs) | 58 | static inline void udelay(unsigned usecs) |
57 | { | 59 | { |
diff --git a/firmware/target/arm/usb-target.h b/firmware/target/arm/usb-target.h index 34e7a54262..e0145ec242 100644 --- a/firmware/target/arm/usb-target.h +++ b/firmware/target/arm/usb-target.h | |||
@@ -21,9 +21,6 @@ | |||
21 | #ifndef USB_TARGET_H | 21 | #ifndef USB_TARGET_H |
22 | #define USB_TARGET_H | 22 | #define USB_TARGET_H |
23 | 23 | ||
24 | void usb_insert_int(void); | ||
25 | void firewire_insert_int(void); | ||
26 | |||
27 | #ifdef HAVE_BOOTLOADER_USB_MODE | 24 | #ifdef HAVE_BOOTLOADER_USB_MODE |
28 | #define USB_DRIVER_CLOSE | 25 | #define USB_DRIVER_CLOSE |
29 | #endif | 26 | #endif |