summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Arends <edx@rockbox.org>2002-07-20 15:19:29 +0000
committerFelix Arends <edx@rockbox.org>2002-07-20 15:19:29 +0000
commit7a91f2671c7612f1bb0c87f1c2d412012e1228ae (patch)
treefbbdf2d7c67879f645e809404ce108efbee9f61d
parent2b79949c94562cec44bfac5997149a773e06a492 (diff)
downloadrockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.zip
rockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.tar.gz
rockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.tar.bz2
rockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.tar.xz
added power.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1391 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/win32/button.c8
-rw-r--r--uisimulator/win32/makefile4
2 files changed, 5 insertions, 7 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index c8935d8..da19381 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -24,7 +24,7 @@
#include "button.h"
#include "kernel.h"
-#define KEY(k) HIBYTE(GetKeyState (k))
+#define KEY(k) (HIBYTE(GetKeyState (k)) & 1)
int last_key ;
@@ -65,13 +65,13 @@ int button_get(bool block)
if (KEY (VK_RETURN))
btn |= BUTTON_OFF; // off button
- if (KEY (VK_DIVIDE))
+ if (KEY (VK_DIVIDE) || KEY(VK_F1))
btn |= BUTTON_F1; // F1 button
- if (KEY (VK_MULTIPLY))
+ if (KEY (VK_MULTIPLY) || KEY(VK_F2))
btn |= BUTTON_F2; // F2 button
- if (KEY (VK_SUBTRACT))
+ if (KEY (VK_SUBTRACT) || KEY(VK_F3))
btn |= BUTTON_F3; // F3 button
if (KEY (VK_NUMPAD5) ||
diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile
index bb157ab..d3d3268 100644
--- a/uisimulator/win32/makefile
+++ b/uisimulator/win32/makefile
@@ -17,8 +17,6 @@
#
############################################################################
-TARGET = rockboxui
-
FIRMWAREDIR = ../../firmware
DRIVERS = $(FIRMWAREDIR)/drivers
COMMON = $(FIRMWAREDIR)/common
@@ -46,7 +44,7 @@ INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$
CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c
SRCS = *.c \
- $(DRIVERS)/lcd.c \
+ $(DRIVERS)/lcd.c $(DRIVERS)/power.c \
$(APPDIR)*.c \
$(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c \
$(COMMON)/sprintf.c $(COMMON)/strtok.c