forked from len0rd/rockbox
Fix more warnings.
Change-Id: Ib3a9fc622a46b1fc72e94dcbc6d29d2e430cd81b
This commit is contained in:
parent
431caa4311
commit
b94db707fb
11 changed files with 41 additions and 19 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue