diff -Nurb rockbox.orig/apps/keymaps/keymap-c200.c rockbox.kmap/apps/keymaps/keymap-c200.c --- rockbox.orig/apps/keymaps/keymap-c200.c 2007-12-31 22:36:52.000000000 +0200 +++ rockbox.kmap/apps/keymaps/keymap-c200.c 2008-01-01 19:09:39.000000000 +0200 @@ -44,8 +44,8 @@ { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, + { ACTION_STD_REC, BUTTON_REC|BUTTON_POWER, BUTTON_NONE }, + { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_standard */ @@ -63,9 +63,9 @@ { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, - { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, - { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, + { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_WPS_ABSETA_PREVDIR,BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, + { ACTION_WPS_ABRESET, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, @@ -75,11 +75,11 @@ { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, - { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, - { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, + { ACTION_WPS_PITCHSCREEN, BUTTON_REC|BUTTON_UP, BUTTON_NONE }, + { ACTION_WPS_ID3SCREEN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, + { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, - { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_REC, BUTTON_REC|BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_wps */ @@ -213,14 +213,21 @@ static const struct button_mapping button_context_recscreen[] = { { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_REC_PAUSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, + { ACTION_STD_CANCEL, BUTTON_REC|BUTTON_POWER, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, + { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_REC|BUTTON_UP, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_REC|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ #endif diff -Nurb rockbox.orig/manual/platform/c200.tex rockbox.kmap/manual/platform/c200.tex --- rockbox.orig/manual/platform/c200.tex 2007-12-31 22:37:07.000000000 +0200 +++ rockbox.kmap/manual/platform/c200.tex 2008-01-01 19:13:37.000000000 +0200 @@ -48,7 +48,7 @@ \newcommand{\ActionStdQuickScreen}{Long \ButtonDown} \newcommand{\ActionStdMenu}{\ButtonPower} \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdRec}{Long \ButtonRec} +\newcommand{\ActionStdRec}{\ButtonRec{} + \ButtonPower} %Button actions, wps context \newcommand{\ActionWpsPlay}{\ButtonUp} @@ -63,13 +63,9 @@ \newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} \newcommand{\ActionWpsMenu}{\ButtonPower} -\newcommand{\ActionWpsContext}{\ButtonDown} +\newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} -\newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonUp} - %Button actions, tree context \newcommand{\ActionTreeWps}{\ButtonUp} \newcommand{\ActionTreeStop}{Long \ButtonUp} @@ -109,8 +105,8 @@ %Button actions, Recording screen context \newcommand{\ActionRecPause}{\ButtonUp} -\newcommand{\ActionRecExit}{\ButtonPower} -\newcommand{\ActionRecNewfile}{\ButtonRec} +\newcommand{\ActionRecExit}{\ButtonRec{} + \ButtonPower or \ButtonRec{} + \ButtonLeft} +\newcommand{\ActionRecNewfile}{\ButtonRec{} + \ButtonRight} \newcommand{\ActionRecMenu}{Long \ButtonDown} \newcommand{\ActionSettingsInc}{\ButtonRight} \newcommand{\ActionSettingsDec}{\ButtonLeft}