diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-09 09:22:22 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-09 13:24:14 +0000 |
| commit | 65a91333efb55e3db7b275eb28f0d93d00ffe273 (patch) | |
| tree | 107a18cf74754773ffc83b8347249a1c3affb4c7 | |
| parent | 5d8a1a305d3e80cf57f38d4206f2efc801e14d73 (diff) | |
| download | rockbox-65a91333efb55e3db7b275eb28f0d93d00ffe273.tar.gz rockbox-65a91333efb55e3db7b275eb28f0d93d00ffe273.zip | |
FS#12082: Add Tuner support to the Nano2G (Bertrik Sikken)
(The serial portions of the patch were already present, this just pulls
in the tuner enablements)
Change-Id: I8090e318f34835769ac0a56d7a48b9250631eb4f
| -rw-r--r-- | firmware/export/config/ipodnano2g.h | 8 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8700/adc-target.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h index 9d8c39ef7e..0693cedc14 100644 --- a/firmware/export/config/ipodnano2g.h +++ b/firmware/export/config/ipodnano2g.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | /* Define bitmask of input sources - recordable bitmask can be defined | 15 | /* Define bitmask of input sources - recordable bitmask can be defined |
| 16 | explicitly if different */ | 16 | explicitly if different */ |
| 17 | #define INPUT_SRC_CAPS (SRC_CAP_LINEIN) | 17 | #define INPUT_SRC_CAPS (SRC_CAP_LINEIN|SRC_CAP_FMRADIO) |
| 18 | 18 | ||
| 19 | /* define the bitmask of hardware sample rates */ | 19 | /* define the bitmask of hardware sample rates */ |
| 20 | #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11 \ | 20 | #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11 \ |
| @@ -162,9 +162,9 @@ | |||
| 162 | //#define HAVE_LCD_CONTRAST | 162 | //#define HAVE_LCD_CONTRAST |
| 163 | 163 | ||
| 164 | /* Define Apple remote tuner */ | 164 | /* Define Apple remote tuner */ |
| 165 | //#define CONFIG_TUNER IPOD_REMOTE_TUNER | 165 | #define CONFIG_TUNER IPOD_REMOTE_TUNER |
| 166 | //#define HAVE_RDS_CAP | 166 | #define HAVE_RDS_CAP |
| 167 | //#define CONFIG_RDS RDS_CFG_PUSH | 167 | #define CONFIG_RDS RDS_CFG_PUSH |
| 168 | 168 | ||
| 169 | /* The exact type of CPU */ | 169 | /* The exact type of CPU */ |
| 170 | #define CONFIG_CPU S5L8701 | 170 | #define CONFIG_CPU S5L8701 |
diff --git a/firmware/target/arm/s5l8700/adc-target.h b/firmware/target/arm/s5l8700/adc-target.h index b54d1bf4cc..0fb8bf52de 100644 --- a/firmware/target/arm/s5l8700/adc-target.h +++ b/firmware/target/arm/s5l8700/adc-target.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #define ADC_UNKNOWN_0 0 | 26 | #define ADC_UNKNOWN_0 0 |
| 27 | #define ADC_UNKNOWN_1 1 | 27 | #define ADC_UNKNOWN_1 1 |
| 28 | #define ADC_BATTERY 2 | 28 | #define ADC_BATTERY 2 |
| 29 | #define ADC_UNKNOWN_3 3 | 29 | #define ADC_ACCESSORY 3 /* Complete Guess */ |
| 30 | 30 | ||
| 31 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ | 31 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ |
| 32 | 32 | ||