diff options
author | Felix Arends <edx@rockbox.org> | 2002-07-20 15:19:29 +0000 |
---|---|---|
committer | Felix Arends <edx@rockbox.org> | 2002-07-20 15:19:29 +0000 |
commit | 7a91f2671c7612f1bb0c87f1c2d412012e1228ae (patch) | |
tree | fbbdf2d7c67879f645e809404ce108efbee9f61d /uisimulator | |
parent | 2b79949c94562cec44bfac5997149a773e06a492 (diff) | |
download | rockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.tar.gz rockbox-7a91f2671c7612f1bb0c87f1c2d412012e1228ae.zip |
added power.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1391 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/button.c | 8 | ||||
-rw-r--r-- | uisimulator/win32/makefile | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index c8935d81f3..da193814e5 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "button.h" | 24 | #include "button.h" |
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | 26 | ||
27 | #define KEY(k) HIBYTE(GetKeyState (k)) | 27 | #define KEY(k) (HIBYTE(GetKeyState (k)) & 1) |
28 | 28 | ||
29 | int last_key ; | 29 | int last_key ; |
30 | 30 | ||
@@ -65,13 +65,13 @@ int button_get(bool block) | |||
65 | if (KEY (VK_RETURN)) | 65 | if (KEY (VK_RETURN)) |
66 | btn |= BUTTON_OFF; // off button | 66 | btn |= BUTTON_OFF; // off button |
67 | 67 | ||
68 | if (KEY (VK_DIVIDE)) | 68 | if (KEY (VK_DIVIDE) || KEY(VK_F1)) |
69 | btn |= BUTTON_F1; // F1 button | 69 | btn |= BUTTON_F1; // F1 button |
70 | 70 | ||
71 | if (KEY (VK_MULTIPLY)) | 71 | if (KEY (VK_MULTIPLY) || KEY(VK_F2)) |
72 | btn |= BUTTON_F2; // F2 button | 72 | btn |= BUTTON_F2; // F2 button |
73 | 73 | ||
74 | if (KEY (VK_SUBTRACT)) | 74 | if (KEY (VK_SUBTRACT) || KEY(VK_F3)) |
75 | btn |= BUTTON_F3; // F3 button | 75 | btn |= BUTTON_F3; // F3 button |
76 | 76 | ||
77 | if (KEY (VK_NUMPAD5) || | 77 | if (KEY (VK_NUMPAD5) || |
diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile index bb157ab3e3..d3d326836b 100644 --- a/uisimulator/win32/makefile +++ b/uisimulator/win32/makefile | |||
@@ -17,8 +17,6 @@ | |||
17 | # | 17 | # |
18 | ############################################################################ | 18 | ############################################################################ |
19 | 19 | ||
20 | TARGET = rockboxui | ||
21 | |||
22 | FIRMWAREDIR = ../../firmware | 20 | FIRMWAREDIR = ../../firmware |
23 | DRIVERS = $(FIRMWAREDIR)/drivers | 21 | DRIVERS = $(FIRMWAREDIR)/drivers |
24 | COMMON = $(FIRMWAREDIR)/common | 22 | COMMON = $(FIRMWAREDIR)/common |
@@ -46,7 +44,7 @@ INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$ | |||
46 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | 44 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c |
47 | 45 | ||
48 | SRCS = *.c \ | 46 | SRCS = *.c \ |
49 | $(DRIVERS)/lcd.c \ | 47 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ |
50 | $(APPDIR)*.c \ | 48 | $(APPDIR)*.c \ |
51 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c \ | 49 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c \ |
52 | $(COMMON)/sprintf.c $(COMMON)/strtok.c | 50 | $(COMMON)/sprintf.c $(COMMON)/strtok.c |