6 files changed, 28 insertions, 11 deletions
diff --git a/02-usart/tests/test_dma.c b/02-usart/tests/test_dma.c
index ce0c4ba..50cdb5b 100644
--- a/02-usart/tests/test_dma.c
+++ b/02-usart/tests/test_dma.c
@@ -1,8 +1,8 @@
 #include "test_harness.h"
-#include "core/dma.h"
-#include "core/rcc.h"
-#include "core/usart.h"
-#include "peri/dma.h"
+#include "arch/stm32l4xxx/peripherals/dma.h"
+#include "arch/stm32l4xxx/peripherals/rcc.h"
+#include "arch/stm32l4xxx/peripherals/usart.h"
+#include "kern/dma/dma_manager.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,6 +18,7 @@ TEST(dma, smoke)
 
   regset(dma->is_r, dma_htif7, 1);
   ASSERT_EQ(dma->is_r, 67108866);
+  return 0;
 }
 
 TEST(dma, cc_regset)
@@ -29,6 +30,7 @@ TEST(dma, cc_regset)
   regset(channel_config->cc_r, dma_cc_msize, DMA_SIZE_32_BITS);
 
   ASSERT_EQ(channel_config->cc_r, 1 << 11);
+  return 0;
 }
 
 TEST(dma, correct_align)
@@ -52,6 +54,7 @@ TEST(dma, regset_pl)
   ASSERT_EQ(
       regget(reg, dma_cc_pl),
       DMA_PRIORITY_LEVEL_MEDIUM);
+  return 0;
 }
 
 TEST(dma_peri, select_peripheral)
@@ -86,6 +89,7 @@ TEST(dma_peri, select_peripheral)
   release_dma_channel(chan.c_);
 
   ASSERT_EQ(regget(RCC.ahb1en_r, rcc_dma1en), 0);
+  return 0;
 }
 
 TEST(dma_peri, unable_to_realloc)
@@ -119,6 +123,7 @@ TEST(dma_peri, unable_to_realloc)
   ASSERT_EQ(ec, 0);
 
   release_dma_channel(chan.c_);
+  return 0;
 }
 
 TEST(dma_peri, select_mem2mem)
@@ -151,6 +156,7 @@ TEST(dma_peri, select_mem2mem)
 
   release_dma_channel(chan2.c_);
   release_dma_channel(chan3.c_);
+  return 0;
 }
 
 TEST(dma_peri, select_mem2mem_2)
@@ -179,4 +185,5 @@ TEST(dma_peri, select_mem2mem_2)
     }
     release_dma_channel(chans[i].c_);
   }
+  return 0;
 }
diff --git a/02-usart/tests/test_irq.c b/02-usart/tests/test_irq.c
index 89eea11..3c4ee9c 100644
--- a/02-usart/tests/test_irq.c
+++ b/02-usart/tests/test_irq.c
@@ -1,7 +1,7 @@
 #include "test_harness.h"
 
-#include "core/irq.h"
-#include "core/nvic.h"
+#include "arch/stm32l4xxx/peripherals/irq.h"
+#include "arch/stm32l4xxx/peripherals/nvic.h"
 
 TEST(irq, nvic)
 {
@@ -14,6 +14,8 @@ TEST(irq, nvic)
 
   ASSERT_EQ(is.irqs[1], 0xC0);
   ASSERT_EQ(NVIC.ise_r[1], 0xC0);
+
+  return 0;
 }
 
 TEST(irq, nvic_edgecase)
@@ -28,10 +30,14 @@ TEST(irq, nvic_edgecase)
   ASSERT_EQ(NVIC.ise_r[0], 1);
   ASSERT_EQ(is.irqs[1], 1);
   ASSERT_EQ(NVIC.ise_r[1], 1);
+
+  return 0;
 }
 
 TEST(irq, enable_single_interrupt)
 {
   enable_interrupt(IRQ_USART2);
   ASSERT_EQ(NVIC.ise_r[1], 0x40);
+
+  return 0;
 }
diff --git a/02-usart/tests/test_lib.c b/02-usart/tests/test_lib.c
index 8d63577..33076c2 100644
--- a/02-usart/tests/test_lib.c
+++ b/02-usart/tests/test_lib.c
@@ -1,5 +1,5 @@
 #include "test_harness.h"
-#include "lib.h"
+#include "kern/lib.h"
 
 TEST(lib, hexify)
 {
@@ -16,4 +16,6 @@ TEST(lib, hexify)
 
   hexify(0xdeadbeef, buf);
   ASSERT_EQ_STR(buf, "DEADBEEF");
+
+  return 0;
 }
diff --git a/02-usart/tests/test_memory.c b/02-usart/tests/test_memory.c
index 1b88ad1..2272f20 100644
--- a/02-usart/tests/test_memory.c
+++ b/02-usart/tests/test_memory.c
@@ -6,8 +6,8 @@
 
 #include "arch.h"
 #include "test_harness.c"
-#include "common.h"
-#include "mem.h"
+#include "kern/common.h"
+#include "kern/mem.h"
 
 extern uint32_t* halloc_start;
 static void wipeout_halloc()
diff --git a/02-usart/tests/test_spi.c b/02-usart/tests/test_spi.c
index d6cc24e..cc25d6e 100644
--- a/02-usart/tests/test_spi.c
+++ b/02-usart/tests/test_spi.c
@@ -1,6 +1,6 @@
 #include "test_harness.h"
 
-#include "core/spi.h"
+#include "arch/stm32l4xxx/peripherals/spi.h"
 
 TEST(spi, smoke)
 {
diff --git a/02-usart/tests/test_usart.c b/02-usart/tests/test_usart.c
index e2cfdf8..b19d687 100644
--- a/02-usart/tests/test_usart.c
+++ b/02-usart/tests/test_usart.c
@@ -1,5 +1,5 @@
 #include "test_harness.h"
-#include "core/usart.h"
+#include "arch/stm32l4xxx/peripherals/usart.h"
 
 #include <stdlib.h>
 
@@ -17,4 +17,6 @@ TEST(usart, enable_dma)
 
   usart_enable_dma(usart, USART_ENABLE_DISABLED);
   ASSERT_EQ(usart->c_r3, 0);
+
+  return 0;
 }