1 files changed, 37 insertions, 32 deletions

diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index ed77ca4575..b505175a68 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -27,6 +27,7 @@
       \opt{cowond2}{1600~mAh}%
       \opt{mrobe100}{720~mAh}%
       \opt{samsungyh920,samsungyh925}{900~mAh}%
+      \opt{samsungyh820}{650~mAh}%
       , which is the capacity value for the standard
       \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
         Rockbox uses this value for runtime estimation, not battery percentage
@@ -258,21 +259,22 @@ therefore result in better runtime.
     functionality.
     \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}{%
+        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+        ,SAMSUNG_YH820_PAD}{%
     Switching modes back and forth is done by pressing the
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}%
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZEPLUS_PAD}%
             {\ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight}
         \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonLeft}
-        \opt{SAMSUNG_YH92X_PAD}{\ButtonRec+\ButtonRew}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRew}
     and
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec}%
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZEPLUS_PAD}
             {Long \ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft}
         \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonRight}
-        \opt{SAMSUNG_YH92X_PAD}{\ButtonRec+\ButtonFF}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonFF}
     keys, respectively.%
     }%
     \opt{HAVEREMOTEKEYMAP}{
@@ -297,7 +299,8 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonVolUp{} / \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD}{\ButtonUp{} / \ButtonDown}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD%
+                    }{\ButtonUp{} / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -312,7 +315,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect; \ButtonBack}
                 \opt{IRIVER_H10_PAD}{\ButtonFF}
                 \opt{IRIVER_VIBE500_PAD}{\ButtonMenu}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRight}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF}%
@@ -325,7 +328,7 @@ therefore result in better runtime.
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
                 \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
                     ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
-                    ,SAMSUNG_YH92X_PAD}{\ButtonPlay}
+                    ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -345,7 +348,7 @@ therefore result in better runtime.
                 \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
                 \opt{PBELL_VIBE500_PAD}{\ButtonCancel; Long \ButtonPlay}
                 \opt{MROBE100_PAD}{\ButtonDisplay; Long {\ButtonPlay}}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonLeft}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCPlay}%
@@ -360,7 +363,7 @@ therefore result in better runtime.
                     ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonLeft}
                 \opt{GIGABEAT_RC_PAD}{\ButtonPrev; \ButtonLeft}%
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                 \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCRew}%
@@ -374,7 +377,7 @@ therefore result in better runtime.
                     ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonRight}
                 \opt{GIGABEAT_RC_PAD}{\ButtonNext; \ButtonRight}%
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonFF}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCFF}%
@@ -395,7 +398,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
                 \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
                     ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
-                    ,SAMSUNG_YH92X_PAD}{\ButtonPlay}
+                    ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCPlay}%
@@ -410,7 +413,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{Long \ButtonPlay}
                 \opt{MROBE100_PAD}{\ButtonDisplay; Long \ButtonPlay}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRec}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{Long \ButtonRCPlay}%
@@ -423,7 +426,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{\ButtonPrev; \ButtonLeft}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{\ButtonRew}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                   \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCRew}%
@@ -436,7 +439,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonRight}
                 \opt{GIGABEAT_S_PAD}{\ButtonNext; \ButtonRight}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{\ButtonFF}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCFF}%
@@ -449,7 +452,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {Long \ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonPrev; Long \ButtonLeft}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonRew}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew}%
@@ -462,7 +465,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {Long \ButtonRight}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonNext; Long \ButtonRight}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonFF}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCFF}%
@@ -474,7 +477,7 @@ therefore result in better runtime.
                 \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD}{\ButtonDown}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{\ButtonLeft}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {\ButtonMenu}
                 \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
@@ -489,7 +492,7 @@ therefore result in better runtime.
                 \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBottomRight}
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD}{Long \ButtonDown}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonLeft}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonLeft}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {Long \ButtonMenu}
                 \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
@@ -506,7 +509,8 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
                     {\ButtonVolUp / \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown}
-                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+                    ,SAMSUNG_YH820_PAD}
                     {\ButtonUp / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -521,7 +525,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{\ButtonRight}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
                 \opt{PBELL_VIBE500_PAD}{\ButtonOK}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -535,7 +539,7 @@ therefore result in better runtime.
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonSelect; Long \ButtonBack}
-                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{Long \ButtonRight}
+                \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRight}
                 \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -559,7 +563,8 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD}
                     {\ButtonPrev; \ButtonVolUp / \ButtonNext; \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown}
-                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+                    ,SAMSUNG_YH820_PAD}
                     {\ButtonUp / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -578,7 +583,7 @@ therefore result in better runtime.
                     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                         {\ButtonPlay / \ButtonMenu}
                     \opt{PBELL_VIBE500_PAD}{\ButtonOK / \ButtonCancel}
-                    \opt{SAMSUNG_YH92X_PAD}{\ButtonLeft / \ButtonRight}
+                    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft / \ButtonRight}
                         &
                     \opt{HAVEREMOTEKEYMAP}{
                         \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay}%
@@ -596,7 +601,7 @@ therefore result in better runtime.
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {Long \ButtonPlay / Long \ButtonMenu}
                 \opt{PBELL_VIBE500_PAD}{\ButtonPlay / \ButtonMenu}
-                \opt{SAMSUNG_YH92X_PAD}{Long \ButtonLeft / Long \ButtonRight}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonLeft / Long \ButtonRight}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF / Long \ButtonRCRew}%
@@ -619,7 +624,7 @@ therefore result in better runtime.
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonPlay+\ButtonMenu}
                 \opt{PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
-                \opt{SAMSUNG_YH92X_PAD}{Long \ButtonLeft+\ButtonDown}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonLeft+\ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF+\ButtonRCRew}%
@@ -633,7 +638,7 @@ therefore result in better runtime.
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
                     ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {\ButtonLeft / \ButtonRight}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRew / \ButtonFF}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew / \ButtonFF}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -652,7 +657,7 @@ therefore result in better runtime.
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonSelect+\ButtonMenu}
                 \opt{PBELL_VIBE500_PAD}{Long \ButtonCancel}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCPlay}%
@@ -665,7 +670,7 @@ therefore result in better runtime.
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
                     ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
                     {Long \ButtonLeft / Long \ButtonRight}
-                \opt{SAMSUNG_YH92X_PAD}{Long \ButtonRew / Long \ButtonFF}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew / Long \ButtonFF}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew / Long \ButtonRCFF}%
@@ -682,7 +687,7 @@ therefore result in better runtime.
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonSelect+\ButtonPlay}
                 \opt{PBELL_VIBE500_PAD}{Long \ButtonRec}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRec}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{\ButtonRCPlay}%
@@ -700,7 +705,7 @@ therefore result in better runtime.
                 % Cursor move up / down / left / right
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
-                    ,SAMSUNG_YH92X_PAD}
+                    ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
                     {\ButtonUp / \ButtonDown / \ButtonLeft / \ButtonRight}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown / 
                     \ButtonLeft / \ButtonRight}
@@ -721,7 +726,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack}
                 \opt{IRIVER_H10_PAD}{\ButtonPlay}
                 \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCHeart}%
@@ -735,7 +740,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
                 \opt{SANSA_CLIP_PAD}{\ButtonHome}
                 \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
-                \opt{SAMSUNG_YH92X_PAD}{\ButtonFF}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
                 &
                 \opt{HAVEREMOTEKEYMAP}{
                     &}
@@ -755,7 +760,7 @@ therefore result in better runtime.
                     {\ButtonVolUp / \ButtonVolDown}
                 \opt{PBELL_VIBE500_PAD}
                     {\ButtonOK / \ButtonCancel}
-                \opt{SAMSUNG_YH92X_PAD}
+                \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
                     {\ButtonRec+\ButtonUp / \ButtonRec+\ButtonDown}
                 &
                 \opt{HAVEREMOTEKEYMAP}{