From 2c4dae7cc22db0a29532df63dc969485a3e5e957 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Sat, 2 Apr 2022 19:03:25 -0700
Subject: VSCodium Build Tasks

---
 .vscode/tasks.json | 30 ++++++++++++++++++++++++++++++
 README.md          |  6 +++---
 usr/cxx.cpp        |  2 ++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..ffc533b
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,30 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "run-qemu-silent",
+            "type": "shell",
+            "command": "SILENT=1 make clean run",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "export-to-sd",
+            "type": "shell",
+            "command": "make copy"
+        },
+        {
+            "label": "run-qemu",
+            "type": "shell",
+            "command": "make clean run"
+        },
+        {
+            "label": "default",
+            "type": "shell",
+            "command": "make"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index afb11f6..3540664 100644
--- a/README.md
+++ b/README.md
@@ -62,9 +62,9 @@ Note: SYS and USER share registers but differ in privilege
 
 # Memory Layout
  - 0x00004000 - 0x00008000 MMU Entries
- - 0x00008000 - 0x0000D000 Code
- - 0x0000D000 - 0x0000E000 Data
- - 0x0000E000 - 0x00089000 BSS
+ - 0x00008000 - 0x0000F000 Code
+ - 0x0000F000 - 0x00010000 Data
+ - 0x00010000 - 0x000A3000 BSS
  - 0x18000000 - 0x20000000 Thread Stacks
  - 0x3F000000 - 0x40000000 MMIO
  - 0x40000000 - 0xFFFFFFFF Local Peripherals
diff --git a/usr/cxx.cpp b/usr/cxx.cpp
index 2240d25..beeef80 100644
--- a/usr/cxx.cpp
+++ b/usr/cxx.cpp
@@ -1,6 +1,7 @@
 extern "C" {
 #include <graphics/lfb.h>
 #include <usr/string.h>
+#include <drivers/uart.h>
 };
 
 class Substation {
@@ -25,4 +26,5 @@ extern "C" void cpp_demo(unsigned long v)
 	char str[14];
 	char* start = ulong_to_string(s.max_production, str);
 	draw_string(0, 15, start);
+	uart_string(start);
 }
-- 
cgit v1.2.1