From b94db707fb7a8ace5c8821ea47d85ec48ca48e26 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 13 Oct 2020 14:43:29 -0400 Subject: [PATCH] Fix more warnings. Change-Id: Ib3a9fc622a46b1fc72e94dcbc6d29d2e430cd81b --- apps/plugins/iriver_flash.c | 4 ++-- bootloader/ipod6g.c | 8 ++++---- firmware/drivers/rtc/rtc_e8564.c | 2 +- firmware/target/arm/pbell/vibe500/button-vibe500.c | 2 ++ firmware/target/arm/samsung/button-yh82x_yh92x.c | 4 ++++ firmware/target/arm/usb-drv-arc.c | 6 +++++- firmware/target/coldfire/iaudio/m3/button-m3.c | 4 ---- firmware/target/coldfire/iriver/h100/button-h100.c | 11 ++++++++--- firmware/target/coldfire/iriver/h300/button-h300.c | 9 +++++++-- firmware/target/coldfire/mpio/ata-mpio.c | 4 +++- firmware/target/coldfire/mpio/hd200/button-hd200.c | 6 +++++- 11 files changed, 41 insertions(+), 19 deletions(-) diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index 2e27a9f748..562a680a60 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c @@ -334,7 +334,7 @@ static int get_section_address(int section) int flash_rockbox(const char *filename, int section) { struct flash_header hdr; - int pos, i, len, rc; + int pos, i, len/*, rc */; unsigned long checksum, sum; unsigned char *p8; uint16_t *p16; @@ -390,7 +390,7 @@ int flash_rockbox(const char *filename, int section) rb->lcd_putsf(0, 3, "Erasing... %d%%", (i+SEC_SIZE)*100/len); rb->lcd_update(); - rc = cfi_erase_sector(FB + (i + pos)/2); + /*rc = */cfi_erase_sector(FB + (i + pos)/2); } /* Write the magic and size. */ diff --git a/bootloader/ipod6g.c b/bootloader/ipod6g.c index 0d0a4c53d1..30db29c783 100644 --- a/bootloader/ipod6g.c +++ b/bootloader/ipod6g.c @@ -326,7 +326,7 @@ static bool pmu_is_hibernated(void) */ void main(void) { - int fw = FW_ROCKBOX; +// int fw = FW_ROCKBOX; int rc = 0; unsigned char *loadbuffer; int (*kernel_entry)(void); @@ -337,7 +337,7 @@ void main(void) i2c_preinit(0); if (pmu_is_hibernated()) { - fw = FW_APPLE; +// fw = FW_APPLE; rc = launch_onb(1); /* 27/2 = 13.5 MHz. */ } @@ -375,7 +375,7 @@ void main(void) if ((btn == BUTTON_MENU) || (btn == (BUTTON_SELECT|BUTTON_LEFT)) || (btn == (BUTTON_SELECT|BUTTON_PLAY))) { - fw = FW_APPLE; +// fw = FW_APPLE; rc = kernel_launch_onb(); } } @@ -410,7 +410,7 @@ void main(void) /* We wait until HDD spins up to check for hold button */ if (button_hold()) { - fw = FW_APPLE; +// fw = FW_APPLE; printf("Executing OF..."); ata_sleepnow(); rc = kernel_launch_onb(); diff --git a/firmware/drivers/rtc/rtc_e8564.c b/firmware/drivers/rtc/rtc_e8564.c index ee2449ffb8..4bb61410db 100644 --- a/firmware/drivers/rtc/rtc_e8564.c +++ b/firmware/drivers/rtc/rtc_e8564.c @@ -226,7 +226,7 @@ bool rtc_check_alarm_flag(void) /* read Control 2 register which contains alarm flag */ rv = i2c_readbytes(RTC_ADDR, RTC_CTRL2, 1, &tmp); - + (void)rv; return (tmp & RTC_AF); } #endif /* HAVE_RTC_ALARM */ diff --git a/firmware/target/arm/pbell/vibe500/button-vibe500.c b/firmware/target/arm/pbell/vibe500/button-vibe500.c index 9afc9eecab..1279e86725 100644 --- a/firmware/target/arm/pbell/vibe500/button-vibe500.c +++ b/firmware/target/arm/pbell/vibe500/button-vibe500.c @@ -97,9 +97,11 @@ int button_read_device(void) int buttons = int_btn; unsigned char state; static bool hold_button = false; +#ifndef BOOTLOADER bool hold_button_old; hold_button_old = hold_button; +#endif hold_button = button_hold(); #ifndef BOOTLOADER diff --git a/firmware/target/arm/samsung/button-yh82x_yh92x.c b/firmware/target/arm/samsung/button-yh82x_yh92x.c index ff8a580d2a..7d0f390644 100644 --- a/firmware/target/arm/samsung/button-yh82x_yh92x.c +++ b/firmware/target/arm/samsung/button-yh82x_yh92x.c @@ -103,10 +103,14 @@ int button_read_device(void) int btn = BUTTON_NONE; #endif /* (SAMSUNG_YH920) || (SAMSUNG_YH925) */ static bool hold_button = false; +#ifndef BOOTLOADER bool hold_button_old; +#endif /* Hold */ +#ifndef BOOTLOADER hold_button_old = hold_button; +#endif hold_button = button_hold(); #ifndef BOOTLOADER diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index 44d006b30f..b19b635923 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c @@ -352,12 +352,16 @@ static struct queue_head qh_array[USB_NUM_ENDPOINTS*2] static struct semaphore transfer_completion_signal[USB_NUM_ENDPOINTS*2] SHAREDBSS_ATTR; -static const unsigned int pipe2mask[] = { +static const unsigned int pipe2mask[USB_NUM_ENDPOINTS*2] = { 0x01, 0x010000, 0x02, 0x020000, 0x04, 0x040000, +#if USB_NUM_ENDPOINTS > 3 0x08, 0x080000, +#endif +#if USB_NUM_ENDPOINTS > 4 0x10, 0x100000, +#endif }; /*-------------------------------------------------------------------------*/ diff --git a/firmware/target/coldfire/iaudio/m3/button-m3.c b/firmware/target/coldfire/iaudio/m3/button-m3.c index 53d02ec449..1c7f4a15de 100644 --- a/firmware/target/coldfire/iaudio/m3/button-m3.c +++ b/firmware/target/coldfire/iaudio/m3/button-m3.c @@ -50,15 +50,11 @@ int button_read_device(void) { int btn = BUTTON_NONE; #ifndef BOOTLOADER - bool hold_button_old; bool remote_hold_button_old; #endif int data; /* normal buttons */ -#ifndef BOOTLOADER - hold_button_old = hold_button; -#endif hold_button = button_hold(); if (!hold_button) diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c index dbaefdcf2a..63f772b65e 100644 --- a/firmware/target/coldfire/iriver/h100/button-h100.c +++ b/firmware/target/coldfire/iriver/h100/button-h100.c @@ -40,7 +40,7 @@ bool button_hold(void) } static bool remote_button_hold_only(void) -{ +{ if(remote_type() == REMOTETYPE_H300_NONLCD) return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ else @@ -68,14 +68,17 @@ int button_read_device(void) static bool remote_hold_button = false; static int prev_data = 0xff; static int last_valid = 0xff; +#ifndef BOOTLOADER bool hold_button_old; bool remote_hold_button_old; +#endif /* normal buttons */ +#ifndef BOOTLOADER hold_button_old = hold_button; +#endif hold_button = button_hold(); - - + #ifndef BOOTLOADER if (hold_button != hold_button_old) backlight_hold_changed(hold_button); @@ -120,7 +123,9 @@ int button_read_device(void) } /* remote buttons */ +#ifndef BOOTLOADER remote_hold_button_old = remote_hold_button; +#endif remote_hold_button = remote_button_hold_only(); #ifndef BOOTLOADER diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c index 74c14fb144..437c9fd2d3 100644 --- a/firmware/target/coldfire/iriver/h300/button-h300.c +++ b/firmware/target/coldfire/iriver/h300/button-h300.c @@ -84,14 +84,17 @@ int button_read_device(void) static bool remote_hold_button = false; static int prev_data = 0xff; static int last_valid = 0xff; +#ifndef BOOTLOADER bool hold_button_old; bool remote_hold_button_old; +#endif /* normal buttons */ +#ifndef BOOTLOADER hold_button_old = hold_button; +#endif hold_button = button_hold(); - - + #ifndef BOOTLOADER if (hold_button != hold_button_old) backlight_hold_changed(hold_button); @@ -130,7 +133,9 @@ int button_read_device(void) } /* remote buttons */ +#ifndef BOOTLOADER remote_hold_button_old = remote_hold_button; +#endif remote_hold_button = remote_button_hold_only(); #ifndef BOOTLOADER diff --git a/firmware/target/coldfire/mpio/ata-mpio.c b/firmware/target/coldfire/mpio/ata-mpio.c index af082640bf..94a572a0e8 100644 --- a/firmware/target/coldfire/mpio/ata-mpio.c +++ b/firmware/target/coldfire/mpio/ata-mpio.c @@ -39,7 +39,9 @@ void ata_reset(void) void ata_enable(bool on) { +#ifndef BOOTLOADER static bool init = true; +#endif /* Ide power toggling is a nasty hack to allow USB bridge operation * in rockbox. For some reason GL811E bridge doesn't like the state @@ -59,8 +61,8 @@ void ata_enable(bool on) sleep(1); ide_power_enable(true); } -#endif init = false; +#endif } else { diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c index 27b0d50fb5..5ff70783cd 100644 --- a/firmware/target/coldfire/mpio/hd200/button-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c @@ -69,17 +69,21 @@ int button_read_device(void) static bool hold_button = false; bool remote_hold_button = false; +#ifndef BOOTLOADER bool hold_button_old; +#endif bool remote_present; /* check if we have remote connected */ remote_present = remote_detect(); /* read hold buttons status */ +#ifndef BOOTLOADER hold_button_old = hold_button; +#endif hold_button = button_hold(); remote_hold_button = remote_button_hold(); - + #ifndef BOOTLOADER /* Only main hold affects backlight */ if (hold_button != hold_button_old)