From e3eb5a92ae3991cdfbb5a5cf553eac476bc5822f Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Fri, 4 Feb 2022 23:55:05 -0700
Subject: Removed old mem

---
 include/globals.h |  3 ---
 include/lib/ll.h  | 26 --------------------------
 include/lib/mem.h | 48 ------------------------------------------------
 include/lib/q.h   | 31 -------------------------------
 4 files changed, 108 deletions(-)
 delete mode 100644 include/lib/ll.h
 delete mode 100644 include/lib/mem.h
 delete mode 100644 include/lib/q.h

(limited to 'include')

diff --git a/include/globals.h b/include/globals.h
index 423425f..ff67315 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,6 +1,5 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
-#include <lib/mem.h>
 #include <sys/schedule.h>
 
 #ifndef GLOBALS_C
@@ -13,8 +12,6 @@ unsigned char kmem_begin[0x2000000];
 unsigned char kmem_lookup[0xD000];
 extern unsigned long exe_cnt;
 extern struct Mutex exe_cnt_m;
-extern unsigned char rpi_heap[MAX_MM];
-extern void* rpi_heap_top;
 extern unsigned long nextpid;
 extern unsigned long stimel;
 extern unsigned long stimeh;
diff --git a/include/lib/ll.h b/include/lib/ll.h
deleted file mode 100644
index a9c3722..0000000
--- a/include/lib/ll.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef LIB_LL_H
-#define LIB_LL_H
-
-struct LL {
-	struct LL* prev;
-	struct LL* next;
-	void* data;
-} __attribute__((packed));
-
-struct LL* new_ll(void* val);
-void push_ll(struct LL* l, void* val);
-void pop_ll(struct LL* l);
-void remove_ll(struct LL* l, unsigned long idx);
-unsigned long length_ll(struct LL* l);
-
-#define show_ll(L, TYPE) { \
-	struct LL* t = L; \
-	do { \
-		uart_hex(*(TYPE*)t->data); \
-		t = t->next; \
-		if (t != l) \
-			uart_char(' '); \
-	} while (t != l); \
-}
-
-#endif
diff --git a/include/lib/mem.h b/include/lib/mem.h
deleted file mode 100644
index 655e648..0000000
--- a/include/lib/mem.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef LIB_MEM_H
-#define LIB_MEM_H
-
-#define MEM_SIZE_OFFSET 0
-#define MEM_USE_OFFSET 1
-#define MEM_BASE_SIZE 2
-#define MEM_META_SIZE 3
-#define NULL 0
-#define MAX_MM 0x100000
-
-struct MemTab {
-	unsigned char size;
-	unsigned char in_use;
-	void* data;
-} __attribute__((packed));
-
-struct RotBuffer {
-	void* base;
-	unsigned int size;
-	unsigned int roffset;
-	unsigned int woffset;
-};
-
-void memshow(unsigned char* addr, unsigned int n);
-void memset(unsigned char* dest, unsigned char value, unsigned int n);
-void memcpy(unsigned char* src, unsigned char* dest, unsigned int n);
-unsigned char memcmp(unsigned char* a, unsigned char* b, unsigned int n);
-void memcpyrot(unsigned char* src, struct RotBuffer* rb, unsigned int n);
-
-void memshow32(unsigned long* addr, unsigned int n);
-void memset32(unsigned long* dest, unsigned long value, unsigned int n);
-void memcpy32(unsigned long* src, unsigned long* dest, unsigned int n);
-unsigned char memcmp32(unsigned long* a, unsigned long* b, unsigned int n);
-
-void* realloc(void* old, unsigned char size);
-void* malloc(unsigned char size);
-void* calloc(unsigned char size);
-void* realloca(void* old, unsigned char size, unsigned char amnt);
-void* malloca(unsigned char size, unsigned char amnt);
-void* calloca(unsigned char size, unsigned char amnt);
-void free(void* memloc);
-void* heap_base(void);
-void* heap_top(void);
-void vheap_info(void);
-void heap_info(void);
-void heap_info_u(void);
-
-#endif
diff --git a/include/lib/q.h b/include/lib/q.h
deleted file mode 100644
index 11d7ab7..0000000
--- a/include/lib/q.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef LIB_Q_H
-#define LIB_Q_H
-
-struct Q_base {
-	struct Q* next;
-	struct Q* last;
-} __attribute__((packed));
-
-struct Q {
-	struct Q* next;
-	void* data;
-} __attribute__((packed));
-
-struct Q_base* new_q();
-void push_q(struct Q_base* qb, void* val);
-void pop_q(struct Q_base* qb);
-unsigned long length_q(struct Q_base* qb);
-
-#define show_q(QQ, TYPE) { \
-	if (QQ->next != 0) { \
-		struct Q* t = QQ->next; \
-		while (t->next != 0) { \
-			uart_hex(*(TYPE*)t->data); \
-			t = t->next; \
-			uart_char(' '); \
-		} \
-		uart_hex(*(TYPE*)t->data); \
-	} \
-}
-
-#endif
-- 
cgit v1.2.1