A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

Ensure consistency between header file and implementation for iPod drivers, by #including the appropriate header file and #ifdef'fing out unused code

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

+25 -6
+4
firmware/drivers/audio/wm8731.c
··· 34 34 #include "wmcodec.h" 35 35 #include "audiohw.h" 36 36 #include "i2s.h" 37 + #include "sound.h" 37 38 38 39 const struct sound_settings_info audiohw_settings[] = { 39 40 [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, ··· 236 237 codec_set_active(true); 237 238 } 238 239 240 + #ifdef HAVE_RECORDING 239 241 void audiohw_enable_recording(bool source_mic) 240 242 { 241 243 codec_set_active(false); ··· 331 333 wm8731_write_or(PDCTRL, PDCTRL_LINEINPD); 332 334 } 333 335 } 336 + #endif /* HAVE_RECORDING */ 337 +
+1
firmware/drivers/pcf50605.c
··· 32 32 #endif 33 33 #include "rtc.h" 34 34 #include "pcf5060x.h" 35 + #include "pcf50605.h" 35 36 36 37 unsigned char pcf50605_wakeup_flags = 0; 37 38
+2 -3
firmware/target/arm/audio-pp.c
··· 23 23 #include "audio.h" 24 24 #include "sound.h" 25 25 26 + #if INPUT_SRC_CAPS != 0 26 27 void audio_set_output_source(int source) 27 28 { 28 - #if INPUT_SRC_CAPS != 0 29 29 if ((unsigned)source >= AUDIO_NUM_SOURCES) 30 - #endif 31 30 source = AUDIO_SRC_PLAYBACK; 32 31 } /* audio_set_output_source */ 33 32 ··· 109 108 110 109 last_source = source; 111 110 } /* audio_input_mux */ 112 - 111 + #endif /* INPUT_SRC_CAPS != 0 */ 113 112
+2
firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
··· 23 23 #include "cpu.h" 24 24 #include "hwcompat.h" 25 25 #include "kernel.h" 26 + #include "adc.h" 27 + #include "adc-target.h" 26 28 27 29 static struct mutex adc_mtx SHAREDBSS_ATTR; 28 30
+1
firmware/target/arm/ipod/1g2g/adc-target.h
··· 29 29 30 30 /* Force a scan now */ 31 31 unsigned short adc_scan(int channel); 32 + void ipod_2g_adc_int(void); 32 33 static inline unsigned short adc_read(int channel) 33 34 { 34 35 return adc_scan(channel);
+2 -1
firmware/target/arm/ipod/1g2g/backlight-1g2g.c
··· 20 20 ****************************************************************************/ 21 21 #include "config.h" 22 22 #include "system.h" 23 + #include "lcd.h" 23 24 #include "backlight.h" 24 - #include "lcd.h" 25 + #include "backlight-target.h" 25 26 26 27 void _backlight_on(void) 27 28 {
+1
firmware/target/arm/ipod/3g/backlight-3g.c
··· 21 21 #include "config.h" 22 22 #include "system.h" 23 23 #include "backlight.h" 24 + #include "backlight-target.h" 24 25 25 26 void _backlight_on(void) 26 27 {
+1
firmware/target/arm/ipod/backlight-4g_color.c
··· 32 32 #include "button.h" 33 33 #include "timer.h" 34 34 #include "backlight.h" 35 + #include "backlight-target.h" 35 36 36 37 void _backlight_on(void) 37 38 {
+1
firmware/target/arm/ipod/backlight-mini1g_mini2g.c
··· 32 32 #include "button.h" 33 33 #include "timer.h" 34 34 #include "backlight.h" 35 + #include "backlight-target.h" 35 36 36 37 void _backlight_hw_on(void) 37 38 {
+1
firmware/target/arm/ipod/backlight-nano_video.c
··· 32 32 #include "button.h" 33 33 #include "timer.h" 34 34 #include "backlight.h" 35 + #include "backlight-target.h" 35 36 36 37 static int brightness = 1; /* 1 to 32 */ 37 38 static int current_dim = 16; /* default after enabling the backlight dimmer */
+1
firmware/target/arm/ipod/button-target.h
··· 31 31 int button_read_device(void); 32 32 33 33 void ipod_mini_button_int(void); 34 + void ipod_3g_button_int(void); 34 35 void ipod_4g_button_int(void); 35 36 36 37 /* iPod specific button codes */
+2
firmware/target/arm/ipod/lcd-gray.c
··· 239 239 #endif 240 240 } 241 241 242 + #ifdef HAVE_LCD_ENABLE 242 243 void lcd_enable(bool on) 243 244 { 244 245 if (on) ··· 257 258 /* enter standby mode */ 258 259 } 259 260 } 261 + #endif /* HAVE_LCD_ENABLE */ 260 262 261 263 /*** update functions ***/ 262 264
+2
firmware/target/arm/ipod/power-ipod.c
··· 42 42 #endif 43 43 } 44 44 45 + #if CONFIG_CHARGING 45 46 bool charger_inserted(void) 46 47 { 47 48 #if defined(IPOD_VIDEO) ··· 60 61 bool charging_state(void) { 61 62 return (GPIOB_INPUT_VAL & 0x01)?false:true; 62 63 } 64 + #endif /* CONFIG_CHARGING */ 63 65 64 66 65 67 void ide_power_enable(bool on)
+3 -2
firmware/target/arm/system-pp5002.c
··· 21 21 #include "system.h" 22 22 23 23 #ifndef BOOTLOADER 24 + #include "adc-target.h" 25 + #include "button-target.h" 26 + 24 27 extern void TIMER1(void); 25 28 extern void TIMER2(void); 26 - extern void ipod_3g_button_int(void); 27 - extern void ipod_2g_adc_int(void); 28 29 29 30 void irq(void) 30 31 {
+1
firmware/target/arm/wmcodec-pp.c
··· 29 29 #include "system.h" 30 30 #include "audiohw.h" 31 31 #include "i2c-pp.h" 32 + #include "wmcodec.h" 32 33 33 34 #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) 34 35 /* The H10's audio codec uses an I2C address of 0x1b */