len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

XWorld: cleanup

Browse source 
- Comment keymaps.h
 - Tie XWORLD_DEBUG into ROCKBOX_HAS_LOGF to ease debugging
 - Fix up the manual a little bit

Change-Id: I12cfb58001199036cd67dbaa27f164e6790a199d
Reviewed-on: http://gerrit.rockbox.org/1084
Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
This commit is contained in:
Franklin Wei 2014-12-24 11:43:28 -05:00 • committed by Michael Giacomelli
parent e7c282fed7
commit 193c5df75d
5 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/xworld/keymaps.h
View file

@ -21,8 +21,8 @@
#ifndef _XWORLD_KEYMAPS_H
#define _XWORLD_KEYMAPS_H
#endif
/* Handle the "nice" targets that have directional buttons with normal names */
#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
@ -63,15 +63,15 @@
#define BTN_PAUSE BUTTON_SELECT
#endif
#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
(CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
(CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
(CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \
(CONFIG_KEYPAD == ONDAVX747_PAD)
#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
(CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
(CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
(CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \
(CONFIG_KEYPAD == ONDAVX747_PAD)
#define BTN_FIRE BUTTON_VOL_UP
#define BTN_PAUSE BUTTON_VOL_DOWN
@ -124,8 +124,11 @@
(CONFIG_KEYPAD == GIGABEAT_S_PAD)
#define BTN_FIRE BUTTON_VOL_UP
#define BTN_PAUSE BUTTON_MENU
/* #if CONFIG_KEYPAD == PHILIPS_HDD1630_PAD */
#endif
/* ... and now for the bad ones that don't have
* standard names for the directional buttons */
#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
#define BTN_UP BUTTON_OK
#define BTN_DOWN BUTTON_CANCEL
@ -185,12 +188,19 @@
#define BTN_LEFT BUTTON_LEFT
#define BTN_RIGHT BUTTON_RIGHT
#if (CONFIG_KEYPAD == MROBE500_PAD) || (CONFIG_KEYPAD == ONDAVX777_PAD)
#if (CONFIG_KEYPAD == MROBE500_PAD) || \
(CONFIG_KEYPAD == ONDAVX777_PAD)
#define BTN_PAUSE BUTTON_BOTTOMLEFT
#elif CONFIG_KEYPAD == !COWON_D2_PAD || !DX50_PAD || !ONDAVX777_PAD
#elif (CONFIG_KEYPAD == !COWON_D2_PAD) || \
(CONFIG_KEYPAD != !DX50_PAD) || \
(CONFIG_KEYMAP != ONDAVX777_PAD)
#define BTN_FIRE BUTTON_BOTTOMLEFT
#define BTN_PAUSE BUTTON_TOPLEFT
#endif
/* HAVE_TOUCHSCREEN */
#endif
/* _XWORLD_KEYMAPS_H */
#endif

4
apps/plugins/xworld/sys.c
View file

@ -787,13 +787,13 @@ void sys_sleep(struct System* sys, uint32_t duration)
{
(void) sys;
/* duration is in ms */
rb->sleep(duration / 10);
rb->sleep(duration / (1000/HZ));
}
uint32_t sys_getTimeStamp(struct System* sys)
{
(void) sys;
return (uint32_t) (*rb->current_tick) * 10;
return (uint32_t) (*rb->current_tick * (1000/HZ));
}
static int16_t rb_soundbuf [MAX_SOUNDBUF_SIZE] IBSS_ATTR;

6
apps/plugins/xworld/util.h
View file

@ -25,12 +25,16 @@
#include "intern.h"
/* #define XWORLD_DEBUG */
#ifdef ROCKBOX_HAS_LOGF
#define XWORLD_DEBUG
#endif
#ifdef XWORLD_DEBUG
#define debug(m,f,...) debug_real(m, f, ##__VA_ARGS__)
#define XWORLD_DEBUGMASK ~0
#else
#define debug(m,f,...)
#define XWORLD_DEBUGMASK 0
#endif
enum {

2
apps/plugins/xworld/xworld.c
View file

@ -36,7 +36,7 @@ enum plugin_status plugin_start(const void* parameter)
/* no trailing slashes */
const char *dataPath = "/.rockbox/xworld";
const char *savePath = "/.rockbox/xworld";
g_debugMask = 0;
g_debugMask = XWORLD_DEBUGMASK;
engine_create(&e, &sys, dataPath, savePath);
engine_init(&e);