devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

ibasso: Hopefully hack usb into building again.

Browse source 
Change-Id: I6f369d60319704ab4d2c18b80ba6e78902630790
This commit is contained in:
Solomon Peachy 2020-11-13 20:03:49 -05:00
parent 43f90746d5
commit 03cd773051
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/menus/settings_menu.c
View file

@ -393,7 +393,6 @@ MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE),
#if defined(DX50) || defined(DX90) #if defined(DX50) || defined(DX90)
MENUITEM_SETTING(governor, &global_settings.governor, NULL); MENUITEM_SETTING(governor, &global_settings.governor, NULL);
MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
#endif #endif
MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),

1
firmware/export/config/ibassodx50.h
View file

@ -36,6 +36,7 @@
#define MODEL_NAME "iBasso DX50" #define MODEL_NAME "iBasso DX50"
#define USB_NONE #define USB_NONE
#define HAVE_USB_POWER
/* define this if you have a colour LCD */ /* define this if you have a colour LCD */
#define HAVE_LCD_COLOR #define HAVE_LCD_COLOR

1
firmware/export/config/ibassodx90.h
View file

@ -36,6 +36,7 @@
#define MODEL_NAME "iBasso DX90" #define MODEL_NAME "iBasso DX90"
#define USB_NONE #define USB_NONE
#define HAVE_USB_POWER
/* define this if you have a colour LCD */ /* define this if you have a colour LCD */
#define HAVE_LCD_COLOR #define HAVE_LCD_COLOR

8
firmware/target/hosted/ibasso/usb-ibasso.c
View file

@ -21,7 +21,6 @@
* *
****************************************************************************/ ****************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include "config.h" #include "config.h"
@ -31,7 +30,6 @@
#include "debug-ibasso.h" #include "debug-ibasso.h"
#include "usb-ibasso.h" #include "usb-ibasso.h"
static void usb_enable_adb(void) static void usb_enable_adb(void)
{ {
TRACE; TRACE;
@ -46,7 +44,6 @@ static void usb_enable_adb(void)
DEBUGF("ERROR %s: No command processor available.", __func__); DEBUGF("ERROR %s: No command processor available.", __func__);
} }
static void usb_enable_mass_storage(void) static void usb_enable_mass_storage(void)
{ {
TRACE; TRACE;
@ -89,3 +86,8 @@ void ibasso_set_usb_mode(int mode)
} }
} }
} }
bool usb_powered_only(void)
{
return false;
}

14
firmware/usb.c
View file

@ -817,13 +817,6 @@ int usb_release_exclusive_storage(void)
return bccount; return bccount;
} }
#ifdef HAVE_USB_POWER
bool usb_powered_only(void)
{
return usb_state == USB_POWERED;
}
#endif /* HAVE_USB_POWER */
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
void usb_set_hid(bool enable) void usb_set_hid(bool enable)
{ {
@ -832,6 +825,13 @@ void usb_set_hid(bool enable)
} }
#endif /* USB_ENABLE_HID */ #endif /* USB_ENABLE_HID */
#ifdef HAVE_USB_POWER
bool usb_powered_only(void)
{
return usb_state == USB_POWERED;
}
#endif /* HAVE_USB_POWER */
#elif defined(USB_NONE) #elif defined(USB_NONE)
/* Dummy functions for USB_NONE */ /* Dummy functions for USB_NONE */