Merge branch 'master' of ted.mutabah.net:acess2

diff --git a/KernelLand/Kernel/arch/armv7/include/arch.h b/KernelLand/Kernel/arch/armv7/include/arch.h
index 837a5e1..c50168d 100644 (file)
--- a/KernelLand/Kernel/arch/armv7/include/arch.h
+++ b/KernelLand/Kernel/arch/armv7/include/arch.h
@@ -23,7 +23,7 @@ typedef signed short  Sint16;
 typedef signed long    Sint32;
 typedef signed long long       Sint64;
 
-typedef int    size_t;
+//typedef int  size_t;
 typedef char   BOOL;
 
 typedef Uint32 tVAddr;

diff --git a/RunQemu b/RunQemu
index 87cae41..b73a9f3 100755 (executable)
--- a/RunQemu
+++ b/RunQemu
@@ -69,7 +69,7 @@ QEMU_PARAMS=$QEMU_PARAMS" -net "$_NETTYPE
 
 if [ "x$_NOUSB" != "xyes" ] ; then
        QEMU_PARAMS=$QEMU_PARAMS" -usb"
-#      QEMU_PARAMS=$QEMU_PARAMS" -device usb-ehci"
+       QEMU_PARAMS=$QEMU_PARAMS" -device usb-ehci"
        QEMU_PARAMS=$QEMU_PARAMS" -drive id=test_usb_image,file=USB_Test_Image.img,if=none"
        QEMU_PARAMS=$QEMU_PARAMS" -device usb-storage,drive=test_usb_image"
        QEMU_PARAMS=$QEMU_PARAMS" -usbdevice mouse"
@@ -80,12 +80,12 @@ fi
 #      qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
 #echo $QEMU $BOOTOPT $QEMU_PARAMS
 if [ "x$_NOGRAPHIC" = "xyes" ] ; then
-       $QEMU $BOOTOPT $QEMU_PARAMS -nographic
+       eval $QEMU $BOOTOPT $QEMU_PARAMS -nographic
        exit
 fi
 
 if [ "x$_NOTEE" = "xyes" ] ; then
-       $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+       eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
        exit
 fi
 

diff --git a/Usermode/Applications/gui_ate_src/strings.c b/Usermode/Applications/gui_ate_src/strings.c
new file mode 100644 (file)
index 0000000..5cfee5d
--- /dev/null
+++ b/Usermode/Applications/gui_ate_src/strings.c
@@ -0,0 +1,21 @@
+/*
+ * Acess Text Editor (ATE)
+ * - By John Hodge (thePowersGang)
+ *
+ * strings.c
+ * - String Localisation
+ */
+
+struct keyval_str
+{
+       const char      *key;
+       const char      *val;
+};
+
+const struct keyval_str        gaDisplayStrings[] = {
+       {"BtnNew", "New"},
+       {"BtnOpen", "Open"},
+       {"BtnSave", "Save"},
+       {"BtnUndo", "Undo"}
+       };
+

diff --git a/Usermode/Applications/gui_ate_src/strings.h b/Usermode/Applications/gui_ate_src/strings.h
new file mode 100644 (file)
index 0000000..07376fa
--- /dev/null
+++ b/Usermode/Applications/gui_ate_src/strings.h
@@ -0,0 +1,15 @@
+/*
+ * Acess Text Editor (ATE)
+ * - By John Hodge (thePowersGang)
+ *
+ * strings.h
+ * - String Localisation
+ */
+#ifndef _STRINGS_H_
+#define _STRINGS_H_
+
+extern const char *getstr(const char *key);
+extern const char *getimg(const char *key);
+
+#endif
+