summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2012-01-07 20:05:44 +0000
committerRafaël Carré <rafael.carre@gmail.com>2012-01-07 20:05:44 +0000
commit12ef8723f8f69ab70e2af7ac8a2cc4b7bf319b96 (patch)
treee8efffe72eb7f42adebf0e385bb1f8e10702ade0 /firmware
parentd00b7e8a6d460d9781b3e0b4b3708fdec73233a7 (diff)
downloadrockbox-12ef8723f8f69ab70e2af7ac8a2cc4b7bf319b96.zip
rockbox-12ef8723f8f69ab70e2af7ac8a2cc4b7bf319b96.tar.gz
rockbox-12ef8723f8f69ab70e2af7ac8a2cc4b7bf319b96.tar.bz2
rockbox-12ef8723f8f69ab70e2af7ac8a2cc4b7bf319b96.tar.xz
lcd-remote-target.h: Use only in firmware/target/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31614 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-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 41042e0..2a48b6f 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -29,10 +29,6 @@
#ifdef HAVE_REMOTE_LCD /* Not for the players with *only* a remote LCD (m3) */
-#ifndef __PCTOOL__
-#include "lcd-remote-target.h"
-#endif
-
#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
#define REMOTETYPE_UNPLUGGED 0
#define REMOTETYPE_H100_LCD 1
@@ -156,6 +152,10 @@ extern lcd_remote_blockfunc_type* const lcd_remote_blockfuncs[8];
#endif /* HAVE_LCD_REMOTE */
+#ifdef HAVE_REMOTE_LCD_TICKING
+void lcd_remote_emireduce(bool state);
+#endif
+
void lcd_remote_init_device(void);
void lcd_remote_on(void);
void lcd_remote_off(void);
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 80cd3d4..ca24740 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -50,9 +50,6 @@
#include <time.h>
#endif
-#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
-#include "lcd-remote-target.h"
-#endif
#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) \
&& !defined (SIMULATOR)
#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 563498b..88a47ad 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 @@
#ifdef HAVE_REMOTE_LCD
#include "lcd-remote.h"
+#include "lcd-remote-target.h"
static bool remote_hold = false;
static bool headphones_status = true;
#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 ca4bbde..aa3d228 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 @@
#include "thread.h"
#include "system.h"
#include "lcd-remote.h"
+#include "lcd-remote-target.h"
#include "button.h"
#include "button-target.h"
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
index 847e8a4..bb083a5 100644
--- a/firmware/target/arm/pp/system-pp502x.c
+++ b/firmware/target/arm/pp/system-pp502x.c
@@ -28,9 +28,6 @@
#endif
#include "button-target.h"
#include "usb_drv.h"
-#ifdef HAVE_REMOTE_LCD
-#include "lcd-remote-target.h"
-#endif
#if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE)
extern 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 f981abe..0000000
--- a/firmware/target/coldfire/iriver/lcd-remote-target.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id: lcd-remote-target.h 11967 2007-01-09 23:29:07Z linus $
- *
- * Copyright (C) 2007 by Jens Arnold
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef LCD_REMOTE_TARGET_H
-#define LCD_REMOTE_TARGET_H
-
-#ifdef HAVE_REMOTE_LCD_TICKING
-void lcd_remote_emireduce(bool state);
-#endif
-
-#endif