[include] move some high level lk includes into lk/ prefixed namespace

This moves a lot of simple headers out of the top level of the namespace
under lk/.

Will affect potentially a lot of downstream code, but the fixup is very
easy. Just prepend lk/ to the path of the few files that were moved
here.

include/lk/asm.h

@@ -20,14 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __ASM_H
-#define __ASM_H
+#pragma once
 
 #define FUNCTION(x) .global x; .type x,STT_FUNC; x:
 #define DATA(x) .global x; .type x,STT_OBJECT; x:
 
 #define LOCAL_FUNCTION(x) .type x,STT_FUNC; x:
 #define LOCAL_DATA(x) .type x,STT_OBJECT; x:
-
-#endif
-

include/lk/bits.h

@@ -20,11 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __BITS_H
-#define __BITS_H
+#pragma once
 
-#include <compiler.h>
 #include <arch/ops.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
@@ -89,5 +88,3 @@ static inline int bitmap_ffz(unsigned long *bitmap, int numbits)
 }
 
 __END_CDECLS
-
-#endif

include/lk/compiler.h

@@ -20,8 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __COMPILER_H
-#define __COMPILER_H
+#pragma once
 
 #ifndef __ASSEMBLY__
 
@@ -166,5 +165,3 @@
 #define __BEGIN_CDECLS
 #define __END_CDECLS
 #endif
-
-#endif

include/lk/debug.h

@@ -22,9 +22,9 @@
  */
 #pragma once
 
+#include <lk/compiler.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <compiler.h>
 #include <platform/debug.h>
 
 #if !defined(LK_DEBUGLEVEL)

include/lk/err.h

@@ -20,8 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __ERR_H
-#define __ERR_H
+#pragma once
 
 #ifndef ASSEMBLY
 #include <sys/types.h> // for status_t
@@ -74,5 +73,3 @@
 #define ERR_PARTIAL_WRITE       (-44)
 
 #define ERR_USER_BASE           (-16384)
-
-#endif

include/lk/list.h

@@ -20,10 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __LIST_H
-#define __LIST_H
+#pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stddef.h>
 #include <stdbool.h>
 
@@ -283,5 +282,3 @@ static inline size_t list_length(struct list_node *list)
 }
 
 __END_CDECLS
-
-#endif

include/lk/main.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <compiler.h>
-#include <sys/types.h>
-
-
-void lk_main(ulong arg0, ulong arg1, ulong arg2, ulong arg3) __NO_RETURN __EXTERNALLY_VISIBLE;
-void lk_secondary_cpu_entry(void);
-void lk_init_secondary_cpus(uint secondary_cpu_count);

include/lk/pow2.h

@@ -20,13 +20,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __POW2_H
-#define __POW2_H
+#pragma once
 
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <compiler.h>
 
 __BEGIN_CDECLS
 
@@ -73,6 +72,3 @@ static inline __ALWAYS_INLINE uint32_t round_up_pow2_u32(uint32_t v)
     return v;
 }
 __END_CDECLS
-
-#endif
-

include/lk/reg.h

@@ -20,8 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __REG_H
-#define __REG_H
+#pragma once
 
 #include <stdint.h>
 
@@ -40,5 +39,3 @@
 #define readl(a) (*REG32(a))
 #define writeb(v, a) (*REG8(a) = (v))
 #define readb(a) (*REG8(a))
-
-#endif

include/lk/trace.h

@@ -20,8 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __TRACE_H
-#define __TRACE_H
+#pragma once
 
 #include <stdio.h>
 
@@ -39,5 +38,3 @@
 #define LTRACE do { if (LOCAL_TRACE) { TRACE; } } while (0)
 #define LTRACEF(x...) do { if (LOCAL_TRACE) { TRACEF(x); } } while (0)
 #define LTRACEF_LEVEL(level, x...) do { if (LOCAL_TRACE >= (level)) { TRACEF(x); } } while (0)
-
-#endif

top/include/lk/init.h

@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 
 /*

top/include/lk/main.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2008 Travis Geiselbrecht
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <lk/compiler.h>
+#include <sys/types.h>
+
+
+void lk_main(ulong arg0, ulong arg1, ulong arg2, ulong arg3) __NO_RETURN __EXTERNALLY_VISIBLE;
+void lk_secondary_cpu_entry(void);
+void lk_init_secondary_cpus(uint secondary_cpu_count);