diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-07 08:40:14 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-07 08:40:14 -0600 |
| commit | f6f54d70b768dca1715ddddea64a4df00d82b09e (patch) | |
| tree | 7d38769a1ffe092bc7ac062fb0355f5532e4c016 /src/core/ao_cmd.c | |
| parent | 1c344b760776cd5d8c0297d8db9bf02687381b4e (diff) | |
| parent | 0d10e25766b96f5660e213115cf27b71ff164405 (diff) | |
Merge remote-tracking branch 'uniarch/master' into multiarch
Conflicts:
src/core/ao_cmd.c
Use ao_arch_reboot after waiting for a second
Diffstat (limited to 'src/core/ao_cmd.c')
| -rw-r--r-- | src/core/ao_cmd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c index d0a46633..2b64b8ca 100644 --- a/src/core/ao_cmd.c +++ b/src/core/ao_cmd.c @@ -227,6 +227,12 @@ ao_reboot(void) ao_cmd_white(); if (!ao_match_word("eboot")) return; + /* Delay waiting for the packet master to be turned off + * so that we don't end up back in idle mode because we + * received a packet after boot. + */ + flush(); + ao_delay(AO_SEC_TO_TICKS(1)); ao_arch_reboot(); ao_panic(AO_PANIC_REBOOT); } |