chore: port the project to osdk

cute-engineering · Apr 10, 2023 · 73aebd1 · 73aebd1
1 parent cbc8544
commit 73aebd1
Show file tree

Hide file tree

Showing 27 changed files with 60 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -37,6 +37,3 @@ EfiStatus efi_main(EfiHandle image_handle, EfiSystemTable *st)
 }
 ```
 
-## Example
-
-To compile and run the example, just execute `make run`
diff --git a/src/console.c → console.c b/src/console.c → console.c
@@ -1,4 +1,4 @@
-#include <tinyefi/tinyefi.h>
+#include "efi.h"
 
 void efi_console_reset(void)
 {

diff --git a/include/tinyefi/console.h → console.h b/include/tinyefi/console.h → console.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_CONSOLE_H
 #define TINYEFI_CONSOLE_H
 
-#include <tinyefi/protos.h>
+#include "protos.h"
 
 void efi_console_reset(void);
 void efi_console_set_attribute(uint64_t attribute);

diff --git a/src/tinyefi.c → efi.c b/src/tinyefi.c → efi.c
@@ -1,5 +1,5 @@
-#include <tinyefi/tinyefi.h>
-#include <tinyefi/types.h>
+#include "efi.h"
+#include "types.h"
 
 static EfiHandle _handle;
 static EfiSystemTable *_st;

diff --git a/include/tinyefi/tinyefi.h → efi.h b/include/tinyefi/tinyefi.h → efi.h
@@ -1,9 +1,9 @@
-#ifndef TINYEFI_TINYEFI_H
-#define TINYEFI_TINYEFI_H
+#ifndef TINYEFI_EFI_H
+#define TINYEFI_EFI_H
 
-#include <tinyefi/console.h>
-#include <tinyefi/protos.h>
-#include <tinyefi/tables.h>
+#include "console.h"
+#include "protos.h"
+#include "tables.h"
 
 void efi_init(EfiHandle handle, EfiSystemTable *st);
 

diff --git a/example/main.c b/example/main.c
@@ -1,4 +1,4 @@
-#include <tinyefi/tinyefi.h>
+#include "../efi.h"
 
 void __chkstk() { return; }
 

diff --git a/include/tinyefi/protos.h b/include/tinyefi/protos.h
diff --git a/include/tinyefi/services.h b/include/tinyefi/services.h
diff --git a/include/tinyefi/tables.h b/include/tinyefi/tables.h
diff --git a/manifest.json b/manifest.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "https://schemas.cute.engineering/latest/osdk.manifest.component",
+    "id": "tiny-efi",
+    "type": "lib",
+    "description": "Tiny public domain EFI library"
+}
diff --git a/protos.h b/protos.h
@@ -0,0 +1,12 @@
+#ifndef TINYEFI_PROTOS_H
+#define TINYEFI_PROTOS_H
+
+#include "protos/dpp.h"
+#include "protos/fp.h"
+#include "protos/gop.h"
+#include "protos/lip.h"
+#include "protos/sfsp.h"
+#include "protos/stip.h"
+#include "protos/stop.h"
+
+#endif
diff --git a/include/tinyefi/protos/dpp.h → protos/dpp.h b/include/tinyefi/protos/dpp.h → protos/dpp.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_PROTOS_DPP_H
 #define TINYEFI_PROTOS_DPP_H
 
-#include <tinyefi/types.h>
+#include "../types.h"
 
 #define EFI_DPP_GUID                                       \
     (EfiGuid)                                              \

diff --git a/include/tinyefi/protos/fp.h → protos/fp.h b/include/tinyefi/protos/fp.h → protos/fp.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_PROTOS_FP_H
 #define TINYEFI_PROTOS_FP_H
 
-#include <tinyefi/protos/dpp.h>
+#include "../protos/dpp.h"
 
 #define EFI_FILE_INFO_ID                                   \
     (EfiGuid)                                              \

diff --git a/include/tinyefi/protos/gop.h → protos/gop.h b/include/tinyefi/protos/gop.h → protos/gop.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_PROTOS_GOP_H
 #define TINYEFI_PROTOS_GOP_H
 
-#include <tinyefi/types.h>
+#include "../types.h"
 
 #define EFI_GOP_GUID                                       \
     {                                                      \

diff --git a/include/tinyefi/protos/lip.h → protos/lip.h b/include/tinyefi/protos/lip.h → protos/lip.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <tinyefi/tables/system.h>
+#include "../tables/system.h"
 
 #define EFI_LIP_GUID                                       \
     {                                                      \

diff --git a/include/tinyefi/protos/sfsp.h → protos/sfsp.h b/include/tinyefi/protos/sfsp.h → protos/sfsp.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <tinyefi/protos/fp.h>
-#include <tinyefi/types.h>
+#include "../protos/fp.h"
+#include "../types.h"
 
 #define EFI_SFSP_REVISION 0x00010000
 

diff --git a/include/tinyefi/protos/stip.h → protos/stip.h b/include/tinyefi/protos/stip.h → protos/stip.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_PROTOS_STIP_H
 #define TINYEFI_PROTOS_STIP_H
 
-#include <tinyefi/types.h>
+#include "../types.h"
 
 #define CHAR_CARRIAGE_RETURN 0x000D
 

diff --git a/include/tinyefi/protos/stop.h → protos/stop.h b/include/tinyefi/protos/stop.h → protos/stop.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_PROTOS_STOP_H
 #define TINYEFI_PROTOS_STOP_H
 
-#include <tinyefi/types.h>
+#include "../types.h"
 
 #define EFI_STOP_GUID                                      \
     {                                                      \

diff --git a/services.h b/services.h
@@ -0,0 +1,7 @@
+#ifndef TINYEFI_SERVICES_H
+#define TINYEFI_SERVICES_H
+
+#include "services/boot.h"
+#include "services/runtime.h"
+
+#endif
diff --git a/include/tinyefi/services/boot.h → services/boot.h b/include/tinyefi/services/boot.h → services/boot.h
@@ -1,8 +1,8 @@
 #ifndef TINYEFI_SERVICES_BOOT_H
 #define TINYEFI_SERVICES_BOOT_H
 
-#include <tinyefi/protos/dpp.h>
-#include <tinyefi/types.h>
+#include "../protos/dpp.h"
+#include "../types.h"
 
 /* Event Types */
 #define EVT_TIMER 0x80000000

diff --git a/include/tinyefi/services/runtime.h → services/runtime.h b/include/tinyefi/services/runtime.h → services/runtime.h
@@ -1,8 +1,8 @@
 #ifndef TINYEFI_SERVICES_RUNTIME_H
 #define TINYEFI_SERVICES_RUNTIME_H
 
-#include <tinyefi/services/boot.h>
-#include <tinyefi/types.h>
+#include "../types.h"
+#include "boot.h"
 
 #define EFI_OPTIONAL_POINTER 0x00000001
 

diff --git a/tables.h b/tables.h
@@ -0,0 +1,7 @@
+#ifndef TINYEFI_TABLES_H
+#define TINYEFI_TABLES_H
+
+#include "tables/config.h"
+#include "tables/system.h"
+
+#endif
diff --git a/include/tinyefi/tables/config.h → tables/config.h b/include/tinyefi/tables/config.h → tables/config.h
@@ -1,7 +1,7 @@
 #ifndef TINYEFI_TABLES_CONFIG_H
 #define TINYEFI_TABLES_CONFIG_H
 
-#include <tinyefi/types.h>
+#include "../types.h"
 
 #define ACPI2_TABLE_GUID                                   \
     {                                                      \

diff --git a/include/tinyefi/tables/system.h → tables/system.h b/include/tinyefi/tables/system.h → tables/system.h
@@ -1,11 +1,11 @@
 #ifndef TINYEFI_TABLES_SYSTEM_H
 #define TINYEFI_TABLES_SYSTEM_H
 
-#include <tinyefi/protos/stip.h>
-#include <tinyefi/protos/stop.h>
-#include <tinyefi/services/boot.h>
-#include <tinyefi/services/runtime.h>
-#include <tinyefi/tables/config.h>
+#include "../protos/stip.h"
+#include "../protos/stop.h"
+#include "../services/boot.h"
+#include "../services/runtime.h"
+#include "../tables/config.h"
 
 typedef struct
 {

diff --git a/include/tinyefi/types.h → types.h b/include/tinyefi/types.h → types.h
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     ```
-    ## Example
-    To compile and run the example, just execute `make run`