[VM] Add National JR-800.

diff --git a/source/build-cmake/jr800/CMakeLists.txt b/source/build-cmake/jr800/CMakeLists.txt
new file mode 100644 (file)
index 0000000..36041ee
--- /dev/null
+++ b/source/build-cmake/jr800/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Build Common Sourcecode Project, Qt.
+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
+# This is part of XM7/SDL, but license is apache 2.2,
+# this part was written only me.
+
+cmake_minimum_required (VERSION 2.8)
+cmake_policy(SET CMP0011 NEW)
+
+message("")
+message("** Start of configure CommonSourceProject,National JR-800, Qt **")
+message("")
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+
+
+project (emujr800)
+
+set(EXEC_TARGET emujr800)
+set(VM_NAME jr800)
+set(USE_FMGEN OFF)
+set(WITH_JOYSTICK ON)
+set(WITH_MOUSE OFF)
+
+set(VMFILES_BASE
+  mc6800.cpp
+
+  memory.cpp
+  hd44102.cpp
+  datarec.cpp
+  
+  event.cpp
+)
+
+set(VMFILES_LIB 
+  pcm1bit.cpp
+)
+
+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
+set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
+
+include(detect_target_cpu)
+set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
+
+set(VMFILES ${VMFILES_BASE})
+add_definitions(-D_JR800)
+set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/jr800.qrc)
+include(config_commonsource)

diff --git a/source/src/qt/common/qrc/jr800.qrc b/source/src/qt/common/qrc/jr800.qrc
index c59c0a8..b60e20f 100644 (file)
--- a/source/src/qt/common/qrc/jr800.qrc
+++ b/source/src/qt/common/qrc/jr800.qrc
@@ -1,7 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file alias="default.ico">../../../res/jr800.ico</file>
-    <file
-alias="bios_and_keys.txt">../../../../../doc/VMs/00_still_not_written.txt</file>
+    <file alias="bios_and_keys.txt">../../../../../doc/VMs/jr800.txt</file>
 </qresource>
 </RCC>

diff --git a/source/src/qt/common/qrc/smc70.qrc b/source/src/qt/common/qrc/smc70.qrc
index ad2a29e..63c90f8 100644 (file)
--- a/source/src/qt/common/qrc/smc70.qrc
+++ b/source/src/qt/common/qrc/smc70.qrc
@@ -1,7 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file alias="default.ico">../../../res/smc70.ico</file>
-    <file alias="bios_and_keys.txt">../../../../../doc/VMs/00_still_not_written.txt</file>
+    <file alias="bios_and_keys.txt">../../../../../doc/VMs/smc70.txt</file>
     <file alias="csp_qt_machine_ja.qm">../../../res/i18n/ja/smc777.qm</file>
 </qresource>
 </RCC>

diff --git a/source/src/qt/machines/familybasic/MainWindow.cpp b/source/src/qt/machines/familybasic/MainWindow.cpp
index 5527ec9..5e047cc 100644 (file)
--- a/source/src/qt/machines/familybasic/MainWindow.cpp
+++ b/source/src/qt/machines/familybasic/MainWindow.cpp
@@ -39,6 +39,9 @@ void META_MainWindow::retranslateUi(void)
        actionBootMode[0]->setText(QString::fromUtf8("BASIC V1"));
        actionBootMode[1]->setText(QString::fromUtf8("BASIC V2"));      
        actionBootMode[2]->setText(QString::fromUtf8("Playbox BASIC"));
+       actionBootMode[3]->setText(QString::fromUtf8("VRC7 BASIC V2"));
+       actionBootMode[4]->setText(QString::fromUtf8("VRC7 BASIC V3"));
+       actionBootMode[5]->setText(QString::fromUtf8("MMC5 BASIC V3"));
        // Set Labels
 } // retranslateUi
 

diff --git a/source/src/qt/machines/jr800/CMakeLists.txt b/source/src/qt/machines/jr800/CMakeLists.txt
new file mode 100644 (file)
index 0000000..55ab7bd
--- /dev/null
+++ b/source/src/qt/machines/jr800/CMakeLists.txt
@@ -0,0 +1,18 @@
+message("* qt/jr100")
+
+set(s_qt_jr100_headers
+         menuclasses.h
+)
+
+if(USE_QT_5)
+  QT5_WRAP_CPP(s_qt_jr100_headers_MOC ${s_qt_jr100_headers})
+else()
+  QT4_WRAP_CPP(s_qt_jr100_headers_MOC ${s_qt_jr100_headers})
+endif()
+
+add_library(qt_jr100
+         MainWindow.cpp
+         ${s_qt_jr100_headers_MOC}
+)
+
+

diff --git a/source/src/qt/machines/jr800/MainWindow.cpp b/source/src/qt/machines/jr800/MainWindow.cpp
new file mode 100644 (file)
index 0000000..917f462
--- /dev/null
+++ b/source/src/qt/machines/jr800/MainWindow.cpp
@@ -0,0 +1,60 @@
+/*
+ * Common Source code Project:
+ * Ui->Qt->MainWindow for JR800 .
+ * (C) 2015 K.Ohta <whatisthis.sowhat _at_ gmail.com>
+ *   License : GPLv2
+ *   History :
+ * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
+ */
+
+#include <QVariant>
+#include <QtGui>
+#include "emu.h"
+#include "commonclasses.h"
+#include "menuclasses.h"
+#include "qt_main.h"
+
+
+void META_MainWindow::setupUI_Emu(void)
+{
+   
+}
+
+void META_MainWindow::retranslateUi(void)
+{
+       int i;
+       retranslateControlMenu("System Reset",  false);
+       retranslateCMTMenu(0);
+       retranslateSoundMenu();
+       retranslateScreenMenu();
+       retranslateMachineMenu();
+       retranslateEmulatorMenu();
+       retranslateUI_Help();
+   
+       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
+#ifdef USE_DEBUGGER
+       actionDebugger[0]->setVisible(true);
+       actionDebugger[1]->setVisible(false);
+       actionDebugger[2]->setVisible(false);
+       actionDebugger[3]->setVisible(false);
+#endif
+       // Set Labels
+} // retranslateUi
+
+
+
+META_MainWindow::META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent) : Ui_MainWindow(p, logger, parent)
+{
+       setupUI_Emu();
+       retranslateUi();
+}
+
+
+META_MainWindow::~META_MainWindow()
+{
+}
+
+//QT_END_NAMESPACE
+
+
+

diff --git a/source/src/qt/machines/jr800/jr800.ts b/source/src/qt/machines/jr800/jr800.ts
new file mode 100644 (file)
index 0000000..4e405fe
--- /dev/null
+++ b/source/src/qt/machines/jr800/jr800.ts
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

diff --git a/source/src/qt/machines/jr800/menuclasses.h b/source/src/qt/machines/jr800/menuclasses.h
new file mode 100644 (file)
index 0000000..c56f80f
--- /dev/null
+++ b/source/src/qt/machines/jr800/menuclasses.h
@@ -0,0 +1,28 @@
+#ifndef _CSP_QT_MENUCLASSES_H
+#define _CSP_QT_MENUCLASSES_H
+
+#include "emu.h"
+#include "mainwidget.h"
+// This extends class CSP_MainWindow as Ui_MainWindow.
+// You may use this as 
+QT_BEGIN_NAMESPACE
+
+class Ui_MainWindow;
+class USING_FLAGS;
+class CSP_Logger;
+class META_MainWindow : public Ui_MainWindow {
+       Q_OBJECT
+protected:
+       void setupUI_Emu(void);
+       void retranslateUi(void);
+  
+public:
+       META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
+       ~META_MainWindow();
+public slots:
+
+};
+
+QT_END_NAMESPACE
+
+#endif // END

diff --git a/source/src/res/i18n/ja/jr800.qm b/source/src/res/i18n/ja/jr800.qm
new file mode 100644 (file)
index 0000000..be651ee
--- /dev/null
+++ b/source/src/res/i18n/ja/jr800.qm
@@ -0,0 +1 @@
+<¸d\18Êï\9c\95Í!\1c¿`¡½Ý
\ No newline at end of file

diff --git a/source/src/vm/jr800/CMakeLists.txt b/source/src/vm/jr800/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bfe01d1
--- /dev/null
+++ b/source/src/vm/jr800/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 2.6)
+
+message("* vm/babbage2nd")
+
+add_library(vm_jr800
+       io.cpp
+       jr800.cpp
+)
\ No newline at end of file