Skip to content

Commit c49ac9c

Browse files
committed
Update Botan to new release
1 parent 3053397 commit c49ac9c

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmake/botan.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
include(ExternalProject)
55

66
if(${ARCH} STREQUAL "x86_64")
7-
set(BOTAN_HASH 7432fa529d86070317f594dddb07944f)
7+
set(BOTAN_HASH fb698d0f5c9497b7029c9573888c22c8)
88
elseif(${ARCH} STREQUAL "i686")
9-
set(BOTAN_HASH 5ef7f26047f8fe17219f62755938621d)
9+
set(BOTAN_HASH c22686843461d58a5ac15da7fab18e21)
1010
endif()
1111

1212
ExternalProject_Add(botan
1313
PREFIX botan
14-
URL https://github.com/includeos/botan/releases/download/inc-2.0/botan-includeos-${ARCH}.tar.gz
14+
URL https://github.com/fwsgonzo/botan/releases/download/v0.11/botan-includeos-${ARCH}.tar.gz
1515
URL_HASH MD5=${BOTAN_HASH}
1616
CONFIGURE_COMMAND ""
1717
BUILD_COMMAND ""

src/kernel/os.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ void OS::halt() {
251251
#warning "OS::halt() not implemented for selected arch"
252252
#endif
253253
// Count sleep cycles
254-
*os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
254+
if (os_cycles_hlt)
255+
*os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
255256
}
256257

257258
void OS::event_loop()
258259
{
259-
260260
IRQ_manager::get().process_interrupts();
261261
do {
262262
OS::halt();

0 commit comments

Comments
 (0)