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

Fix errors when building H10 Normal build.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10668 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Barry Wardell 2006-08-20 23:05:47 +00:00
parent 2a8dfd65b9
commit 18cfe431d7
8 changed files with 92 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/plugins/battery_bench.c
View file

@ -77,6 +77,11 @@ PLUGIN_HEADER
#define BATTERY_ON BUTTON_SELECT
#define BATTERY_OFF BUTTON_PLAY
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define BATTERY_ON BUTTON_PLAY
#define BATTERY_OFF BUTTON_POWER
#endif

10
apps/plugins/metronome.c
View file

@ -93,6 +93,16 @@ PLUGIN_HEADER
#define METRONOME_R_VOL_UP BUTTON_RC_VOL_UP
#define METRONOME_R_VOL_DOWN BUTTON_RC_VOL_DOWN
#define METRONOME_R_TAP BUTTON_RC_BITRATE
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define METRONOME_QUIT BUTTON_POWER
#define METRONOME_PLAYPAUSE BUTTON_PLAY
#define METRONOME_VOL_UP BUTTON_SCROLL_UP
#define METRONOME_VOL_DOWN BUTTON_SCROLL_DOWN
#define METRONOME_TAP BUTTON_FF
#define METRONOME_MSG_START "press play"
#define METRONOME_MSG_STOP "press pause"
#endif
static struct plugin_api* rb;

2
firmware/SOURCES
View file

@ -259,6 +259,7 @@ target/arm/ata-pp5020.c
target/arm/iriver/h10/power-h10.c
target/arm/iriver/h10/usb-h10.c
target/arm/iriver/h10/lcd-h10.c
target/arm/iriver/h10/adc-h10.c
#endif
#endif
@ -270,6 +271,7 @@ target/arm/ata-pp5020.c
target/arm/iriver/h10/power-h10.c
target/arm/iriver/h10/usb-h10.c
target/arm/iriver/h10/lcd-h10.c
target/arm/iriver/h10/adc-h10.c
#endif
#endif

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

@ -37,7 +37,7 @@
/* define this if you have a real-time clock */
#ifndef BOOTLOADER
#define CONFIG_RTC RTC_E8564 /* TODO: figure this out */
/*#define CONFIG_RTC RTC_E8564*/ /* TODO: figure this out */
#endif
/* Define this if you have a software controlled poweroff */
@ -99,6 +99,8 @@
/* Type of LCD */
#define CONFIG_LCD LCD_H10
#define DEFAULT_CONTRAST_SETTING 19
/* Offset ( in the firmware file's header ) to the file length */
#define FIRMWARE_OFFSET_FILE_LENGTH 0
@ -111,13 +113,13 @@
/* #define USB_IPODSTYLE */
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
/*#define HAVE_USB_POWER*/
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/*#define HAVE_ADJUSTABLE_CPU_FREQ*/
#define BOOTFILE_EXT "h10"
#define BOOTFILE "rockbox." BOOTFILE_EXT

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

@ -38,7 +38,7 @@
/* define this if you have a real-time clock */
#ifndef BOOTLOADER
#define CONFIG_RTC RTC_E8564 /* TODO: figure this out */
/*#define CONFIG_RTC RTC_E8564*/ /* TODO: figure this out */
#endif
/* Define this if you have a software controlled poweroff */
@ -98,6 +98,8 @@
/* Type of LCD */
#define CONFIG_LCD LCD_H10_5GB
#define DEFAULT_CONTRAST_SETTING 19
/* Offset ( in the firmware file's header ) to the file length */
#define FIRMWARE_OFFSET_FILE_LENGTH 0
@ -110,13 +112,13 @@
/* #define USB_IPODSTYLE */
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
/*#define HAVE_USB_POWER*/
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/*#define HAVE_ADJUSTABLE_CPU_FREQ*/
#define BOOTFILE_EXT "h10"
#define BOOTFILE "rockbox." BOOTFILE_EXT

10
firmware/system.c
View file

@ -1162,6 +1162,16 @@ void irq(void)
else if (CPU_HI_INT_STAT & GPIO_MASK)
ipod_mini_button_int();
}
#elif (defined IRIVER_H10) || (defined IRIVER_H10_5GB)
/* TODO: this should really be in the target tree, but moving it there caused
crt0.S not to find it while linking */
void irq(void)
{
if (CPU_INT_STAT & TIMER1_MASK)
TIMER1();
else if (CPU_INT_STAT & TIMER2_MASK)
TIMER2();
}
#else
extern void ipod_4g_button_int(void);

41
firmware/target/arm/iriver/h10/adc-h10.c Executable file
View file

@ -0,0 +1,41 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2006 by Barry Wardell
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "config.h"
#include "cpu.h"
#include "system.h"
#include "kernel.h"
#include "thread.h"
#include "adc.h"
/* TODO: implement adc functionality */
unsigned short adc_scan(int channel)
{
(void)channel;
return 0;
}
unsigned short adc_read(int channel)
{
(void)channel;
return 0;
}
void adc_init(void)
{
}

16
firmware/target/arm/iriver/h10/lcd-h10.c
View file

@ -155,14 +155,26 @@ void lcd_blit(const fb_data* data, int x, int by, int width,
(void)stride;
}
void lcd_yuv_blit(unsigned char * const src[3],
int src_x, int src_y, int stride,
int x, int y, int width, int height)
{
(void)src;
(void)src_x;
(void)src_y;
(void)stride;
(void)x;
(void)y;
(void)width;
(void)height;
}
/* Update a fraction of the display. */
void lcd_update_rect(int x, int y, int width, int height)
{
int y0, x0, y1, x1;
int newx,newwidth;
/*int newx,newwidth;*/
unsigned long *addr = (unsigned long *)lcd_framebuffer;