From 3699e45942f1e86ead97d18d93177c56aef5c979 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <travisg@gmail.com>
Date: Wed, 19 Jun 2019 22:44:15 -0700
Subject: [PATCH] [include][lib] move most of the dangling top level
 include/lib/.h files into their lib

Only remaining one is console.h which is a little funny and will need to
be dealt with separately.
---
 kernel/thread.c                                      | 1 -
 lib/bio/debug.c                                      | 4 +++-
 {include => lib/bytes/include}/lib/bytes.h           | 0
 {include => lib/dpc/include}/lib/dpc.h               | 0
 {include => lib/evlog/include}/lib/evlog.h           | 0
 {include => lib/font/include}/lib/font.h             | 0
 {include => lib/gfx/include}/lib/gfx.h               | 0
 {include => lib/gfxconsole/include}/lib/gfxconsole.h | 0
 {include => lib/heap/include}/lib/page_alloc.h       | 0
 {include => lib/partition/include}/lib/partition.h   | 0
 {include => lib/ptable/include}/lib/ptable.h         | 0
 {include => lib/sysparam/include}/lib/sysparam.h     | 0
 {include => lib/text/include}/lib/text.h             | 0
 platform/stm32f7xx/eth.c                             | 2 --
 14 files changed, 3 insertions(+), 4 deletions(-)
 rename {include => lib/bytes/include}/lib/bytes.h (100%)
 rename {include => lib/dpc/include}/lib/dpc.h (100%)
 rename {include => lib/evlog/include}/lib/evlog.h (100%)
 rename {include => lib/font/include}/lib/font.h (100%)
 rename {include => lib/gfx/include}/lib/gfx.h (100%)
 rename {include => lib/gfxconsole/include}/lib/gfxconsole.h (100%)
 rename {include => lib/heap/include}/lib/page_alloc.h (100%)
 rename {include => lib/partition/include}/lib/partition.h (100%)
 rename {include => lib/ptable/include}/lib/ptable.h (100%)
 rename {include => lib/sysparam/include}/lib/sysparam.h (100%)
 rename {include => lib/text/include}/lib/text.h (100%)

diff --git a/kernel/thread.c b/kernel/thread.c
index 7e48ecc0..d50e019b 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <printf.h>
 #include <lk/err.h>
-#include <lib/dpc.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
 #include <kernel/debug.h>
diff --git a/lib/bio/debug.c b/lib/bio/debug.c
index c06df7f1..e2dfb281 100644
--- a/lib/bio/debug.c
+++ b/lib/bio/debug.c
@@ -28,13 +28,15 @@
 #include <lk/err.h>
 #include <lib/console.h>
 #include <lib/bio.h>
-#include <lib/partition.h>
 #include <platform.h>
 #include <kernel/thread.h>
 
 #if WITH_LIB_CKSUM
 #include <lib/cksum.h>
 #endif
+#if WITH_LIB_PARTITION
+#include <lib/partition.h>
+#endif
 
 #define DMA_ALIGNMENT (CACHE_LINE)
 #define THREE_BYTE_ADDR_BOUNDARY (16777216)
diff --git a/include/lib/bytes.h b/lib/bytes/include/lib/bytes.h
similarity index 100%
rename from include/lib/bytes.h
rename to lib/bytes/include/lib/bytes.h
diff --git a/include/lib/dpc.h b/lib/dpc/include/lib/dpc.h
similarity index 100%
rename from include/lib/dpc.h
rename to lib/dpc/include/lib/dpc.h
diff --git a/include/lib/evlog.h b/lib/evlog/include/lib/evlog.h
similarity index 100%
rename from include/lib/evlog.h
rename to lib/evlog/include/lib/evlog.h
diff --git a/include/lib/font.h b/lib/font/include/lib/font.h
similarity index 100%
rename from include/lib/font.h
rename to lib/font/include/lib/font.h
diff --git a/include/lib/gfx.h b/lib/gfx/include/lib/gfx.h
similarity index 100%
rename from include/lib/gfx.h
rename to lib/gfx/include/lib/gfx.h
diff --git a/include/lib/gfxconsole.h b/lib/gfxconsole/include/lib/gfxconsole.h
similarity index 100%
rename from include/lib/gfxconsole.h
rename to lib/gfxconsole/include/lib/gfxconsole.h
diff --git a/include/lib/page_alloc.h b/lib/heap/include/lib/page_alloc.h
similarity index 100%
rename from include/lib/page_alloc.h
rename to lib/heap/include/lib/page_alloc.h
diff --git a/include/lib/partition.h b/lib/partition/include/lib/partition.h
similarity index 100%
rename from include/lib/partition.h
rename to lib/partition/include/lib/partition.h
diff --git a/include/lib/ptable.h b/lib/ptable/include/lib/ptable.h
similarity index 100%
rename from include/lib/ptable.h
rename to lib/ptable/include/lib/ptable.h
diff --git a/include/lib/sysparam.h b/lib/sysparam/include/lib/sysparam.h
similarity index 100%
rename from include/lib/sysparam.h
rename to lib/sysparam/include/lib/sysparam.h
diff --git a/include/lib/text.h b/lib/text/include/lib/text.h
similarity index 100%
rename from include/lib/text.h
rename to lib/text/include/lib/text.h
diff --git a/platform/stm32f7xx/eth.c b/platform/stm32f7xx/eth.c
index a37abc5c..eadf21b4 100644
--- a/platform/stm32f7xx/eth.c
+++ b/platform/stm32f7xx/eth.c
@@ -56,9 +56,7 @@
 #include <lk/compiler.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lib/gfx.h>
 #include <dev/gpio.h>
-#include <dev/display.h>
 #include <kernel/event.h>
 #include <kernel/thread.h>
 #include <arch/ops.h>