diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 14:43:29 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-13 15:48:31 -0400 |
commit | b94db707fb7a8ace5c8821ea47d85ec48ca48e26 (patch) | |
tree | 9b0128bd96c8765a8e7abdbe9062e6bcd397da69 /firmware/target/arm | |
parent | 431caa4311c13a0937ae60ac225e780c0a0670b9 (diff) | |
download | rockbox-b94db707fb7a8ace5c8821ea47d85ec48ca48e26.tar.gz rockbox-b94db707fb7a8ace5c8821ea47d85ec48ca48e26.zip |
Fix more warnings.
Change-Id: Ib3a9fc622a46b1fc72e94dcbc6d29d2e430cd81b
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/pbell/vibe500/button-vibe500.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/samsung/button-yh82x_yh92x.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/usb-drv-arc.c | 6 |
3 files changed, 11 insertions, 1 deletions
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) | |||
97 | int buttons = int_btn; | 97 | int buttons = int_btn; |
98 | unsigned char state; | 98 | unsigned char state; |
99 | static bool hold_button = false; | 99 | static bool hold_button = false; |
100 | #ifndef BOOTLOADER | ||
100 | bool hold_button_old; | 101 | bool hold_button_old; |
101 | 102 | ||
102 | hold_button_old = hold_button; | 103 | hold_button_old = hold_button; |
104 | #endif | ||
103 | hold_button = button_hold(); | 105 | hold_button = button_hold(); |
104 | 106 | ||
105 | #ifndef BOOTLOADER | 107 | #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) | |||
103 | int btn = BUTTON_NONE; | 103 | int btn = BUTTON_NONE; |
104 | #endif /* (SAMSUNG_YH920) || (SAMSUNG_YH925) */ | 104 | #endif /* (SAMSUNG_YH920) || (SAMSUNG_YH925) */ |
105 | static bool hold_button = false; | 105 | static bool hold_button = false; |
106 | #ifndef BOOTLOADER | ||
106 | bool hold_button_old; | 107 | bool hold_button_old; |
108 | #endif | ||
107 | 109 | ||
108 | /* Hold */ | 110 | /* Hold */ |
111 | #ifndef BOOTLOADER | ||
109 | hold_button_old = hold_button; | 112 | hold_button_old = hold_button; |
113 | #endif | ||
110 | hold_button = button_hold(); | 114 | hold_button = button_hold(); |
111 | 115 | ||
112 | #ifndef BOOTLOADER | 116 | #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] | |||
352 | static struct semaphore transfer_completion_signal[USB_NUM_ENDPOINTS*2] | 352 | static struct semaphore transfer_completion_signal[USB_NUM_ENDPOINTS*2] |
353 | SHAREDBSS_ATTR; | 353 | SHAREDBSS_ATTR; |
354 | 354 | ||
355 | static const unsigned int pipe2mask[] = { | 355 | static const unsigned int pipe2mask[USB_NUM_ENDPOINTS*2] = { |
356 | 0x01, 0x010000, | 356 | 0x01, 0x010000, |
357 | 0x02, 0x020000, | 357 | 0x02, 0x020000, |
358 | 0x04, 0x040000, | 358 | 0x04, 0x040000, |
359 | #if USB_NUM_ENDPOINTS > 3 | ||
359 | 0x08, 0x080000, | 360 | 0x08, 0x080000, |
361 | #endif | ||
362 | #if USB_NUM_ENDPOINTS > 4 | ||
360 | 0x10, 0x100000, | 363 | 0x10, 0x100000, |
364 | #endif | ||
361 | }; | 365 | }; |
362 | 366 | ||
363 | /*-------------------------------------------------------------------------*/ | 367 | /*-------------------------------------------------------------------------*/ |