devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Initial suppport for building Rockbox for Neo. The Neo has a different

Browse source 
key layout so we need to check for this.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4138 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2003-12-12 13:34:27 +00:00
parent ca71062221
commit 8e43ccbec6
10 changed files with 130 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/debug_menu.c
View file

@ -85,7 +85,9 @@ bool dbg_os(void)
switch(button) switch(button)
{ {
#ifdef BUTTON_OFF
case BUTTON_OFF: case BUTTON_OFF:
#endif
case BUTTON_LEFT: case BUTTON_LEFT:
return false; return false;
} }
@ -1194,9 +1196,9 @@ static bool view_runtime(void)
/* Wait for a key to be pushed */ /* Wait for a key to be pushed */
key = button_get_w_tmo(HZ); key = button_get_w_tmo(HZ);
switch(key) { switch(key) {
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
case BUTTON_STOP | BUTTON_REL: case BUTTON_STOP | BUTTON_REL:
#else #elif HAVE_RECORDER_KEYPAD
case BUTTON_OFF | BUTTON_REL: case BUTTON_OFF | BUTTON_REL:
#endif #endif
done = true; done = true;
@ -1301,7 +1303,7 @@ static bool dbg_disk_info(void)
/* Wait for a key to be pushed */ /* Wait for a key to be pushed */
key = button_get_w_tmo(HZ*5); key = button_get_w_tmo(HZ*5);
switch(key) { switch(key) {
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
case BUTTON_STOP | BUTTON_REL: case BUTTON_STOP | BUTTON_REL:
#else #else
case BUTTON_OFF | BUTTON_REL: case BUTTON_OFF | BUTTON_REL:

2
apps/main.c
View file

@ -138,6 +138,7 @@ void init(void)
powermgmt_init(); powermgmt_init();
#ifdef HAVE_BATTERIES
if (coldstart && charger_inserted()) if (coldstart && charger_inserted())
{ {
rc = charging_screen(); /* display a "charging" screen */ rc = charging_screen(); /* display a "charging" screen */
@ -145,6 +146,7 @@ void init(void)
power_off(); power_off();
/* "On" pressed or USB connected: proceed */ /* "On" pressed or USB connected: proceed */
} }
#endif
rc = ata_init(); rc = ata_init();
if(rc) if(rc)

2
apps/main_menu.c
View file

@ -218,7 +218,7 @@ bool show_info(void)
/* Wait for a key to be pushed */ /* Wait for a key to be pushed */
key = button_get_w_tmo(HZ*5); key = button_get_w_tmo(HZ*5);
switch(key) { switch(key) {
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
case BUTTON_STOP | BUTTON_REL: case BUTTON_STOP | BUTTON_REL:
#else #else
case BUTTON_LEFT | BUTTON_REL: case BUTTON_LEFT | BUTTON_REL:

2
apps/player/keyboard.c
View file

@ -29,7 +29,7 @@
#define KEYBOARD_PAGES 3 #define KEYBOARD_PAGES 3
unsigned short *lcd_ascii; extern unsigned short *lcd_ascii;
static unsigned short* kbd_setupkeys(int page, int* len) static unsigned short* kbd_setupkeys(int page, int* len)
{ {

6
apps/playlist.c
View file

@ -453,7 +453,7 @@ static int add_directory_to_playlist(char *dirname, int *position, bool queue,
for (i=0; i<num_files; i++) for (i=0; i<num_files; i++)
{ {
/* user abort */ /* user abort */
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
if (button_get(false) == BUTTON_STOP) if (button_get(false) == BUTTON_STOP)
#else #else
if (button_get(false) == BUTTON_OFF) if (button_get(false) == BUTTON_OFF)
@ -1553,7 +1553,7 @@ int playlist_insert_playlist(char *filename, int position, bool queue)
while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0) while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0)
{ {
/* user abort */ /* user abort */
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
if (button_get(false) == BUTTON_STOP) if (button_get(false) == BUTTON_STOP)
#else #else
if (button_get(false) == BUTTON_OFF) if (button_get(false) == BUTTON_OFF)
@ -2019,7 +2019,7 @@ int playlist_save(char *filename)
int seek; int seek;
/* user abort */ /* user abort */
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
if (button_get(false) == BUTTON_STOP) if (button_get(false) == BUTTON_STOP)
#else #else
if (button_get(false) == BUTTON_OFF) if (button_get(false) == BUTTON_OFF)

8
apps/screens.c
View file

@ -103,6 +103,9 @@ void usb_display_info(void)
void usb_screen(void) void usb_screen(void)
{ {
#ifdef USB_NONE
/* nothing here! */
#else
#ifndef SIMULATOR #ifndef SIMULATOR
backlight_on(); backlight_on();
usb_acknowledge(SYS_USB_CONNECTED_ACK); usb_acknowledge(SYS_USB_CONNECTED_ACK);
@ -118,6 +121,7 @@ void usb_screen(void)
backlight_on(); backlight_on();
#endif #endif
#endif /* USB_NONE */
} }
@ -230,7 +234,7 @@ void charging_display_info(bool animate)
} }
#endif #endif
#ifdef HAVE_BATTERIES
/* blocks while charging, returns on event: /* blocks while charging, returns on event:
1 if charger cable was removed 1 if charger cable was removed
2 if Off/Stop key was pressed 2 if Off/Stop key was pressed
@ -279,7 +283,7 @@ int charging_screen(void)
return rc; return rc;
} }
#endif /* HAVE_BATTERIES */
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD

2
apps/sleeptimer.c
View file

@ -92,7 +92,7 @@ bool sleeptimer_screen(void)
done = true; done = true;
break; break;
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
case BUTTON_RIGHT: case BUTTON_RIGHT:
#else #else
case BUTTON_UP: case BUTTON_UP:

34
apps/tree.c
View file

@ -562,15 +562,19 @@ static bool ask_resume(bool ask_once)
while (!stop) { while (!stop) {
switch (button_get(true)) { switch (button_get(true)) {
case BUTTON_PLAY: case BUTTON_PLAY:
#ifdef BUTTON_RC_PLAY
case BUTTON_RC_PLAY: case BUTTON_RC_PLAY:
#endif
return true; return true;
#ifdef BUTTON_ON
/* ignore the ON button, since it might /* ignore the ON button, since it might
still be pressed since booting */ still be pressed since booting */
case BUTTON_ON: case BUTTON_ON:
case BUTTON_ON | BUTTON_REL: case BUTTON_ON | BUTTON_REL:
case BUTTON_ON | BUTTON_REPEAT: case BUTTON_ON | BUTTON_REPEAT:
break; break;
#endif
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:
usb_screen(); usb_screen();
@ -711,9 +715,13 @@ static bool handle_on(int *ds, int *dc, int numentries, int tree_max_on_screen,
while (!exit) { while (!exit) {
switch (button_get(true)) { switch (button_get(true)) {
case TREE_PREV: case TREE_PREV:
#ifdef BUTTON_RC_LEFT
case BUTTON_RC_LEFT: case BUTTON_RC_LEFT:
#endif
#ifdef BUTTON_ON
case BUTTON_ON | TREE_PREV: case BUTTON_ON | TREE_PREV:
case BUTTON_ON | TREE_PREV | BUTTON_REPEAT: case BUTTON_ON | TREE_PREV | BUTTON_REPEAT:
#endif
used = true; used = true;
if ( dirstart ) { if ( dirstart ) {
dirstart -= tree_max_on_screen; dirstart -= tree_max_on_screen;
@ -725,9 +733,13 @@ static bool handle_on(int *ds, int *dc, int numentries, int tree_max_on_screen,
break; break;
case TREE_NEXT: case TREE_NEXT:
#ifdef BUTTON_RC_RIGHT
case BUTTON_RC_RIGHT: case BUTTON_RC_RIGHT:
#endif
#ifdef BUTTON_ON
case BUTTON_ON | TREE_NEXT: case BUTTON_ON | TREE_NEXT:
case BUTTON_ON | TREE_NEXT | BUTTON_REPEAT: case BUTTON_ON | TREE_NEXT | BUTTON_REPEAT:
#endif
used = true; used = true;
if ( dirstart < numentries - tree_max_on_screen ) { if ( dirstart < numentries - tree_max_on_screen ) {
dirstart += tree_max_on_screen; dirstart += tree_max_on_screen;
@ -741,8 +753,13 @@ static bool handle_on(int *ds, int *dc, int numentries, int tree_max_on_screen,
case BUTTON_PLAY: case BUTTON_PLAY:
#ifdef BUTTON_RC_PLAY
case BUTTON_RC_PLAY: case BUTTON_RC_PLAY:
case BUTTON_ON | BUTTON_PLAY: { #endif
#ifdef BUTTON_ON
case BUTTON_ON | BUTTON_PLAY:
#endif
{
int onplay_result; int onplay_result;
if (currdir[1]) if (currdir[1])
@ -769,11 +786,13 @@ static bool handle_on(int *ds, int *dc, int numentries, int tree_max_on_screen,
exit = true; exit = true;
break; break;
} }
#ifdef BUTTON_ON
case BUTTON_ON | BUTTON_REL: case BUTTON_ON | BUTTON_REL:
case BUTTON_ON | TREE_PREV | BUTTON_REL: case BUTTON_ON | TREE_PREV | BUTTON_REL:
case BUTTON_ON | TREE_NEXT | BUTTON_REL: case BUTTON_ON | TREE_NEXT | BUTTON_REL:
exit = true; exit = true;
break; break;
#endif
} }
if ( used && !exit ) { if ( used && !exit ) {
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -873,7 +892,9 @@ static bool dirbrowse(char *root, int *dirfilter)
switch ( button ) { switch ( button ) {
case TREE_EXIT: case TREE_EXIT:
#ifdef BUTTON_RC_STOP
case BUTTON_RC_STOP: case BUTTON_RC_STOP:
#endif
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_LEFT | BUTTON_REPEAT: case BUTTON_LEFT | BUTTON_REPEAT:
#endif #endif
@ -932,7 +953,9 @@ static bool dirbrowse(char *root, int *dirfilter)
case TREE_ENTER: case TREE_ENTER:
case TREE_ENTER | BUTTON_REPEAT: case TREE_ENTER | BUTTON_REPEAT:
#ifdef BUTTON_RC_PLAY
case BUTTON_RC_PLAY: case BUTTON_RC_PLAY:
#endif
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_PLAY: case BUTTON_PLAY:
case BUTTON_PLAY | BUTTON_REPEAT: case BUTTON_PLAY | BUTTON_REPEAT:
@ -1109,7 +1132,9 @@ static bool dirbrowse(char *root, int *dirfilter)
case TREE_PREV: case TREE_PREV:
case TREE_PREV | BUTTON_REPEAT: case TREE_PREV | BUTTON_REPEAT:
#ifdef BUTTON_RC_LEFT
case BUTTON_RC_LEFT: case BUTTON_RC_LEFT:
#endif
if(filesindir) { if(filesindir) {
if(dircursor) { if(dircursor) {
put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false); put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false);
@ -1147,7 +1172,9 @@ static bool dirbrowse(char *root, int *dirfilter)
case TREE_NEXT: case TREE_NEXT:
case TREE_NEXT | BUTTON_REPEAT: case TREE_NEXT | BUTTON_REPEAT:
#ifdef BUTTON_RC_RIGHT
case BUTTON_RC_RIGHT: case BUTTON_RC_RIGHT:
#endif
if(filesindir) if(filesindir)
{ {
if (dircursor + dirstart + 1 < numentries ) { if (dircursor + dirstart + 1 < numentries ) {
@ -1190,6 +1217,8 @@ static bool dirbrowse(char *root, int *dirfilter)
} }
break; break;
#ifdef BUTTON_ON /* I bet the folks without ON-button want this to
work on a different button */
case BUTTON_ON: case BUTTON_ON:
if (handle_on(&dirstart, &dircursor, numentries, if (handle_on(&dirstart, &dircursor, numentries,
tree_max_on_screen, dirfilter)) tree_max_on_screen, dirfilter))
@ -1216,6 +1245,7 @@ static bool dirbrowse(char *root, int *dirfilter)
} }
} }
break; break;
#endif
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_F2: case BUTTON_F2:
@ -1342,7 +1372,7 @@ static bool add_dir(char* dirname, int fd)
DIR* dir; DIR* dir;
/* check for user abort */ /* check for user abort */
#ifdef HAVE_PLAYER_KEYPAD #ifdef BUTTON_STOP
if (button_get(false) == BUTTON_STOP) if (button_get(false) == BUTTON_STOP)
#else #else
if (button_get(false) == BUTTON_OFF) if (button_get(false) == BUTTON_OFF)

6
apps/wps-display.c
View file

@ -414,6 +414,7 @@ static char* get_tag(struct mp3entry* id3,
#endif #endif
case 'f': /* full-line progress bar */ case 'f': /* full-line progress bar */
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
#ifndef HAVE_NEO_LCD
if(has_new_lcd()) { if(has_new_lcd()) {
*flags |= WPS_REFRESH_PLAYER_PROGRESS; *flags |= WPS_REFRESH_PLAYER_PROGRESS;
*flags |= WPS_REFRESH_DYNAMIC; *flags |= WPS_REFRESH_DYNAMIC;
@ -421,7 +422,10 @@ static char* get_tag(struct mp3entry* id3,
/* we need 11 characters (full line) for /* we need 11 characters (full line) for
progress-bar */ progress-bar */
snprintf(buf, buf_size, " "); snprintf(buf, buf_size, " ");
} else { }
else
#endif /* HAVE_NEO_LCD */
{
/* Tell the user if we have an OldPlayer */ /* Tell the user if we have an OldPlayer */
snprintf(buf, buf_size, " <Old LCD> "); snprintf(buf, buf_size, " <Old LCD> ");
} }

36
apps/wps.c
View file

@ -53,7 +53,7 @@ static bool paused = false;
static struct mp3entry* id3 = NULL; static struct mp3entry* id3 = NULL;
static char current_track_path[MAX_PATH+1]; static char current_track_path[MAX_PATH+1];
#ifdef HAVE_PLAYER_KEYPAD #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
void player_change_volume(int button) void player_change_volume(int button)
{ {
bool exit = false; bool exit = false;
@ -278,7 +278,7 @@ bool browse_id3(void)
case BUTTON_REPEAT: case BUTTON_REPEAT:
break; break;
#ifdef HAVE_PLAYER_KEYPAD #ifdef BUTTON_STOP
case BUTTON_STOP: case BUTTON_STOP:
#else #else
case BUTTON_OFF: case BUTTON_OFF:
@ -506,7 +506,7 @@ static bool menu(void)
break; break;
/* mute */ /* mute */
#ifdef HAVE_PLAYER_KEYPAD #ifdef BUTTON_MENU
case BUTTON_MENU | BUTTON_PLAY: case BUTTON_MENU | BUTTON_PLAY:
#else #else
case BUTTON_F1 | BUTTON_PLAY: case BUTTON_F1 | BUTTON_PLAY:
@ -534,7 +534,7 @@ static bool menu(void)
while (button_get(false)); /* clear button queue */ while (button_get(false)); /* clear button queue */
break; break;
#ifdef HAVE_PLAYER_KEYPAD #ifdef BUTTON_MENU
/* change volume */ /* change volume */
case BUTTON_MENU | BUTTON_LEFT: case BUTTON_MENU | BUTTON_LEFT:
case BUTTON_MENU | BUTTON_LEFT | BUTTON_REPEAT: case BUTTON_MENU | BUTTON_LEFT | BUTTON_REPEAT:
@ -545,9 +545,11 @@ static bool menu(void)
break; break;
/* show id3 tags */ /* show id3 tags */
#ifdef BUTTON_ON
case BUTTON_MENU | BUTTON_ON: case BUTTON_MENU | BUTTON_ON:
status_set_param(true); status_set_param(true);
status_set_audio(true); status_set_audio(true);
#endif
#else #else
case BUTTON_F1 | BUTTON_ON: case BUTTON_F1 | BUTTON_ON:
#endif #endif
@ -742,8 +744,11 @@ int wps_show(void)
! ((button & BUTTON_MENU) || ! ((button & BUTTON_MENU) ||
#endif #endif
(button == BUTTON_NONE) || (button == BUTTON_NONE) ||
(button == SYS_USB_CONNECTED) || (button == SYS_USB_CONNECTED)
(button & BUTTON_REMOTE))) #ifdef BUTTON_REMOTE
|| (button & BUTTON_REMOTE)
#endif
))
{ {
while (button_get(false)); /* clear button queue */ while (button_get(false)); /* clear button queue */
display_keylock_text(true); display_keylock_text(true);
@ -759,6 +764,7 @@ int wps_show(void)
switch(button) switch(button)
{ {
#ifdef BUTTON_ON
case BUTTON_ON: case BUTTON_ON:
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
switch (on_screen()) { switch (on_screen()) {
@ -795,10 +801,12 @@ int wps_show(void)
} }
break; break;
#endif #endif
#endif /* BUTTON_ON */
/* play/pause */ /* play/pause */
case BUTTON_PLAY: case BUTTON_PLAY:
#ifdef BUTTON_RC_PLAY
case BUTTON_RC_PLAY: case BUTTON_RC_PLAY:
#endif
if ( paused ) if ( paused )
{ {
paused = false; paused = false;
@ -830,7 +838,9 @@ int wps_show(void)
case BUTTON_UP: case BUTTON_UP:
case BUTTON_UP | BUTTON_REPEAT: case BUTTON_UP | BUTTON_REPEAT:
#endif #endif
#ifdef BUTTON_RC_VOL_UP
case BUTTON_RC_VOL_UP: case BUTTON_RC_VOL_UP:
#endif
global_settings.volume++; global_settings.volume++;
if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME))
global_settings.volume = mpeg_sound_max(SOUND_VOLUME); global_settings.volume = mpeg_sound_max(SOUND_VOLUME);
@ -844,7 +854,9 @@ int wps_show(void)
case BUTTON_DOWN: case BUTTON_DOWN:
case BUTTON_DOWN | BUTTON_REPEAT: case BUTTON_DOWN | BUTTON_REPEAT:
#endif #endif
#ifdef BUTTON_RC_VOL_DOWN
case BUTTON_RC_VOL_DOWN: case BUTTON_RC_VOL_DOWN:
#endif
global_settings.volume--; global_settings.volume--;
if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME))
global_settings.volume = mpeg_sound_min(SOUND_VOLUME); global_settings.volume = mpeg_sound_min(SOUND_VOLUME);
@ -860,7 +872,9 @@ int wps_show(void)
break; break;
/* prev / restart */ /* prev / restart */
#ifdef BUTTON_RC_LEFT
case BUTTON_RC_LEFT: case BUTTON_RC_LEFT:
#endif
case BUTTON_LEFT | BUTTON_REL: case BUTTON_LEFT | BUTTON_REL:
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
if ((button == (BUTTON_LEFT | BUTTON_REL)) && if ((button == (BUTTON_LEFT | BUTTON_REL)) &&
@ -882,7 +896,9 @@ int wps_show(void)
break; break;
/* next */ /* next */
#ifdef BUTTON_RC_RIGHT
case BUTTON_RC_RIGHT: case BUTTON_RC_RIGHT:
#endif
case BUTTON_RIGHT | BUTTON_REL: case BUTTON_RIGHT | BUTTON_REL:
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
if ((button == (BUTTON_RIGHT | BUTTON_REL)) && if ((button == (BUTTON_RIGHT | BUTTON_REL)) &&
@ -893,7 +909,7 @@ int wps_show(void)
break; break;
/* menu key functions */ /* menu key functions */
#ifdef HAVE_PLAYER_KEYPAD #ifdef BUTTON_MENU
case BUTTON_MENU: case BUTTON_MENU:
#else #else
case BUTTON_F1: case BUTTON_F1:
@ -922,8 +938,10 @@ int wps_show(void)
#endif #endif
/* stop and exit wps */ /* stop and exit wps */
#ifdef BUTTON_RC_STOP
case BUTTON_RC_STOP: case BUTTON_RC_STOP:
#ifdef HAVE_RECORDER_KEYPAD #endif
#ifdef BUTTON_OFF
case BUTTON_OFF: case BUTTON_OFF:
#else #else
case BUTTON_STOP | BUTTON_REL: case BUTTON_STOP | BUTTON_REL: