summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-01-20 19:21:20 +0100
committerThomas Martitz <kugel@rockbox.org>2012-01-21 18:39:20 +0100
commitd3ae11d75a951b84b2383935318a12b25b64018e (patch)
treec90901d0e8460e6e8ac49fab184cad51211d4fcb /firmware
parent5d13ecc4a809910a5ae763afea0048c29b3bee97 (diff)
downloadrockbox-d3ae11d75a951b84b2383935318a12b25b64018e.tar.gz
rockbox-d3ae11d75a951b84b2383935318a12b25b64018e.zip
android/ypr0: Merge lc-*.c to generic lc-unix.c.
Change-Id: Ica76dec903486c32fda8355acdc58f0315c4d384
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES7
-rw-r--r--firmware/target/hosted/lc-unix.c (renamed from firmware/target/hosted/android/lc-android.c)5
-rw-r--r--firmware/target/hosted/ypr0/lc-ypr0.c40
3 files changed, 8 insertions, 44 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b2ddc246ec..f13eba618f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -19,7 +19,8 @@ target/hosted/cpuinfo-linux.c
target/hosted/rtc.c
#endif
-#if (CONFIG_PLATFORM & PLATFORM_ANDROID) == 0
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID) == 0 && \
+ (defined(DEBUG) || defined(SIMULATOR)) /* sim should define DEBUG instead */
target/hosted/debug-hosted.c
#endif
@@ -79,10 +80,10 @@ target/hosted/rtc.c
#endif
target/hosted/kernel-unix.c
target/hosted/filesystem-unix.c
+target/hosted/lc-unix.c
target/hosted/ypr0/button-ypr0.c
target/hosted/ypr0/lcd-ypr0.c
target/hosted/ypr0/system-ypr0.c
-target/hosted/ypr0/lc-ypr0.c
thread.c
#ifdef HAVE_BACKLIGHT
target/hosted/ypr0/backlight-ypr0.c
@@ -1694,8 +1695,8 @@ target/arm/rk27xx/hm801/power-hm801.c
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
target/hosted/kernel-unix.c
target/hosted/filesystem-unix.c
+target/hosted/lc-unix.c
target/hosted/android/lcd-android.c
-target/hosted/android/lc-android.c
target/hosted/android/button-android.c
#ifdef DEBUG
target/hosted/android/debug-android.c
diff --git a/firmware/target/hosted/android/lc-android.c b/firmware/target/hosted/lc-unix.c
index 434e901a56..8a265de066 100644
--- a/firmware/target/hosted/android/lc-android.c
+++ b/firmware/target/hosted/lc-unix.c
@@ -22,7 +22,10 @@
#include <string.h> /* size_t */
#include "load_code.h"
-/* the load_code wrappers simply wrap, nothing to do */
+/* unix specific because WIN32 wants UCS instead of UTF-8, so filenames
+ * need to be converted */
+
+/* plain wrappers , nothing to do */
void *lc_open(const char *filename, unsigned char *buf, size_t buf_size)
{
return _lc_open(filename, buf, buf_size);
diff --git a/firmware/target/hosted/ypr0/lc-ypr0.c b/firmware/target/hosted/ypr0/lc-ypr0.c
deleted file mode 100644
index 434e901a56..0000000000
--- a/firmware/target/hosted/ypr0/lc-ypr0.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2010 by Thomas Martitz
- *
- * 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.
- *
- ****************************************************************************/
-
-#include <string.h> /* size_t */
-#include "load_code.h"
-
-/* the load_code wrappers simply wrap, nothing to do */
-void *lc_open(const char *filename, unsigned char *buf, size_t buf_size)
-{
- return _lc_open(filename, buf, buf_size);
-}
-
-void *lc_get_header(void *handle)
-{
- return _lc_get_header(handle);
-}
-
-void lc_close(void *handle)
-{
- _lc_close(handle);
-}
-