4 files changed, 23 insertions, 12 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 4074177ce2..414ae46123 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -57,9 +57,9 @@ zxbox
 pacbox
 #endif
 
-#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
-    (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \
-    !defined(RB_PROFILE)
+#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || defined(SANSA_CLIPPLUS) \
+    || defined(SANSA_CLIPV2) || (LCD_DEPTH == 2)) \
+    && (MEMORYSIZE > 2 && !defined(RB_PROFILE))
 doom
 #endif
 
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index dc0374f852..e7f8e9014b 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -222,6 +222,16 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
+#define DOOMBUTTON_UP      BUTTON_UP
+#define DOOMBUTTON_DOWN    BUTTON_DOWN
+#define DOOMBUTTON_LEFT    BUTTON_LEFT
+#define DOOMBUTTON_RIGHT   BUTTON_RIGHT
+#define DOOMBUTTON_SHOOT   BUTTON_SELECT
+#define DOOMBUTTON_OPEN    BUTTON_HOME
+#define DOOMBUTTON_ESC     BUTTON_POWER
+#define DOOMBUTTON_ENTER   BUTTON_SELECT
+#define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 0535a8d76a..81df31a356 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -54,7 +54,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}%
     \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}%
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD, SANSA_C200_PAD%
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
          ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}%
     \opt{SANSA_FUZE_PAD}{pressing \ButtonHome}
     \opt{PBELL_VIBE500_PAD}{pressing \ButtonRec}
@@ -78,7 +78,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 
 \subsubsection{Keys}
 \begin{btnmap}
-  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
   \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
@@ -88,7 +88,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
     & Move Forward \\
 %
   \nopt{IPOD_3G_PAD,IPOD_4G_PAD,COWON_D2_PAD}{
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{COWON_D2_PAD}{\TouchBottomMiddle}
@@ -97,14 +97,14 @@ Rockdoom options, you will need to quit your current game and restart the plugin
       & Down\\
   }
 %
-  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
       ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
   \opt{COWON_D2_PAD}{\TouchMidLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn Left \\
 %
-  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
       ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
   \opt{COWON_D2_PAD}{\TouchMidRight}
@@ -113,7 +113,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
-  \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonSelect}
+  \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
@@ -127,6 +127,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
   \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
   \opt{SANSA_FUZE_PAD}{\ButtonPower}
+  \opt{SANSA_CLIP_PAD}{\ButtonHome}
   \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
   \opt{PBELL_VIBE500_PAD}{\ButtonOK}
        \opt{HAVEREMOTEKEYMAP}{& }
@@ -135,7 +136,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower}
+      ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
   \opt{SANSA_FUZE_PAD}{\ButtonHome}
   \opt{COWON_D2_PAD}{\TouchTopLeft}
   \opt{PBELL_VIBE500_PAD}{\ButtonRec}
@@ -144,7 +145,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD%
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
-      ,MROBE100_PAD}{\ButtonSelect}
+      ,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{COWON_D2_PAD}{\TouchCenter}
   \opt{PBELL_VIBE500_PAD}{\ButtonPower}
@@ -156,7 +157,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IAUDIO_X5_PAD}{\ButtonRec}
   \opt{IRIVER_H10_PAD}{\ButtonFF}
   \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
-  \opt{SANSA_C200_PAD}{\ButtonVolUp}
+  \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp}
   \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
   \opt{COWON_D2_PAD}{\TouchBottomLeft}
   \opt{PBELL_VIBE500_PAD}{\ButtonPlay}
diff --git a/manual/plugins/images/ss-doom-128x64x1-sansaclip.png b/manual/plugins/images/ss-doom-128x64x1-sansaclip.png
new file mode 100755
index 0000000000..9240d86591
--- /dev/null
+++ b/manual/plugins/images/ss-doom-128x64x1-sansaclip.png