Fix initialization bug in libtapasco

55c48b53 · Jens Korinth · c0dca204 · 55c48b53
Commit 55c48b53 authored May 19, 2017 by Jens Korinth
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

arch/baseline/src/tapasco_address_map.c arch/baseline/src/tapasco_address_map.c +4 -4

No files found.
--- a/arch/baseline/src/tapasco_address_map.c
+++ b/arch/baseline/src/tapasco_address_map.c
@@ -27,14 +27,14 @@

 #define TAPASCO_MAX_INSTANCES			128

-static platform_ctl_addr_t _bases[TAPASCO_MAX_INSTANCES] = { -1 };
+static platform_ctl_addr_t _bases[TAPASCO_MAX_INSTANCES] = { 0 };

 static inline tapasco_reg_addr_t base_addr(uint32_t const slot_id) {
 	assert(slot_id < TAPASCO_MAX_INSTANCES);
 	tapasco_reg_addr_t ret = _bases[slot_id];
-	if (ret == -1)
-		ret = _bases[slot_id] = platform_address_get_slot_base(slot_id, 0);
-	assert(ret != -1);
+	if (! ret)
+		ret = (_bases[slot_id] = platform_address_get_slot_base(slot_id, 0));
+	assert(ret > 0);
 	return ret;
 }