Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Sep 22nd, 2009  |  syntax: None  |  size: 9.97 KB  |  views: 136  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. Index: apps/keymaps/keymap-e200.c
  2. ===================================================================
  3. --- apps/keymaps/keymap-e200.c  (revision 22779)
  4. +++ apps/keymaps/keymap-e200.c  (working copy)
  5.  -40,7 +40,7 @@
  6.      { ACTION_STD_NEXTREPEAT,  BUTTON_SCROLL_FWD|BUTTON_REPEAT,   BUTTON_NONE },
  7.  
  8.      { ACTION_STD_MENU,        BUTTON_DOWN|BUTTON_REL,            BUTTON_DOWN },
  9. -    { ACTION_STD_REC,         BUTTON_REC|BUTTON_REPEAT,          BUTTON_NONE },
  10. +    { ACTION_STD_REC,         BUTTON_UP|BUTTON_REPEAT,           BUTTON_NONE },
  11.  
  12.      { ACTION_STD_OK,          BUTTON_SELECT|BUTTON_REL,          BUTTON_SELECT },
  13.      { ACTION_STD_OK,          BUTTON_RIGHT,                      BUTTON_NONE },
  14.  -54,7 +54,7 @@
  15.  
  16.  
  17.  static const struct button_mapping button_context_wps[]  = {
  18. -    { ACTION_WPS_PLAY,     BUTTON_UP|BUTTON_REL,        BUTTON_UP },
  19. +    { ACTION_WPS_PLAY,     BUTTON_REC|BUTTON_REL,        BUTTON_REC },
  20.      { ACTION_WPS_STOP,     BUTTON_POWER|BUTTON_REL,     BUTTON_POWER },
  21.    
  22.      { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL,    BUTTON_LEFT },
  23.  -67,7 +67,7 @@
  24.      
  25.      { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_POWER|BUTTON_RIGHT,   BUTTON_POWER },
  26.      { ACTION_WPS_ABSETA_PREVDIR,    BUTTON_POWER|BUTTON_LEFT,    BUTTON_POWER },
  27. -    { ACTION_WPS_ABRESET,           BUTTON_POWER|BUTTON_UP,      BUTTON_POWER },
  28. +    { ACTION_WPS_ABRESET,           BUTTON_POWER|BUTTON_REC,     BUTTON_POWER },
  29.      
  30.      { ACTION_WPS_VOLUP,     BUTTON_SCROLL_FWD,                   BUTTON_NONE },
  31.      { ACTION_WPS_VOLUP,     BUTTON_SCROLL_FWD|BUTTON_REPEAT,     BUTTON_NONE },
  32.  -81,9 +81,9 @@
  33.  
  34.      { ACTION_WPS_MENU,          BUTTON_DOWN|BUTTON_REL,      BUTTON_DOWN },
  35.      { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL,       BUTTON_REC  },
  36. -    { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,        BUTTON_NONE },
  37. +    { ACTION_WPS_REC,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
  38.      
  39. -    { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_UP,      BUTTON_SELECT },
  40. +    { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_REC,      BUTTON_SELECT },
  41.      { ACTION_WPS_ID3SCREEN,     BUTTON_SELECT|BUTTON_DOWN,    BUTTON_SELECT },
  42.      
  43.      LAST_ITEM_IN_LIST
  44.  -96,8 +96,8 @@
  45.      { ACTION_SETTINGS_DEC,      BUTTON_SCROLL_BACK,               BUTTON_NONE },
  46.      { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
  47.  
  48. -    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,             BUTTON_UP   },
  49. -    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,          BUTTON_UP   },
  50. +    { ACTION_STD_PREV,          BUTTON_REC|BUTTON_REL,             BUTTON_REC   },
  51. +    { ACTION_STD_PREVREPEAT,    BUTTON_REC|BUTTON_REPEAT,          BUTTON_REC   },
  52.      { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,           BUTTON_DOWN },
  53.      { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_DOWN },
  54.      { ACTION_SETTINGS_RESET,    BUTTON_SELECT,                    BUTTON_NONE },
  55.  -113,7 +113,7 @@
  56.  }; /* button_context_list */
  57.  
  58.  static const struct button_mapping button_context_tree[]  = {
  59. -    { ACTION_TREE_WPS,    BUTTON_UP|BUTTON_REL,         BUTTON_UP },
  60. +    { ACTION_TREE_WPS,    BUTTON_REC|BUTTON_REL,         BUTTON_REC },
  61.      { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
  62.      
  63.      LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
  64.  -153,8 +153,8 @@
  65.      { ACTION_NONE,       BUTTON_LEFT,                   BUTTON_NONE },
  66.      { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL,       BUTTON_NONE },
  67.      { ACTION_STD_CANCEL, BUTTON_SELECT|BUTTON_REL,      BUTTON_NONE },
  68. -    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REL,          BUTTON_NONE },
  69. -    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
  70. +    { ACTION_QS_TOP,     BUTTON_REC|BUTTON_REL,          BUTTON_NONE },
  71. +    { ACTION_QS_TOP,     BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE },
  72.      { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REL,        BUTTON_NONE },
  73.      { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
  74.      { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REL,        BUTTON_NONE },
  75.  -171,8 +171,8 @@
  76.      { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_BACK,              BUTTON_NONE },
  77.      { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE },
  78.  
  79. -    { ACTION_STD_PREV,           BUTTON_UP|BUTTON_REL,            BUTTON_UP   },
  80. -    { ACTION_STD_PREVREPEAT,     BUTTON_UP|BUTTON_REPEAT,         BUTTON_UP   },
  81. +    { ACTION_STD_PREV,           BUTTON_REC|BUTTON_REL,            BUTTON_REC   },
  82. +    { ACTION_STD_PREVREPEAT,     BUTTON_REC|BUTTON_REPEAT,         BUTTON_REC   },
  83.      { ACTION_STD_NEXT,           BUTTON_DOWN|BUTTON_REL,          BUTTON_DOWN },
  84.      { ACTION_STD_NEXTREPEAT,     BUTTON_DOWN|BUTTON_REPEAT,       BUTTON_DOWN },
  85.      { ACTION_NONE,               BUTTON_SELECT,                   BUTTON_NONE },
  86.  -184,8 +184,8 @@
  87.  }; /* button_context_settings_right_is_inc */
  88.  
  89.  static const struct button_mapping button_context_settings_time[] = {
  90. -    { ACTION_STD_PREV,        BUTTON_UP|BUTTON_REL,             BUTTON_NONE },
  91. -    { ACTION_STD_PREVREPEAT,  BUTTON_UP|BUTTON_REPEAT,          BUTTON_NONE },
  92. +    { ACTION_STD_PREV,        BUTTON_REC|BUTTON_REL,             BUTTON_NONE },
  93. +    { ACTION_STD_PREVREPEAT,  BUTTON_REC|BUTTON_REPEAT,          BUTTON_NONE },
  94.      { ACTION_STD_NEXT,        BUTTON_DOWN|BUTTON_REL,           BUTTON_NONE },
  95.      { ACTION_STD_NEXTREPEAT,  BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
  96.  
  97.  -204,7 +204,7 @@
  98.      { ACTION_PS_TOGGLE_MODE,    BUTTON_REC,                BUTTON_NONE },
  99.      { ACTION_PS_RESET,          BUTTON_SELECT,             BUTTON_NONE },
  100.      { ACTION_PS_EXIT,           BUTTON_POWER,              BUTTON_NONE },
  101. -    { ACTION_PS_EXIT,           BUTTON_UP,                 BUTTON_NONE },
  102. +    { ACTION_PS_EXIT,           BUTTON_REC,                 BUTTON_NONE },
  103.      { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
  104.      { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
  105.      
  106.  -215,7 +215,7 @@
  107.  static const struct button_mapping button_context_recscreen[]  = {
  108.      { ACTION_REC_PAUSE,          BUTTON_UP|BUTTON_REL,             BUTTON_UP },
  109.      { ACTION_STD_CANCEL,         BUTTON_DOWN,                      BUTTON_NONE },
  110. -    { ACTION_REC_NEWFILE,        BUTTON_REC|BUTTON_REL,            BUTTON_REC },
  111. +    { ACTION_REC_NEWFILE,        BUTTON_UP|BUTTON_REL,             BUTTON_UP },
  112.      { ACTION_STD_MENU,           BUTTON_SELECT|BUTTON_REPEAT,      BUTTON_SELECT},
  113.      { ACTION_SETTINGS_INC,       BUTTON_RIGHT,                     BUTTON_NONE },
  114.      { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
  115.  -238,9 +238,9 @@
  116.      { ACTION_FM_MENU,        BUTTON_SELECT|BUTTON_REPEAT,       BUTTON_NONE },
  117.      { ACTION_FM_PRESET,      BUTTON_SELECT|BUTTON_REL,          BUTTON_NONE },
  118.      { ACTION_FM_STOP,        BUTTON_POWER|BUTTON_REL,           BUTTON_NONE },
  119. -    { ACTION_FM_MODE,        BUTTON_UP|BUTTON_REPEAT,           BUTTON_UP   },
  120. +    { ACTION_FM_MODE,        BUTTON_REC|BUTTON_REPEAT,           BUTTON_REC   },
  121.      { ACTION_FM_EXIT,        BUTTON_DOWN|BUTTON_REL,            BUTTON_NONE },
  122. -    { ACTION_FM_PLAY,        BUTTON_UP|BUTTON_REL,              BUTTON_UP   },
  123. +    { ACTION_FM_PLAY,        BUTTON_REC|BUTTON_REL,              BUTTON_REC   },
  124.      LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
  125.  }; /* button_context_radio */
  126.  
  127.  -263,7 +263,7 @@
  128.      { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
  129.      { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
  130.      { ACTION_KBD_SELECT,       BUTTON_SELECT,                    BUTTON_NONE },
  131. -    { ACTION_KBD_DONE,         BUTTON_UP,                        BUTTON_NONE },
  132. +    { ACTION_KBD_DONE,         BUTTON_REC,                        BUTTON_NONE },
  133.      { ACTION_KBD_ABORT,        BUTTON_POWER,                     BUTTON_NONE },
  134.  
  135.      LAST_ITEM_IN_LIST
  136.  -277,7 +277,7 @@
  137.  
  138.  #ifdef HAVE_USBSTACK
  139.  static const struct button_mapping button_context_usb_hid[] = {
  140. -    { ACTION_USB_HID_PLAY,     BUTTON_UP,                        BUTTON_NONE },
  141. +    { ACTION_USB_HID_PLAY,     BUTTON_REC,                        BUTTON_NONE },
  142.      { ACTION_USB_HID_STOP,     BUTTON_POWER,                     BUTTON_NONE },
  143.      { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT,                      BUTTON_NONE },
  144.      { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT,                     BUTTON_NONE },
  145. Index: firmware/target/arm/sandisk/sansa-e200/button-e200.c
  146. ===================================================================
  147. --- firmware/target/arm/sandisk/sansa-e200/button-e200.c        (revision 22779)
  148. +++ firmware/target/arm/sandisk/sansa-e200/button-e200.c        (working copy)
  149.  -252,12 +252,12 @@
  150.      if (!_button_hold())
  151.      {
  152.          /* Read normal buttons */
  153. -        if ((state & 0x01) == 0) int_btn |= BUTTON_REC;
  154. +        if ((state & 0x01) == 0) int_btn |= BUTTON_UP;
  155.          if ((state & 0x02) == 0) int_btn |= BUTTON_DOWN;
  156.          if ((state & 0x04) == 0) int_btn |= BUTTON_RIGHT;
  157.          if ((state & 0x08) == 0) int_btn |= BUTTON_LEFT;
  158.          if ((state & 0x10) == 0) int_btn |= BUTTON_SELECT; /* The centre button */
  159. -        if ((state & 0x20) == 0) int_btn |= BUTTON_UP; /* The "play" button */
  160. +        if ((state & 0x20) == 0) int_btn |= BUTTON_REC; /* The "play" button */
  161.          if ((state & 0x40) != 0) int_btn |= BUTTON_POWER;
  162.      }
  163.  }
  164. Index: firmware/target/arm/sandisk/sansa-e200/button-target.h
  165. ===================================================================
  166. --- firmware/target/arm/sandisk/sansa-e200/button-target.h      (revision 22779)
  167. +++ firmware/target/arm/sandisk/sansa-e200/button-target.h      (working copy)
  168.  -43,7 +43,7 @@
  169.  #define BUTTON_RIGHT        0x00000004
  170.  #define BUTTON_LEFT         0x00000008
  171.  #define BUTTON_SELECT       0x00000010
  172. -#define BUTTON_UP           0x00000020
  173. +#define BUTTON_UP           0
  174.  #define BUTTON_POWER        0x00000040
  175.  
  176.  #define BUTTON_SCROLL_BACK  0x00000080
clone this paste RAW Paste Data