summaryrefslogtreecommitdiff
path: root/nitro
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-20 20:57:00 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-20 20:57:00 -0400
commit43eb982a80c45fe26f1cbbc23285c4d8a2cc64b4 (patch)
tree66ee75d6bcb234f6febf52bd07ce80a9b6a6ec90 /nitro
parent7fd747b7dfa11c1061d03467d50ff49c9d1f6b34 (diff)
Create include/ directory and move main.h structs there
Diffstat (limited to 'nitro')
-rw-r--r--nitro/nitro.h16
-rw-r--r--nitro/os.c9
-rw-r--r--nitro/os.h10
-rw-r--r--nitro/os_asm.h12
-rw-r--r--nitro/os_asm.s7
-rw-r--r--nitro/types.h50
6 files changed, 0 insertions, 104 deletions
diff --git a/nitro/nitro.h b/nitro/nitro.h
deleted file mode 100644
index 70ad9a18..00000000
--- a/nitro/nitro.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef POKEDIAMOND_NITRO_H
-#define POKEDIAMOND_NITRO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Include all nitro files
-#include "types.h"
-#include "os.h"
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif //POKEDIAMOND_NITRO_H
diff --git a/nitro/os.c b/nitro/os.c
deleted file mode 100644
index a531740d..00000000
--- a/nitro/os.c
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Created by mart on 4/12/20.
-//
-
-#include "os.h"
-
-asm void OS_GetProcMode() {
-
-} \ No newline at end of file
diff --git a/nitro/os.h b/nitro/os.h
deleted file mode 100644
index 8e4d4ed3..00000000
--- a/nitro/os.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Created by mart on 4/12/20.
-//
-
-#ifndef POKEDIAMOND_OS_H
-#define POKEDIAMOND_OS_H
-
-#include "os_asm.h"
-
-#endif //POKEDIAMOND_OS_H
diff --git a/nitro/os_asm.h b/nitro/os_asm.h
deleted file mode 100644
index 43c93385..00000000
--- a/nitro/os_asm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Created by mart on 4/12/20.
-//
-
-#ifndef POKEDIAMOND_OS_ASM_H
-#define POKEDIAMOND_OS_ASM_H
-
-#include "types.h"
-
-OSProcMode OS_GetProcMode();
-
-#endif //POKEDIAMOND_OS_ASM_H
diff --git a/nitro/os_asm.s b/nitro/os_asm.s
deleted file mode 100644
index 86d7603c..00000000
--- a/nitro/os_asm.s
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# TODO: make this syntax look correct in CLion
-# Potentially switch to AT&T syntax?
-OS_GetProcMode:
- mrs r0, cpsr
- and r0, r0, #0x80
- bx lr
diff --git a/nitro/types.h b/nitro/types.h
deleted file mode 100644
index d702de23..00000000
--- a/nitro/types.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef POKEDIAMOND_NITRO_TYPES_H
-#define POKEDIAMOND_NITRO_TYPES_H
-
-typedef unsigned char u8;
-typedef unsigned short int u16;
-typedef unsigned long u32;
-
-typedef signed char s8;
-typedef signed short int s16;
-typedef signed long s32;
-
-typedef unsigned long long int u64;
-typedef signed long long int s64;
-
-typedef volatile u8 vu8;
-typedef volatile u16 vu16;
-typedef volatile u32 vu32;
-typedef volatile u64 vu64;
-
-typedef volatile s8 vs8;
-typedef volatile s16 vs16;
-typedef volatile s32 vs32;
-typedef volatile s64 vs64;
-
-typedef float f32;
-typedef volatile f32 vf32;
-
-typedef int BOOL;
-#define TRUE 1
-#define FALSE 0
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else // __cplusplus
-#define NULL ((void *)0)
-#endif // __cplusplus
-#endif
-
-typedef enum {
- OS_PROCMODE_USER=16,
- OS_PROCMODE_FIQ=17,
- OS_PROCMODE_IRQ=18,
- OS_PROCMODE_SVC=19,
- OS_PROCMODE_ABORT=23,
- OS_PROCMODE_UNDEF=27,
- OS_PROCMODE_SYS=31
-} OSProcMode;
-
-#endif //POKEDIAMOND_NITRO_TYPES_H