Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice

# Conflicts:
#	.gitignore
#	PL0_test.ld
#	demo_functionality.c
#	interrupt_vector.S
#	interrupts.c
#	kernel.c
#	memory.h

1 files changed, 25 insertions, 6 deletions

diff --git a/strings.h b/strings.h
index 2ceade8..aff0533 100644
--- a/strings.h
+++ b/strings.h
@@ -1,14 +1,33 @@
 #ifndef STRINGS_H
 #define STRINGS_H
 
+#include <stddef.h>
 #include <stdint.h>
 
-void uint32_to_bits(uint32_t number, char *buf)
-{
-  for (int i = 0; i < 32; i++)
-    buf[i] = ((number >> (32 - i - 1)) & 1) ? '1' : '0';
+void uint32_to_dec(uint32_t number, char buf[10]);
 
-  buf[32] = '\0';
-}
+void uint32_to_hex(uint32_t number, char buf[8]);
 
+void uint32_to_bin(uint32_t number, char buf[32]);
+
+void uint32_to_decstring(uint32_t number, char buf[11]);
+
+void uint32_to_hexstring(uint32_t number, char buf[9]);
+
+void uint32_to_binstring(uint32_t number, char buf[33]);
+
+void trim_0s(char string[]);
+
+void uint32_to_decstringt(uint32_t number, char buf[11]);
+
+void uint32_to_hexstringt(uint32_t number, char buf[9]);
+
+size_t strlen(char string[]);
+
+void memcpy(void *dst, void *src, size_t nbytes);
+  
+void *memset(void *s, int c, size_t n);
+
+char *strcat(char *dst, const char *src);
+  
 #endif // STRINGS_H