diff options
-rw-r--r-- | firmware/target/arm/as3525/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/iriver/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/pbell/vibe500/usb-target.h | 29 | ||||
-rw-r--r-- | firmware/target/arm/system-target.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/sansa-connect/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/hosted/android/app/usb-target.h | 25 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/app/usb-target.h | 25 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/usb-target.h | 25 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h | 1 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h | 1 |
13 files changed, 2 insertions, 112 deletions
diff --git a/firmware/target/arm/as3525/usb-target.h b/firmware/target/arm/as3525/usb-target.h index 9cafced050..673fb176c6 100644 --- a/firmware/target/arm/as3525/usb-target.h +++ b/firmware/target/arm/as3525/usb-target.h | |||
@@ -21,7 +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 | int usb_detect(void); | ||
25 | void usb_insert_int(void); | 24 | void usb_insert_int(void); |
26 | void usb_remove_int(void); | 25 | void usb_remove_int(void); |
27 | 26 | ||
diff --git a/firmware/target/arm/imx233/usb-target.h b/firmware/target/arm/imx233/usb-target.h index 00cef2c060..976d954038 100644 --- a/firmware/target/arm/imx233/usb-target.h +++ b/firmware/target/arm/imx233/usb-target.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #define USB_DRIVER_CLOSE | 27 | #define USB_DRIVER_CLOSE |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | int usb_detect(void); | ||
31 | void usb_insert_int(void); | 30 | void usb_insert_int(void); |
32 | void usb_remove_int(void); | 31 | void usb_remove_int(void); |
33 | bool usb_plugged(void); | 32 | bool usb_plugged(void); |
diff --git a/firmware/target/arm/iriver/usb-target.h b/firmware/target/arm/iriver/usb-target.h index a0905ebe51..1b0dc7e194 100644 --- a/firmware/target/arm/iriver/usb-target.h +++ b/firmware/target/arm/iriver/usb-target.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #define USB_DRIVER_CLOSE | 28 | #define USB_DRIVER_CLOSE |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | void usb_pin_init(void); /* Init the GPIO input only */ | ||
32 | bool usb_plugged(void); /* Returns instantaneous state - always */ | 31 | bool usb_plugged(void); /* Returns instantaneous state - always */ |
33 | 32 | ||
34 | #endif | 33 | #endif |
diff --git a/firmware/target/arm/pbell/vibe500/usb-target.h b/firmware/target/arm/pbell/vibe500/usb-target.h index 2cedf514c5..e69de29bb2 100644 --- a/firmware/target/arm/pbell/vibe500/usb-target.h +++ b/firmware/target/arm/pbell/vibe500/usb-target.h | |||
@@ -1,29 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id:$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardell | ||
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 | /* Based off x5 version */ | ||
23 | |||
24 | #ifndef USB_TARGET_H | ||
25 | #define USB_TARGET_H | ||
26 | |||
27 | void usb_pin_init(void); /* Init the GPIO input only */ | ||
28 | |||
29 | #endif | ||
diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h index 730bc2dbbb..91e6beb868 100644 --- a/firmware/target/arm/system-target.h +++ b/firmware/target/arm/system-target.h | |||
@@ -49,6 +49,8 @@ | |||
49 | #define inw(a) (*(volatile unsigned short *) (a)) | 49 | #define inw(a) (*(volatile unsigned short *) (a)) |
50 | #define outw(a,b) (*(volatile unsigned short *) (b) = (a)) | 50 | #define outw(a,b) (*(volatile unsigned short *) (b) = (a)) |
51 | 51 | ||
52 | void usb_pin_init(void); | ||
53 | |||
52 | static inline void udelay(unsigned usecs) | 54 | static inline void udelay(unsigned usecs) |
53 | { | 55 | { |
54 | unsigned stop = USEC_TIMER + usecs; | 56 | unsigned stop = USEC_TIMER + usecs; |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h index 9415480d88..28862de876 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h | |||
@@ -74,7 +74,6 @@ | |||
74 | #define USE_IRAM | 74 | #define USE_IRAM |
75 | 75 | ||
76 | #include <stdbool.h> | 76 | #include <stdbool.h> |
77 | int usb_detect(void); | ||
78 | bool usb_drv_connected(void); | 77 | bool usb_drv_connected(void); |
79 | 78 | ||
80 | #endif | 79 | #endif |
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h b/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h index 3e8aa14a15..5874d812cc 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h +++ b/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "dm320.h" | 25 | #include "dm320.h" |
26 | 26 | ||
27 | #include <stdbool.h> | 27 | #include <stdbool.h> |
28 | int usb_detect(void); | ||
29 | bool usb_drv_connected(void); | 28 | bool usb_drv_connected(void); |
30 | 29 | ||
31 | #endif | 30 | #endif |
diff --git a/firmware/target/arm/usb-target.h b/firmware/target/arm/usb-target.h index 68418c9208..802b8e1445 100644 --- a/firmware/target/arm/usb-target.h +++ b/firmware/target/arm/usb-target.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | void usb_insert_int(void); | 24 | void usb_insert_int(void); |
25 | void firewire_insert_int(void); | 25 | void firewire_insert_int(void); |
26 | void usb_pin_init(void); /* Init the GPIO input only */ | ||
27 | bool usb_plugged(void); /* Returns instantaneous state - always */ | 26 | bool usb_plugged(void); /* Returns instantaneous state - always */ |
28 | 27 | ||
29 | #ifdef HAVE_BOOTLOADER_USB_MODE | 28 | #ifdef HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/target/hosted/android/app/usb-target.h b/firmware/target/hosted/android/app/usb-target.h index 10e04677f9..e69de29bb2 100644 --- a/firmware/target/hosted/android/app/usb-target.h +++ b/firmware/target/hosted/android/app/usb-target.h | |||
@@ -1,25 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2010 by Thomas Martitz | ||
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 | #ifndef __USB_TARGET_H__ | ||
23 | #define __USB_TARGET_H__ | ||
24 | |||
25 | #endif /* __USB_TARGET_H__ */ | ||
diff --git a/firmware/target/hosted/sdl/app/usb-target.h b/firmware/target/hosted/sdl/app/usb-target.h index 10e04677f9..e69de29bb2 100644 --- a/firmware/target/hosted/sdl/app/usb-target.h +++ b/firmware/target/hosted/sdl/app/usb-target.h | |||
@@ -1,25 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2010 by Thomas Martitz | ||
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 | #ifndef __USB_TARGET_H__ | ||
23 | #define __USB_TARGET_H__ | ||
24 | |||
25 | #endif /* __USB_TARGET_H__ */ | ||
diff --git a/firmware/target/hosted/ypr0/usb-target.h b/firmware/target/hosted/ypr0/usb-target.h index 237d179775..e69de29bb2 100644 --- a/firmware/target/hosted/ypr0/usb-target.h +++ b/firmware/target/hosted/ypr0/usb-target.h | |||
@@ -1,25 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id: usb-target.h 29516 2011-03-05 15:31:52Z thomasjfox $ | ||
9 | * | ||
10 | * Copyright (C) 2010 by Thomas Martitz | ||
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 | #ifndef __USB_TARGET_H__ | ||
23 | #define __USB_TARGET_H__ | ||
24 | |||
25 | #endif /* __USB_TARGET_H__ */ | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h index a1acb6f912..fa3336946a 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h | |||
@@ -39,7 +39,6 @@ | |||
39 | /* Connect by events, not by tick polling */ | 39 | /* Connect by events, not by tick polling */ |
40 | #define USB_STATUS_BY_EVENT | 40 | #define USB_STATUS_BY_EVENT |
41 | 41 | ||
42 | int usb_detect(void); | ||
43 | bool usb_drv_connected(void); | 42 | bool usb_drv_connected(void); |
44 | 43 | ||
45 | #endif | 44 | #endif |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h index aa51a76f4c..46c3675d38 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h | |||
@@ -37,7 +37,6 @@ | |||
37 | 37 | ||
38 | #define USB_DRV_CONNECTED() (__gpio_get_pin(GPIO_UDC_DETE) == 1) | 38 | #define USB_DRV_CONNECTED() (__gpio_get_pin(GPIO_UDC_DETE) == 1) |
39 | 39 | ||
40 | int usb_detect(void); | ||
41 | bool usb_drv_connected(void); | 40 | bool usb_drv_connected(void); |
42 | 41 | ||
43 | #endif | 42 | #endif |