From f0c33c6549dcc74341bbdbc1a230a7225a232467 Mon Sep 17 00:00:00 2001
From: Josh Dersch <joshd@livingcomputers.org>
Date: Fri, 5 Apr 2019 21:09:26 +0200
Subject: [PATCH] Adding makefile and menu changes for RK11/RK05 additions.

---
 10.03_app_demo/2_src/makefile         | 22 +++++++++++++++-------
 10.03_app_demo/2_src/menu_devices.cpp | 12 +++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/10.03_app_demo/2_src/makefile b/10.03_app_demo/2_src/makefile
index 8012444..f7f6704 100644
--- a/10.03_app_demo/2_src/makefile
+++ b/10.03_app_demo/2_src/makefile
@@ -88,14 +88,16 @@ OBJECTS = $(OBJDIR)/application.o	\
 	$(OBJDIR)/cpu.o	\
 	$(OBJDIR)/ka11.o	\
 	$(OBJDIR)/rl0102.o	\
-    $(OBJDIR)/rl11.o	\
+        $(OBJDIR)/rl11.o	\
+        $(OBJDIR)/rk11.o        \
+        $(OBJDIR)/rk05.o        \
 	$(OBJDIR)/storagedrive.o	\
-    $(OBJDIR)/storagecontroller.o	\
-    $(OBJDIR)/demo_io.o	\
-    $(OBJDIR)/demo_regs.o	\
-    $(OBJDIR)/unibusdevice.o	\
-    $(OBJDIR)/device.o	\
-    $(OBJDIR)/parameter.o	\
+        $(OBJDIR)/storagecontroller.o	\
+        $(OBJDIR)/demo_io.o	\
+        $(OBJDIR)/demo_regs.o	\
+        $(OBJDIR)/unibusdevice.o	\
+        $(OBJDIR)/device.o	\
+        $(OBJDIR)/parameter.o	\
 	$(OBJDIR)/panel.o	\
 	$(OBJDIR)/unibusadapter.o	\
 	$(OBJDIR)/unibus.o	\
@@ -187,6 +189,12 @@ $(OBJDIR)/rl0102.o :  $(DEVICE_SRC_DIR)/rl0102.cpp $(DEVICE_SRC_DIR)/rl0102.hpp
 $(OBJDIR)/rl11.o :  $(DEVICE_SRC_DIR)/rl11.cpp $(DEVICE_SRC_DIR)/rl11.hpp
 	$(CC) $(CCFLAGS) $< -o $@
 
+$(OBJDIR)/rk05.o :  $(DEVICE_SRC_DIR)/rk05.cpp $(DEVICE_SRC_DIR)/rk05.hpp
+	$(CC) $(CCFLAGS) $< -o $@
+
+$(OBJDIR)/rk11.o :  $(DEVICE_SRC_DIR)/rk11.cpp $(DEVICE_SRC_DIR)/rk11.hpp
+	$(CC) $(CCFLAGS) $< -o $@
+
 $(OBJDIR)/storagedrive.o :  $(BASE_SRC_DIR)/storagedrive.cpp $(BASE_SRC_DIR)/storagedrive.hpp
 	$(CC) $(CCFLAGS) $< -o $@
 
diff --git a/10.03_app_demo/2_src/menu_devices.cpp b/10.03_app_demo/2_src/menu_devices.cpp
index 86468fc..fb7dcd0 100644
--- a/10.03_app_demo/2_src/menu_devices.cpp
+++ b/10.03_app_demo/2_src/menu_devices.cpp
@@ -48,6 +48,7 @@
 #include "demo_io.hpp"
 #include "demo_regs.hpp"
 #include "rl11.hpp"
+#include "rk11.hpp"
 #include "cpu.hpp"
 
 
@@ -80,7 +81,10 @@ void menus_c::menu_devices(void) {
 	cur_device = NULL;
 
 	paneldriver->reset(); // reset I2C, restart worker()
-
+ 
+        // create RK11 + drives
+        rk11_c RK05;
+ 
 	demo_io.install();
 	demo_io.worker_start();
 
@@ -91,6 +95,9 @@ void menus_c::menu_devices(void) {
 	RL11.connect_to_panel();
 	RL11.worker_start();
 
+        RK05.install();
+        RK05.worker_start();
+
 	cpu.install();
 	cpu.worker_start();
 
@@ -330,6 +337,9 @@ void menus_c::menu_devices(void) {
 	RL11.disconnect_from_panel();
 	RL11.uninstall();
 
+        RK05.worker_stop();
+        RK05.uninstall();
+
 	//demo_regs.worker_stop();
 	//demo_regs.uninstall();