diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
| commit | a54da1b92663606f5e5c18bc1eaec30c06847da1 (patch) | |
| tree | a1b7485debf62a8c52d1db3199436cac2f3ce346 /common/keycode.h | |
| parent | 4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff) | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'common/keycode.h')
| -rw-r--r-- | common/keycode.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/keycode.h b/common/keycode.h index 08c3cbf42b..ac4ef00db6 100644 --- a/common/keycode.h +++ b/common/keycode.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* +/* * Keycodes based on HID Usage Keyboard/Keypad Page(0x07) plus special codes * http://www.usb.org/developers/devclass_docs/Hut1_12.pdf */ @@ -140,6 +140,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define KC_VOLD KC_AUDIO_VOL_DOWN #define KC_MNXT KC_MEDIA_NEXT_TRACK #define KC_MPRV KC_MEDIA_PREV_TRACK +#define KC_MFFD KC_MEDIA_FAST_FORWARD +#define KC_MRWD KC_MEDIA_REWIND #define KC_MSTP KC_MEDIA_STOP #define KC_MPLY KC_MEDIA_PLAY_PAUSE #define KC_MSEL KC_MEDIA_SELECT @@ -390,7 +392,7 @@ enum hid_keyboard_keypad_usage { KC_RALT, KC_RGUI, - /* NOTE: 0xE8-FF are used for internal special purpose */ + /* NOTE: 0xE8-FF are used for internal special purpose */ }; /* Special keycodes */ @@ -420,7 +422,9 @@ enum internal_special_keycodes { KC_WWW_FORWARD, KC_WWW_STOP, KC_WWW_REFRESH, - KC_WWW_FAVORITES, /* 0xBA */ + KC_WWW_FAVORITES, + KC_MEDIA_FAST_FORWARD, + KC_MEDIA_REWIND, /* 0xBC */ /* Fn key */ KC_FN0 = 0xC0, |