Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace USB_IPODSTYLE by USB_HANDLED_BY_OF as that's what it actually means. Fix various configs to use it correctly.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20078 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2009-02-21 17:56:31 +00:00
parent 3e7715d2f5
commit 9698c3bb5c
22 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/misc.c
View file

@ -85,7 +85,7 @@
#include "playback.h"
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
#include "rolo.h"
#include "yesno.h"
#endif
@ -569,13 +569,13 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
{
system_flush();
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
check_bootfile(false); /* gets initial size */
#endif
#endif
usb_screen();
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
check_bootfile(true);
#endif
#endif
@ -691,7 +691,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain)
#endif
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
/*
memorize/compare details about the BOOTFILE
we don't use dircache because it may not be up to date after

2
apps/misc.h
View file

@ -73,7 +73,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain);
int open_utf8(const char* pathname, int flags);
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_IPODSTYLE)
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
void check_bootfile(bool do_rolo);
#endif
#endif

2
firmware/export/config-c200.h
View file

@ -170,8 +170,6 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8
/* #define USB_IPODSTYLE */
#ifndef BOOTLOADER
#define HAVE_MULTIVOLUME
#define HAVE_HOTSWAP

2
firmware/export/config-c200v2.h
View file

@ -160,7 +160,7 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8
/* #define USB_IPODSTYLE */
#define USB_HANDLED_BY_OF
#ifndef BOOTLOADER
#define HAVE_MULTIVOLUME

3
firmware/export/config-clip.h
View file

@ -170,6 +170,8 @@
#ifndef BOOTLOADER
#define USB_HANDLED_BY_OF
#if 0 /* disabled since there is no USB driver */
/* USB On-the-go */
@ -183,6 +185,7 @@
#endif
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL

2
firmware/export/config-e200.h
View file

@ -167,8 +167,6 @@
#define HAVE_HOTSWAP
#endif
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-e200v2.h
View file

@ -171,7 +171,7 @@
#define HAVE_HOTSWAP
#endif
/* #define USB_IPODSTYLE */
#define USB_HANDLED_BY_OF
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525

2
firmware/export/config-fuze.h
View file

@ -171,7 +171,7 @@
#define HAVE_HOTSWAP
#endif
/* #define USB_IPODSTYLE */
#define USB_HANDLED_BY_OF
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525

2
firmware/export/config-h10.h
View file

@ -159,8 +159,6 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-h10_5gb.h
View file

@ -139,8 +139,6 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-hdd1630.h
View file

@ -173,8 +173,6 @@
#define FIRMWARE_OFFSET_FILE_CRC 0x0
#define FIRMWARE_OFFSET_FILE_DATA 0x8
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipod1g2g.h
View file

@ -146,7 +146,7 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
#define USB_HANDLED_BY_OF
/* actually firewire only, but handled like USB */
/* Virtual LED (icon) */

2
firmware/export/config-ipod3g.h
View file

@ -150,7 +150,7 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
#define USB_HANDLED_BY_OF
/* actually both firewire and USB, USB isn't handled yet */
/* Virtual LED (icon) */

2
firmware/export/config-ipod4g.h
View file

@ -167,8 +167,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipodcolor.h
View file

@ -144,8 +144,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipodmini.h
View file

@ -163,8 +163,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipodmini2g.h
View file

@ -170,8 +170,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipodnano.h
View file

@ -154,8 +154,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-ipodvideo.h
View file

@ -168,8 +168,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
#define USB_IPODSTYLE
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-mrobe100.h
View file

@ -144,8 +144,6 @@
/* We're able to shut off power to the HDD */
#define HAVE_ATA_POWER_OFF
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-sa9200.h
View file

@ -133,8 +133,6 @@
/* Type of LCD TODO: hopefully the same as the x5 but check this*/
#define CONFIG_LCD LCD_SA9200
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC

2
firmware/export/config-tpj1022.h
View file

@ -121,8 +121,6 @@
/* Offset ( in the firmware file's header ) to the real data */
#define FIRMWARE_OFFSET_FILE_DATA 8
/* #define USB_IPODSTYLE */
/* USB On-the-go */
#define CONFIG_USBOTG USBOTG_ARC