josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate _delay_ms(). 

Lots of duplicate stuff in delay.c/.h ...
This commit is contained in:
Markus Hitter 2013-03-19 20:26:47 +01:00
parent 2ebfd44530
commit 1114761bed
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
delay.c
View File

@ -36,7 +36,7 @@ void _delay(uint32_t delay) {
/// delay milliseconds /// delay milliseconds
/// \param delay time to wait in milliseconds /// \param delay time to wait in milliseconds
void _delay_ms(uint32_t delay) { void delay_ms(uint32_t delay) {
wd_reset(); wd_reset();
while (delay > 65) { while (delay > 65) {
delay_us(64999); delay_us(64999);

12
delay.h
View File

@ -16,7 +16,7 @@ void delay_us(uint16_t delay);
void _delay(uint32_t delay); void _delay(uint32_t delay);
// millisecond delay, does reset WDT if feature enabled // millisecond delay, does reset WDT if feature enabled
void _delay_ms(uint32_t delay); void delay_ms(uint32_t delay);
// microsecond timer, does reset WDT if feature enabled // microsecond timer, does reset WDT if feature enabled
@ -36,14 +36,4 @@ inline void delay(uint32_t d) {
} }
} }
// millisecond timer, does reset WDT if feature enabled
// 0 results in no real delay, but the watchdog
// reset is called if the feature is enabled
static void delay_ms(uint32_t) __attribute__ ((always_inline));
inline void delay_ms(uint32_t d) {
if (d > 65)
_delay_ms(d);
else
delay(d * 1000);
}
#endif /* _DELAY_H */ #endif /* _DELAY_H */

2
pinio.c
View File

@ -12,7 +12,7 @@ void power_on() {
#ifdef PS_ON_PIN #ifdef PS_ON_PIN
WRITE(PS_ON_PIN, 0); WRITE(PS_ON_PIN, 0);
SET_OUTPUT(PS_ON_PIN); SET_OUTPUT(PS_ON_PIN);
_delay_ms(500); delay_ms(500);
#endif #endif
ps_is_on = 1; ps_is_on = 1;
} }