summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-07-16 10:54:37 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-07-16 10:54:37 +0000
commit1812eae051c2352226975e413f63b1cf519ba94f (patch)
tree94bed31a85f087a31321a50e0b7163d9b77340f6
parent761cd95f23e23aa99b4d7f6adfb295355318517a (diff)
downloadrockbox-1812eae051c2352226975e413f63b1cf519ba94f.zip
rockbox-1812eae051c2352226975e413f63b1cf519ba94f.tar.gz
rockbox-1812eae051c2352226975e413f63b1cf519ba94f.tar.bz2
rockbox-1812eae051c2352226975e413f63b1cf519ba94f.tar.xz
Added stub for battery_level()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1365 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/common/stubs.c33
-rw-r--r--uisimulator/x11/Makefile9
-rw-r--r--uisimulator/x11/lcd-x11.c10
3 files changed, 39 insertions, 13 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
new file mode 100644
index 0000000..cf529c0
--- /dev/null
+++ b/uisimulator/common/stubs.c
@@ -0,0 +1,33 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Björn Stenberg <bjorn@haxx.se>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+void backlight_on(void)
+{
+ /* we could do something better here! */
+}
+
+void backlight_time(int dummy)
+{
+ (void)dummy;
+}
+
+int battery_level(void)
+{
+ return 73;
+}
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 0c82b2d..c91342f 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -42,7 +42,7 @@ DISPLAY = -DHAVE_LCD_BITMAP
KEYPAD = -DHAVE_RECORDER_KEYPAD
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
-$(KEYPAD) $(DISPLAY)
+$(KEYPAD) $(DISPLAY) -DLCD_PROPFONTS
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
@@ -69,7 +69,7 @@ ifdef MPEG_PLAY
INCLUDES += -I$(PREVAPPDIR)/common
endif
-CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
+CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall
@@ -84,7 +84,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c
endif
-SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
+SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \
button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
ifdef MPEG_PLAY
@@ -221,6 +221,9 @@ $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/stubs.o: ../common/stubs.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
# these ones are simulator-specific
diff --git a/uisimulator/x11/lcd-x11.c b/uisimulator/x11/lcd-x11.c
index 8d58dcb..96ce800 100644
--- a/uisimulator/x11/lcd-x11.c
+++ b/uisimulator/x11/lcd-x11.c
@@ -109,13 +109,3 @@ void lcd_update (void)
/* Logf("lcd_update: Draws %d pixels, clears %d pixels", p, cp);*/
XSync(dpy,False);
}
-
-void backlight_on(void)
-{
- /* we could do something better here! */
-}
-
-void backlight_time(int dummy)
-{
- (void)dummy;
-}