Gigabeat: Remove the 8kHz for now because it doesn't seem to work too well. Also, HW_SAMPR_CAPS should always be defined for sim and target.

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

2 files changed, 3 insertions, 7 deletions

diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h
index cd2fac360c..35b6175227 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config-gigabeat.h
@@ -70,6 +70,9 @@
 
 #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */
 
+#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
+                       SAMPR_CAP_11)
+
 #ifndef SIMULATOR
 
 /* The LCD on a Gigabeat is 240x320 - it is portrait */
@@ -133,7 +136,4 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
-                       SAMPR_CAP_11 | SAMPR_CAP_8)
-
 #endif
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index 09f846d645..52ab3f165f 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -25,7 +25,6 @@
 #include "file.h"
 #include "mmu-meg-fx.h"
 
-#define GIGABEAT_8000HZ      (0x02 << 1)
 #define GIGABEAT_11025HZ     (0x19 << 1)
 #define GIGABEAT_22050HZ     (0x1b << 1)
 #define GIGABEAT_44100HZ     (0x11 << 1)
@@ -256,9 +255,6 @@ void pcm_set_frequency(unsigned int frequency)
 {
     switch(frequency)
     {
-        case SAMPR_8:
-            sr_ctrl = GIGABEAT_8000HZ;
-            break;
         case SAMPR_11:
             sr_ctrl = GIGABEAT_11025HZ;
             break;