summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-07-16 11:11:00 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-07-16 11:11:00 +0000
commit2534097fc80c553e2fb04049903b40b26e5af0f6 (patch)
tree53924227f88c84e5dca3bc7a52b424b3d9d03eab
parent77eb0e1328e05346b4441f702f437310196e839f (diff)
downloadrockbox-2534097fc80c553e2fb04049903b40b26e5af0f6.tar.gz
rockbox-2534097fc80c553e2fb04049903b40b26e5af0f6.zip
battery_level() already had a stub
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1367 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/common/stubs.c5
-rw-r--r--uisimulator/x11/Makefile5
2 files changed, 4 insertions, 6 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index cf529c07c4..fc24346090 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -26,8 +26,3 @@ void backlight_time(int dummy)
26{ 26{
27 (void)dummy; 27 (void)dummy;
28} 28}
29
30int battery_level(void)
31{
32 return 73;
33}
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index c91342fa9e..c546c62dd3 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -73,7 +73,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
73 73
74APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall 74APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall
75 75
76FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c 76FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c
77 77
78APPS = main.c tree.c menu.c credits.c main_menu.c\ 78APPS = main.c tree.c menu.c credits.c main_menu.c\
79 playlist.c showtext.c wps.c settings.c 79 playlist.c showtext.c wps.c settings.c
@@ -224,6 +224,9 @@ $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
224$(OBJDIR)/stubs.o: ../common/stubs.c 224$(OBJDIR)/stubs.o: ../common/stubs.c
225 $(CC) $(CFLAGS) -c $< -o $@ 225 $(CC) $(CFLAGS) -c $< -o $@
226 226
227$(OBJDIR)/power.o: $(DRIVERS)/power.c
228 $(CC) $(CFLAGS) -c $< -o $@
229
227 230
228# these ones are simulator-specific 231# these ones are simulator-specific
229 232