tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
fork atom

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

Bertrik Sikken a12894c6 eb66b559

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