move usb_pin_init() declaration to PP's system-target.h

remove duplicate usb_detect() declaration
Remove all content from empty usb-target.h files

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31488 a1c6a512-1295-4272-9138-f99709370657

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 @@
 #ifndef USB_TARGET_H
 #define USB_TARGET_H
 
-int usb_detect(void);
 void usb_insert_int(void);
 void usb_remove_int(void);
 
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 @@
 #define USB_DRIVER_CLOSE
 #endif
 
-int usb_detect(void);
 void usb_insert_int(void);
 void usb_remove_int(void);
 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 @@
 #define USB_DRIVER_CLOSE
 #endif
 
-void usb_pin_init(void); /* Init the GPIO input only */
 bool usb_plugged(void); /* Returns instantaneous state - always */
 
 #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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id:$
- *
- * Copyright (C) 2006 by Barry Wardell
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Based off x5 version */
-
-#ifndef USB_TARGET_H
-#define USB_TARGET_H
-
-void usb_pin_init(void); /* Init the GPIO input only */
-
-#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 @@
 #define inw(a) (*(volatile unsigned short *) (a))
 #define outw(a,b) (*(volatile unsigned short *) (b) = (a))
 
+void usb_pin_init(void);
+
 static inline void udelay(unsigned usecs)
 {
     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 @@
 #define USE_IRAM
 
 #include <stdbool.h>
-int usb_detect(void);
 bool usb_drv_connected(void);
 
 #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 @@
 #include "dm320.h"
 
 #include <stdbool.h>
-int usb_detect(void);
 bool usb_drv_connected(void);
 
 #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 @@
 
 void usb_insert_int(void);
 void firewire_insert_int(void);
-void usb_pin_init(void); /* Init the GPIO input only */
 bool usb_plugged(void); /* Returns instantaneous state - always */
 
 #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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2010 by Thomas Martitz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __USB_TARGET_H__
-#define __USB_TARGET_H__
-
-#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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2010 by Thomas Martitz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __USB_TARGET_H__
-#define __USB_TARGET_H__
-
-#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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id: usb-target.h 29516 2011-03-05 15:31:52Z thomasjfox $
- *
- * Copyright (C) 2010 by Thomas Martitz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef __USB_TARGET_H__
-#define __USB_TARGET_H__
-
-#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 @@
 /* Connect by events, not by tick polling */
 #define USB_STATUS_BY_EVENT
 
-int usb_detect(void);
 bool usb_drv_connected(void);
 
 #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 @@
 
 #define USB_DRV_CONNECTED()    (__gpio_get_pin(GPIO_UDC_DETE) == 1)
 
-int usb_detect(void);
 bool usb_drv_connected(void);
 
 #endif