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

Make mini2440 compile again.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25081 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-03-08 23:43:11 +00:00
parent a2e788b557
commit 61320ce0eb
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/SOURCES
View file

@ -162,7 +162,9 @@ eq_arm.S
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
usb_keymaps.c usb_keymaps.c
#endif #endif
#ifndef USB_NONE
gui/usb_screen.c gui/usb_screen.c
#endif
metadata.c metadata.c
metadata/mp3.c metadata/mp3.c
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC

8
apps/gui/usb_screen.c
View file

@ -112,13 +112,8 @@ static int handle_usb_events(void)
return 0; return 0;
} }
#endif #endif /* SIMULATOR */
#ifdef USB_NONE
void gui_usb_screen_run(void)
{
}
#else
#define MODE_NAME_LEN 32 #define MODE_NAME_LEN 32
struct usb_screen_vps_t struct usb_screen_vps_t
@ -315,5 +310,4 @@ void gui_usb_screen_run(void)
} }
} }
#endif /* !defined(USB_NONE) */

4
apps/gui/usb_screen.h
View file

@ -21,7 +21,11 @@
#ifndef _USB_SCREEN_H_ #ifndef _USB_SCREEN_H_
#define _USB_SCREEN_H_ #define _USB_SCREEN_H_
#ifdef USB_NONE
static inline void gui_usb_screen_run(void) {}
#else
extern void gui_usb_screen_run(void); extern void gui_usb_screen_run(void);
#endif
#endif #endif

6
firmware/target/arm/s3c2440/sd-s3c2440.c
View file

@ -882,7 +882,7 @@ int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount,
} }
/*****************************************************************************/ /*****************************************************************************/
int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
const void* outbuf) const void* outbuf)
{ {
#ifdef BOOTLOADER /* we don't need write support in bootloader */ #ifdef BOOTLOADER /* we don't need write support in bootloader */
@ -895,7 +895,7 @@ int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count,
return -1; return -1;
#else #else
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
dbgprintf ("sd_write %d %x %d\n", card_no, start, count); dbgprintf ("sd_write %d %x %d\n", drive, start, count);
#else #else
dbgprintf ("sd_write %x %d\n", start, count); dbgprintf ("sd_write %x %d\n", start, count);
#endif #endif
@ -904,7 +904,7 @@ int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count,
return 0; /* assume success */ return 0; /* assume success */
else else
#endif #endif
return sd_transfer_sectors(card_no, start, count, (void*)outbuf, true); return sd_transfer_sectors(drive, start, count, (void*)outbuf, true);
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/