Ondio config cleanup, SIBI support

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

3 files changed, 15 insertions, 32 deletions

diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index d27444840b..f7d9a8f33f 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -19,15 +19,6 @@
 /* Define this if you have a MAS3587F */
 #define CONFIG_HWCODEC MAS3587F
 
-/* Define this if you have a LiIon battery */
-/* #define HAVE_LIION */
-
-/* Define this if you need to power on ATA */
-/* #define NEEDS_ATA_POWER_ON */
-
-/* Define this if battery voltage can only be measured with ATA powered */
-/* #define NEED_ATA_POWER_BATT_MEASURE */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      12000000
 
@@ -35,7 +26,7 @@
 #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */
 
 /* Define this if you control power on PB5 (instead of the OFF button) */
-#define HAVE_POWEROFF_ON_PB5 /* don't know yet */
+#define HAVE_POWEROFF_ON_PB5
 
 /* Offset ( in the firmware file's header ) to the file length */
 #define FIRMWARE_OFFSET_FILE_LENGTH 20
@@ -46,9 +37,6 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 24
 
-/* FM recorders can wake up from RTC alarm */
-/* #define HAVE_ALARM_MOD 1 */
-
 /* Define this if you have an FM Radio */
 #define CONFIG_TUNER TEA5767
 
@@ -59,7 +47,7 @@
 #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */
 
 /* The start address index for ROM builds */
-#define ROM_START 0x12010 /* don't know yet */
+#define ROM_START 0x16010
 
 /* Define this if the display is mounted upside down */
 #define HAVE_DISPLAY_FLIPPED
@@ -76,4 +64,7 @@
 /* Define this to support mounting FAT16 partitions */
 #define HAVE_FAT16SUPPORT
 
+/* Define this if the MAS SIBI line can be controlled via PB8 */
+#define HAVE_MAS_SIBI_CONTROL
+
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index e3fe6c718f..b4c9f0d572 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -1,6 +1,3 @@
-/* define this if you have recording possibility */
-/* #define HAVE_RECORDING */
-
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
@@ -19,15 +16,6 @@
 /* Define this if you have a MAS3539F */
 #define CONFIG_HWCODEC MAS3539F
 
-/* Define this if you have a LiIon battery */
-/* #define HAVE_LIION */
-
-/* Define this if you need to power on ATA */
-/* #define NEEDS_ATA_POWER_ON */
-
-/* Define this if battery voltage can only be measured with ATA powered */
-/* #define NEED_ATA_POWER_BATT_MEASURE */
-
 /* Define this to the CPU frequency */
 #define CPU_FREQ      12000000
 
@@ -35,7 +23,7 @@
 #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */
 
 /* Define this if you control power on PB5 (instead of the OFF button) */
-#define HAVE_POWEROFF_ON_PB5 /* don't know yet */
+#define HAVE_POWEROFF_ON_PB5
 
 /* Offset ( in the firmware file's header ) to the file length */
 #define FIRMWARE_OFFSET_FILE_LENGTH 20
@@ -46,9 +34,6 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 24
 
-/* FM recorders can wake up from RTC alarm */
-/* #define HAVE_ALARM_MOD 1 */
-
 /* How to detect USB */
 #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */
 
@@ -56,7 +41,7 @@
 #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */
 
 /* The start address index for ROM builds */
-#define ROM_START 0x12010 /* don't know yet */
+#define ROM_START 0x12010
 
 /* Define this if the display is mounted upside down */
 #define HAVE_DISPLAY_FLIPPED
@@ -73,5 +58,7 @@
 /* Define this to support mounting FAT16 partitions */
 #define HAVE_FAT16SUPPORT
 
-#endif /* SIMULATOR */
+/* Define this if the MAS SIBI line can be controlled via PB8 */
+#define HAVE_MAS_SIBI_CONTROL
 
+#endif /* SIMULATOR */
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 4f1d16f9d3..39760d3fab 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -937,6 +937,11 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
 
     setup_sci0();
 
+#ifdef HAVE_MAS_SIBI_CONTROL
+    and_b(~0x01, &PBDRH); /* drive SIBI low */
+    and_b(~0x01, &PBIORH); /* output for PB8 */
+#endif
+
 #if CONFIG_HWCODEC == MAS3587F
     or_b(0x08, &PAIORH); /* output for /PR */
     init_playback();