Cleaned up headers

c8_remote/lib/CMakeLists.txt

@@ -37,7 +37,7 @@ add_custom_command(TARGET       payload POST_BUILD
                     BYPRODUCTS  ${CMAKE_SOURCE_DIR}/c8_remote/include/libpayload.h
                     COMMAND     python3 ${CMAKE_CURRENT_LIST_DIR}/scripts/headerize.py
                                         ${CMAKE_CURRENT_BINARY_DIR}/lib_cfiles
-                                        ${CMAKE_SOURCE_DIR}/c8_remote/include)
+                                        ${CMAKE_SOURCE_DIR}/c8_remote/include/tool)
 
 add_library(experiments experiments/aes_sw.c
                         experiments/system.c

c8_remote/lib/crypto/aes_sw_host.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bootrom_type.h"
+#include "dev/types.h"
 
 static const unsigned char sbox[256] =
         {

c8_remote/lib/crypto/aes_sw_impl.c

@@ -1,4 +1,4 @@
-#include "bootrom_type.h"
+#include "dev/types.h"
 
 #ifdef DEV_CRYPTO
 #include "dev_util.h"

c8_remote/lib/experiments/aes_sw.c

@@ -1,14 +1,13 @@
-#include "experiments.h"
+#include "util/experiments.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
 
-#include "bootrom_addr.h"
-#include "usb_helpers.h"
-#include "command.h"
-#include "host_crypto.h"
+#include "dev/addr.h"
+#include "tool/command.h"
+#include "util/host_crypto.h"
 
 DEV_PTR_T install_aes_data(struct pwned_device *dev)
 {

c8_remote/lib/experiments/power.c

@@ -1,8 +1,7 @@
-#include "experiments.h"
+#include "util/experiments.h"
 
 #include <stdio.h>
-#include "usb_helpers.h"
-#include "command.h"
+#include "tool/payload.h"
 
 void floppysleep(struct pwned_device *dev)
 {

c8_remote/lib/experiments/system.c

@@ -1,9 +1,7 @@
-#include "experiments.h"
+#include "util/experiments.h"
 
 #include <stdio.h>
-
-#include "usb_helpers.h"
-#include "command.h"
+#include "tool/command.h"
 
 void usb_task_exit(struct pwned_device *dev)
 {

c8_remote/lib/payload/include/bootrom_func.h

@@ -1,8 +1,8 @@
 #ifndef CHECKM8_TOOL_BOOTROM_FUNC_H
 #define CHECKM8_TOOL_BOOTROM_FUNC_H
 
-#include "bootrom_addr.h"
-#include "bootrom_type.h"
+#include "dev/addr.h"
+#include "dev/types.h"
 #include "dev_util.h"
 
 /* Crypto */

c8_remote/lib/payload/include/dev_cache.h

@@ -1,5 +1,5 @@
-#ifndef CHECKM8_TOOL_CACHEUTIL_H
-#define CHECKM8_TOOL_CACHEUTIL_H
+#ifndef CHECKM8_TOOL_DEV_CACHE_H
+#define CHECKM8_TOOL_DEV_CACHE_H
 
 #include "dev_util.h"
 
@@ -59,4 +59,4 @@ static inline void clean_inv_va(void *addr)
     __asm__ volatile ("dc ivac, %0"::"r" (addr));
 }
 
-#endif //CHECKM8_TOOL_CACHEUTIL_H
+#endif //CHECKM8_TOOL_DEV_CACHE_H

c8_remote/lib/payload/include/dev_crypto.h

@@ -1,7 +1,7 @@
 #ifndef CHECKM8_TOOL_CRYPTO_H
 #define CHECKM8_TOOL_CRYPTO_H
 
-#include "bootrom_type.h"
+#include "dev/types.h"
 
 void expand_key(unsigned char key[16], unsigned char key_sched[176],
                 int n, struct aes_constants *c);

c8_remote/lib/payload/payload_entry.c

@@ -1,5 +1,5 @@
 #include "dev_util.h"
-#include "bootrom_addr.h"
+#include "dev/addr.h"
 
 PAYLOAD_SECTION
 void load_sync_entry()

c8_remote/lib/payload/src/aes_sw_bern.c

@@ -1,6 +1,6 @@
 #include "bootrom_func.h"
-#include "bootrom_type.h"
-#include "cacheutil.h"
+#include "dev/types.h"
+#include "dev_cache.h"
 #include "dev_crypto.h"
 
 PAYLOAD_SECTION

c8_remote/lib/payload/src/cachelib.c

@@ -1,5 +1,5 @@
 #include "bootrom_func.h"
-#include "cacheutil.h"
+#include "dev_cache.h"
 
 
 PAYLOAD_SECTION

c8_remote/lib/payload/src/exit_usb_task.c

@@ -1,4 +1,4 @@
-#include "bootrom_addr.h"
+#include "dev/addr.h"
 #include "bootrom_func.h"
 
 PAYLOAD_SECTION