Skip to content

Commit a2c91d0

Browse files
authored
Merge pull request #1408 from ricarkol/solo5-reorder-timers-ready
solo5: don't call timers::ready before initializing devices
2 parents 0b62d70 + f943baa commit a2c91d0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/platform/x86_solo5/os.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ void OS::start(char* _cmdline, uintptr_t mem_size)
168168
}
169169
}
170170

171+
Solo5_manager::init();
172+
171173
// We don't need a start or stop function in solo5.
172174
Timers::init(
173175
// timer start function
@@ -190,8 +192,6 @@ void OS::start(char* _cmdline, uintptr_t mem_size)
190192
printf(" +--> Running [ %s ]\n", Service::name().c_str());
191193
FILLINE('~');
192194

193-
Solo5_manager::init();
194-
195195
Service::start();
196196
// NOTE: this is a feature for service writers, don't move!
197197
kernel_sanity_checks();

0 commit comments

Comments
 (0)