diff options
-rw-r--r-- | firmware/export/config-ondiofm.h | 19 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 23 | ||||
-rw-r--r-- | firmware/mp3_playback.c | 5 |
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 @@ | |||
19 | /* Define this if you have a MAS3587F */ | 19 | /* Define this if you have a MAS3587F */ |
20 | #define CONFIG_HWCODEC MAS3587F | 20 | #define CONFIG_HWCODEC MAS3587F |
21 | 21 | ||
22 | /* Define this if you have a LiIon battery */ | ||
23 | /* #define HAVE_LIION */ | ||
24 | |||
25 | /* Define this if you need to power on ATA */ | ||
26 | /* #define NEEDS_ATA_POWER_ON */ | ||
27 | |||
28 | /* Define this if battery voltage can only be measured with ATA powered */ | ||
29 | /* #define NEED_ATA_POWER_BATT_MEASURE */ | ||
30 | |||
31 | /* Define this to the CPU frequency */ | 22 | /* Define this to the CPU frequency */ |
32 | #define CPU_FREQ 12000000 | 23 | #define CPU_FREQ 12000000 |
33 | 24 | ||
@@ -35,7 +26,7 @@ | |||
35 | #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */ | 26 | #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */ |
36 | 27 | ||
37 | /* Define this if you control power on PB5 (instead of the OFF button) */ | 28 | /* Define this if you control power on PB5 (instead of the OFF button) */ |
38 | #define HAVE_POWEROFF_ON_PB5 /* don't know yet */ | 29 | #define HAVE_POWEROFF_ON_PB5 |
39 | 30 | ||
40 | /* Offset ( in the firmware file's header ) to the file length */ | 31 | /* Offset ( in the firmware file's header ) to the file length */ |
41 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 32 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
@@ -46,9 +37,6 @@ | |||
46 | /* Offset ( in the firmware file's header ) to the real data */ | 37 | /* Offset ( in the firmware file's header ) to the real data */ |
47 | #define FIRMWARE_OFFSET_FILE_DATA 24 | 38 | #define FIRMWARE_OFFSET_FILE_DATA 24 |
48 | 39 | ||
49 | /* FM recorders can wake up from RTC alarm */ | ||
50 | /* #define HAVE_ALARM_MOD 1 */ | ||
51 | |||
52 | /* Define this if you have an FM Radio */ | 40 | /* Define this if you have an FM Radio */ |
53 | #define CONFIG_TUNER TEA5767 | 41 | #define CONFIG_TUNER TEA5767 |
54 | 42 | ||
@@ -59,7 +47,7 @@ | |||
59 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ | 47 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ |
60 | 48 | ||
61 | /* The start address index for ROM builds */ | 49 | /* The start address index for ROM builds */ |
62 | #define ROM_START 0x12010 /* don't know yet */ | 50 | #define ROM_START 0x16010 |
63 | 51 | ||
64 | /* Define this if the display is mounted upside down */ | 52 | /* Define this if the display is mounted upside down */ |
65 | #define HAVE_DISPLAY_FLIPPED | 53 | #define HAVE_DISPLAY_FLIPPED |
@@ -76,4 +64,7 @@ | |||
76 | /* Define this to support mounting FAT16 partitions */ | 64 | /* Define this to support mounting FAT16 partitions */ |
77 | #define HAVE_FAT16SUPPORT | 65 | #define HAVE_FAT16SUPPORT |
78 | 66 | ||
67 | /* Define this if the MAS SIBI line can be controlled via PB8 */ | ||
68 | #define HAVE_MAS_SIBI_CONTROL | ||
69 | |||
79 | #endif /* SIMULATOR */ | 70 | #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 @@ | |||
1 | /* define this if you have recording possibility */ | ||
2 | /* #define HAVE_RECORDING */ | ||
3 | |||
4 | /* define this if you have a bitmap LCD display */ | 1 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 2 | #define HAVE_LCD_BITMAP 1 |
6 | 3 | ||
@@ -19,15 +16,6 @@ | |||
19 | /* Define this if you have a MAS3539F */ | 16 | /* Define this if you have a MAS3539F */ |
20 | #define CONFIG_HWCODEC MAS3539F | 17 | #define CONFIG_HWCODEC MAS3539F |
21 | 18 | ||
22 | /* Define this if you have a LiIon battery */ | ||
23 | /* #define HAVE_LIION */ | ||
24 | |||
25 | /* Define this if you need to power on ATA */ | ||
26 | /* #define NEEDS_ATA_POWER_ON */ | ||
27 | |||
28 | /* Define this if battery voltage can only be measured with ATA powered */ | ||
29 | /* #define NEED_ATA_POWER_BATT_MEASURE */ | ||
30 | |||
31 | /* Define this to the CPU frequency */ | 19 | /* Define this to the CPU frequency */ |
32 | #define CPU_FREQ 12000000 | 20 | #define CPU_FREQ 12000000 |
33 | 21 | ||
@@ -35,7 +23,7 @@ | |||
35 | #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */ | 23 | #define BATTERY_SCALE_FACTOR 4785 /* 4.890V read as 0x3FE */ |
36 | 24 | ||
37 | /* Define this if you control power on PB5 (instead of the OFF button) */ | 25 | /* Define this if you control power on PB5 (instead of the OFF button) */ |
38 | #define HAVE_POWEROFF_ON_PB5 /* don't know yet */ | 26 | #define HAVE_POWEROFF_ON_PB5 |
39 | 27 | ||
40 | /* Offset ( in the firmware file's header ) to the file length */ | 28 | /* Offset ( in the firmware file's header ) to the file length */ |
41 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 29 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
@@ -46,9 +34,6 @@ | |||
46 | /* Offset ( in the firmware file's header ) to the real data */ | 34 | /* Offset ( in the firmware file's header ) to the real data */ |
47 | #define FIRMWARE_OFFSET_FILE_DATA 24 | 35 | #define FIRMWARE_OFFSET_FILE_DATA 24 |
48 | 36 | ||
49 | /* FM recorders can wake up from RTC alarm */ | ||
50 | /* #define HAVE_ALARM_MOD 1 */ | ||
51 | |||
52 | /* How to detect USB */ | 37 | /* How to detect USB */ |
53 | #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */ | 38 | #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */ |
54 | 39 | ||
@@ -56,7 +41,7 @@ | |||
56 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ | 41 | #define USB_ENABLE_ONDIOSTYLE 1 /* with PA5 */ |
57 | 42 | ||
58 | /* The start address index for ROM builds */ | 43 | /* The start address index for ROM builds */ |
59 | #define ROM_START 0x12010 /* don't know yet */ | 44 | #define ROM_START 0x12010 |
60 | 45 | ||
61 | /* Define this if the display is mounted upside down */ | 46 | /* Define this if the display is mounted upside down */ |
62 | #define HAVE_DISPLAY_FLIPPED | 47 | #define HAVE_DISPLAY_FLIPPED |
@@ -73,5 +58,7 @@ | |||
73 | /* Define this to support mounting FAT16 partitions */ | 58 | /* Define this to support mounting FAT16 partitions */ |
74 | #define HAVE_FAT16SUPPORT | 59 | #define HAVE_FAT16SUPPORT |
75 | 60 | ||
76 | #endif /* SIMULATOR */ | 61 | /* Define this if the MAS SIBI line can be controlled via PB8 */ |
62 | #define HAVE_MAS_SIBI_CONTROL | ||
77 | 63 | ||
64 | #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, | |||
937 | 937 | ||
938 | setup_sci0(); | 938 | setup_sci0(); |
939 | 939 | ||
940 | #ifdef HAVE_MAS_SIBI_CONTROL | ||
941 | and_b(~0x01, &PBDRH); /* drive SIBI low */ | ||
942 | and_b(~0x01, &PBIORH); /* output for PB8 */ | ||
943 | #endif | ||
944 | |||
940 | #if CONFIG_HWCODEC == MAS3587F | 945 | #if CONFIG_HWCODEC == MAS3587F |
941 | or_b(0x08, &PAIORH); /* output for /PR */ | 946 | or_b(0x08, &PAIORH); /* output for /PR */ |
942 | init_playback(); | 947 | init_playback(); |