summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/export/lcd-remote.h8
-rw-r--r--firmware/powermgmt.c3
-rw-r--r--firmware/target/arm/olympus/mrobe-100/button-mr100.c1
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c1
-rw-r--r--firmware/target/arm/pp/system-pp502x.c3
-rw-r--r--firmware/target/coldfire/iriver/lcd-remote-target.h28
6 files changed, 6 insertions, 38 deletions
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 41042e04d0..2a48b6fc34 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -29,10 +29,6 @@
29 29
30#ifdef HAVE_REMOTE_LCD /* Not for the players with *only* a remote LCD (m3) */ 30#ifdef HAVE_REMOTE_LCD /* Not for the players with *only* a remote LCD (m3) */
31 31
32#ifndef __PCTOOL__
33#include "lcd-remote-target.h"
34#endif
35
36#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) 32#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
37#define REMOTETYPE_UNPLUGGED 0 33#define REMOTETYPE_UNPLUGGED 0
38#define REMOTETYPE_H100_LCD 1 34#define REMOTETYPE_H100_LCD 1
@@ -156,6 +152,10 @@ extern lcd_remote_blockfunc_type* const lcd_remote_blockfuncs[8];
156 152
157#endif /* HAVE_LCD_REMOTE */ 153#endif /* HAVE_LCD_REMOTE */
158 154
155#ifdef HAVE_REMOTE_LCD_TICKING
156void lcd_remote_emireduce(bool state);
157#endif
158
159void lcd_remote_init_device(void); 159void lcd_remote_init_device(void);
160void lcd_remote_on(void); 160void lcd_remote_on(void);
161void lcd_remote_off(void); 161void lcd_remote_off(void);
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 80cd3d4a5c..ca24740221 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -50,9 +50,6 @@
50#include <time.h> 50#include <time.h>
51#endif 51#endif
52 52
53#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
54#include "lcd-remote-target.h"
55#endif
56#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) \ 53#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) \
57 && !defined (SIMULATOR) 54 && !defined (SIMULATOR)
58#include "pcf50606.h" 55#include "pcf50606.h"
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
index 563498b3f4..88a47ad644 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
@@ -27,6 +27,7 @@
27 27
28#ifdef HAVE_REMOTE_LCD 28#ifdef HAVE_REMOTE_LCD
29#include "lcd-remote.h" 29#include "lcd-remote.h"
30#include "lcd-remote-target.h"
30static bool remote_hold = false; 31static bool remote_hold = false;
31static bool headphones_status = true; 32static bool headphones_status = true;
32#endif 33#endif
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
index ca4bbde483..aa3d228952 100644
--- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c
@@ -24,6 +24,7 @@
24#include "thread.h" 24#include "thread.h"
25#include "system.h" 25#include "system.h"
26#include "lcd-remote.h" 26#include "lcd-remote.h"
27#include "lcd-remote-target.h"
27#include "button.h" 28#include "button.h"
28#include "button-target.h" 29#include "button-target.h"
29 30
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
index 847e8a462e..bb083a5d16 100644
--- a/firmware/target/arm/pp/system-pp502x.c
+++ b/firmware/target/arm/pp/system-pp502x.c
@@ -28,9 +28,6 @@
28#endif 28#endif
29#include "button-target.h" 29#include "button-target.h"
30#include "usb_drv.h" 30#include "usb_drv.h"
31#ifdef HAVE_REMOTE_LCD
32#include "lcd-remote-target.h"
33#endif
34 31
35#if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE) 32#if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE)
36extern void TIMER1(void); 33extern void TIMER1(void);
diff --git a/firmware/target/coldfire/iriver/lcd-remote-target.h b/firmware/target/coldfire/iriver/lcd-remote-target.h
deleted file mode 100644
index f981abe3cc..0000000000
--- a/firmware/target/coldfire/iriver/lcd-remote-target.h
+++ /dev/null
@@ -1,28 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: lcd-remote-target.h 11967 2007-01-09 23:29:07Z linus $
9 *
10 * Copyright (C) 2007 by Jens Arnold
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21#ifndef LCD_REMOTE_TARGET_H
22#define LCD_REMOTE_TARGET_H
23
24#ifdef HAVE_REMOTE_LCD_TICKING
25void lcd_remote_emireduce(bool state);
26#endif
27
28#endif