Use button macros in button map and add newer targets

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10014 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 20 insertions, 11 deletions

diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index e00aa998f8..fc241c786a 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -42,7 +42,7 @@ will carry on playing whilst plugins are being run.
 
 \opt{h1xx,h300,ipodcolor,ipodnano}{\input{plugins/pacbox.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/pong.tex}}
+\opt{HAVE_LCD_BITMAP}{\input{plugins/pong.tex}}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/rockblox.tex}}
 
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index 74c74eb67e..fda8f0fca8 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -4,20 +4,29 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
 
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{recorder,recorderv2fm}{F1}\opt{ondio}{LEFT}\opt{h1xx,h300}{UP}
-    \opt{ipodcolor,ipodnano}{MENU} 
+    \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{ONDIO_PAD}{\ButtonLeft}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
+    \opt{IPOD_4G_PAD}{\ButtonMenu} 
     & Left player up\\
-    \opt{recorder,recorderv2fm,ipodcolor,ipodnano}{LEFT}
-    \opt{ondio}{MODE}\opt{h1xx,h300}{DOWN} 
+    \opt{RECORDER_PAD,IPOD_4G_PAD}{\ButtonLeft}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} 
     & Left player down\\
-    \opt{recorder,recorderv2fm}{F3}\opt{ondio}{UP}
-    \opt{h1xx,h300}{PLAY}\opt{ipodcolor,ipodnano}{RIGHT} 
+    \opt{RECORDER_PAD}{\ButtonFThree}
+        \opt{ONDIO_PAD}{\ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+        \opt{IPOD_4G_PAD}{\ButtonRight}
+        \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Right player up\\
-    \opt{recorder,recorderv2fm}{RIGHT}\opt{ondio}{DOWN}
-    \opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{PLAY} 
+    \opt{RECORDER_PAD}{\ButtonRight}
+        \opt{ONDIO_PAD}{\ButtonDown}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+        \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
     & Right player down\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}
-    \opt{ipodcolor,ipodnano}{SELECT} 
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonSelect}
+        \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}