From bce42fdc31648d7087dcbaac0704a422b33ac147 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sat, 31 Dec 2011 18:43:41 +0000 Subject: usb_init_device(): move prototype to usb.h Get rid of some usb-target.h files git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31487 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/usb.h | 4 +++ firmware/target/arm/as3525/usb-as3525.c | 4 +++ firmware/target/arm/as3525/usb-target.h | 2 -- firmware/target/arm/imx233/usb-target.h | 1 - firmware/target/arm/imx31/gigabeat-s/usb-target.h | 1 - firmware/target/arm/iriver/usb-target.h | 1 - firmware/target/arm/pbell/vibe500/usb-target.h | 1 - firmware/target/arm/pnx0101/usb-target.h | 29 ---------------------- .../target/arm/s3c2440/gigabeat-fx/usb-target.h | 26 ------------------- firmware/target/arm/s5l8700/usb-target.h | 24 ------------------ .../arm/tms320dm320/creative-zvm/usb-target.h | 1 - .../arm/tms320dm320/sansa-connect/usb-target.h | 1 - firmware/target/arm/usb-target.h | 1 - firmware/target/coldfire/usb-target.h | 26 ------------------- .../mips/ingenic_jz47xx/onda_vx747/usb-target.h | 1 - .../mips/ingenic_jz47xx/onda_vx767/usb-target.h | 1 - firmware/target/sh/usb-target.h | 26 ------------------- 17 files changed, 8 insertions(+), 142 deletions(-) diff --git a/firmware/export/usb.h b/firmware/export/usb.h index ae6d59b497..4af5617b3e 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h @@ -151,4 +151,8 @@ void usb_set_hid(bool enable); void usb_set_skip_first_drive(bool skip); #endif +#if !defined(SIMULATOR) && !defined(USB_NONE) +void usb_init_device(void); +#endif + #endif diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c index ba4cbc4dda..288ee5b64b 100644 --- a/firmware/target/arm/as3525/usb-as3525.c +++ b/firmware/target/arm/as3525/usb-as3525.c @@ -79,3 +79,7 @@ int usb_detect(void) { return usb_status; } + +void usb_init_device(void) +{ +} diff --git a/firmware/target/arm/as3525/usb-target.h b/firmware/target/arm/as3525/usb-target.h index 3643cf84b6..9cafced050 100644 --- a/firmware/target/arm/as3525/usb-target.h +++ b/firmware/target/arm/as3525/usb-target.h @@ -21,8 +21,6 @@ #ifndef USB_TARGET_H #define USB_TARGET_H -static inline void usb_init_device(void) { } - 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 8d6c0af372..00cef2c060 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 -void usb_init_device(void); int usb_detect(void); void usb_insert_int(void); void usb_remove_int(void); diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-target.h b/firmware/target/arm/imx31/gigabeat-s/usb-target.h index 7931058241..961b947e14 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/usb-target.h @@ -26,7 +26,6 @@ #endif void usb_connect_event(void); -void usb_init_device(void); /* Read the immediate state of the cable from the PMIC */ bool usb_plugged(void); diff --git a/firmware/target/arm/iriver/usb-target.h b/firmware/target/arm/iriver/usb-target.h index 034b012bdd..a0905ebe51 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 -bool usb_init_device(void); void usb_pin_init(void); /* Init the GPIO input only */ bool usb_plugged(void); /* Returns instantaneous state - always */ diff --git a/firmware/target/arm/pbell/vibe500/usb-target.h b/firmware/target/arm/pbell/vibe500/usb-target.h index fb51b990c8..2cedf514c5 100644 --- a/firmware/target/arm/pbell/vibe500/usb-target.h +++ b/firmware/target/arm/pbell/vibe500/usb-target.h @@ -24,7 +24,6 @@ #ifndef USB_TARGET_H #define USB_TARGET_H -bool usb_init_device(void); void usb_pin_init(void); /* Init the GPIO input only */ #endif diff --git a/firmware/target/arm/pnx0101/usb-target.h b/firmware/target/arm/pnx0101/usb-target.h index a01a9768e9..e69de29bb2 100644 --- a/firmware/target/arm/pnx0101/usb-target.h +++ b/firmware/target/arm/pnx0101/usb-target.h @@ -1,29 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: usb-target.h 11494 2006-11-10 07:43:36Z tomal $ - * - * Copyright (C) 2006 by Barry Wardelll - * - * 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 - -bool usb_init_device(void); - -#endif diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h index aba5f55a46..e69de29bb2 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * 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 - -void usb_init_device(void); - -#endif diff --git a/firmware/target/arm/s5l8700/usb-target.h b/firmware/target/arm/s5l8700/usb-target.h index 2c9f841773..e69de29bb2 100644 --- a/firmware/target/arm/s5l8700/usb-target.h +++ b/firmware/target/arm/s5l8700/usb-target.h @@ -1,24 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Bertrik Sikken - * - * 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. - * - ****************************************************************************/ - - void usb_init_device(void); - - diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h index 6b56d8c5c0..9415480d88 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h @@ -75,7 +75,6 @@ #include int usb_detect(void); -void usb_init_device(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 6142b09f0b..3e8aa14a15 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h +++ b/firmware/target/arm/tms320dm320/sansa-connect/usb-target.h @@ -26,7 +26,6 @@ #include int usb_detect(void); -void usb_init_device(void); bool usb_drv_connected(void); #endif diff --git a/firmware/target/arm/usb-target.h b/firmware/target/arm/usb-target.h index 7342f2aafa..68418c9208 100644 --- a/firmware/target/arm/usb-target.h +++ b/firmware/target/arm/usb-target.h @@ -21,7 +21,6 @@ #ifndef USB_TARGET_H #define USB_TARGET_H -void usb_init_device(void); void usb_insert_int(void); void firewire_insert_int(void); void usb_pin_init(void); /* Init the GPIO input only */ diff --git a/firmware/target/coldfire/usb-target.h b/firmware/target/coldfire/usb-target.h index aba5f55a46..e69de29bb2 100644 --- a/firmware/target/coldfire/usb-target.h +++ b/firmware/target/coldfire/usb-target.h @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * 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 - -void usb_init_device(void); - -#endif 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 0b17bebfc2..a1acb6f912 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h @@ -40,7 +40,6 @@ #define USB_STATUS_BY_EVENT int usb_detect(void); -void usb_init_device(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 887d7415d0..aa51a76f4c 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h @@ -38,7 +38,6 @@ #define USB_DRV_CONNECTED() (__gpio_get_pin(GPIO_UDC_DETE) == 1) int usb_detect(void); -void usb_init_device(void); bool usb_drv_connected(void); #endif diff --git a/firmware/target/sh/usb-target.h b/firmware/target/sh/usb-target.h index d460ed11a7..e69de29bb2 100644 --- a/firmware/target/sh/usb-target.h +++ b/firmware/target/sh/usb-target.h @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 by Jens Arnold - * - * 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 - -void usb_init_device(void); - -#endif -- cgit v1.2.3