From 154510c94f0dba6ddd5c07a10a3d76b6254cabf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Tue, 28 Jun 2016 22:17:23 +0200 Subject: [PATCH] add Mac II variant with 640x480 screen, resolves #10 --- Mini vMac.xcodeproj/project.pbxproj | 173 +++++++++++++ .../xcschemes/MacII-640x480.xcscheme | 80 ++++++ Mini vMac/MacII-640x480/CNFGGLOB.h | 24 ++ Mini vMac/MacII-640x480/EMCONFIG.h | 232 ++++++++++++++++++ Mini vMac/MacII/CNFGGLOB.h | 2 +- 5 files changed, 510 insertions(+), 1 deletion(-) create mode 100644 Mini vMac.xcodeproj/xcshareddata/xcschemes/MacII-640x480.xcscheme create mode 100644 Mini vMac/MacII-640x480/CNFGGLOB.h create mode 100644 Mini vMac/MacII-640x480/EMCONFIG.h diff --git a/Mini vMac.xcodeproj/project.pbxproj b/Mini vMac.xcodeproj/project.pbxproj index 9ffdfdb..f7560b6 100644 --- a/Mini vMac.xcodeproj/project.pbxproj +++ b/Mini vMac.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 281BB6C91D231F7700BF87B0 /* MacII-640x480.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 28BDBEB71D230EEB0072ED5B /* MacII-640x480.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 283422D21CF8EF8C0088B634 /* MacPlus4M.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 283422CA1CF8EF8C0088B634 /* MacPlus4M.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 283422EE1CF8F2210088B634 /* MYOSGLUE.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CE8ECB1CD4CDC500FE25A8 /* MYOSGLUE.m */; }; 283423601CF9C1050088B634 /* GLOBGLUE.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423341CF9C0F10088B634 /* GLOBGLUE.c */; }; @@ -77,6 +78,27 @@ 28BA89821CE7336500A98104 /* Keyboard Layouts in Resources */ = {isa = PBXBuildFile; fileRef = 28BA89811CE7336500A98104 /* Keyboard Layouts */; }; 28BA89851CE73E7200A98104 /* TrackPad.m in Sources */ = {isa = PBXBuildFile; fileRef = 28BA89841CE73E7200A98104 /* TrackPad.m */; }; 28BA89881CE73FBC00A98104 /* MNVMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 28BA89871CE73FBC00A98104 /* MNVMApplication.m */; }; + 28BDBE9C1D230EEB0072ED5B /* SONYEMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423551CF9C0F10088B634 /* SONYEMDV.c */; }; + 28BDBE9D1D230EEB0072ED5B /* SCSIEMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423511CF9C0F10088B634 /* SCSIEMDV.c */; }; + 28BDBE9E1D230EEB0072ED5B /* SCRNEMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834234C1CF9C0F10088B634 /* SCRNEMDV.c */; }; + 28BDBE9F1D230EEB0072ED5B /* RTCEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423481CF9C0F10088B634 /* RTCEMDEV.c */; }; + 28BDBEA01D230EEB0072ED5B /* MYOSGLUE.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CE8ECB1CD4CDC500FE25A8 /* MYOSGLUE.m */; }; + 28BDBEA11D230EEB0072ED5B /* MINEM68K.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834233D1CF9C0F10088B634 /* MINEM68K.c */; }; + 28BDBEA21D230EEB0072ED5B /* MOUSEMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834233F1CF9C0F10088B634 /* MOUSEMDV.c */; }; + 28BDBEA31D230EEB0072ED5B /* VIAEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834235B1CF9C0F10088B634 /* VIAEMDEV.c */; }; + 28BDBEA41D230EEB0072ED5B /* VIA2EMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423591CF9C0F10088B634 /* VIA2EMDV.c */; }; + 28BDBEA51D230EEB0072ED5B /* M68KITAB.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834233B1CF9C0F10088B634 /* M68KITAB.c */; }; + 28BDBEA61D230EEB0072ED5B /* GLOBGLUE.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423341CF9C0F10088B634 /* GLOBGLUE.c */; }; + 28BDBEA71D230EEB0072ED5B /* ROMEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423461CF9C0F10088B634 /* ROMEMDEV.c */; }; + 28BDBEA81D230EEB0072ED5B /* PROGMAIN.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423441CF9C0F10088B634 /* PROGMAIN.c */; }; + 28BDBEA91D230EEB0072ED5B /* ADBEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423231CF9C0F10088B634 /* ADBEMDEV.c */; }; + 28BDBEAA1D230EEB0072ED5B /* ASCEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423271CF9C0F10088B634 /* ASCEMDEV.c */; }; + 28BDBEAB1D230EEB0072ED5B /* SCCEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834234A1CF9C0F10088B634 /* SCCEMDEV.c */; }; + 28BDBEAC1D230EEB0072ED5B /* IWMEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423371CF9C0F10088B634 /* IWMEMDEV.c */; }; + 28BDBEAD1D230EEB0072ED5B /* VIDEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834235D1CF9C0F10088B634 /* VIDEMDEV.c */; }; + 28BDBEB11D230EEB0072ED5B /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423EC1CFA329C0088B634 /* Icon.png */; }; + 28BDBEB21D230EEB0072ED5B /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423ED1CFA329C0088B634 /* Icon@2x.png */; }; + 28BDBEB31D230EEB0072ED5B /* Icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423EE1CFA329C0088B634 /* Icon@3x.png */; }; 28CE8ED61CD4F56C00FE25A8 /* ScreenView.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CE8ED51CD4F56C00FE25A8 /* ScreenView.m */; }; 28D5A3FD1CD6868F001A33F6 /* TouchScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D5A3FC1CD6868E001A33F6 /* TouchScreen.m */; }; 28F676C21CD15E0B00FC6FA6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F676C11CD15E0B00FC6FA6 /* main.m */; }; @@ -139,6 +161,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( + 281BB6C91D231F7700BF87B0 /* MacII-640x480.framework in Embed Frameworks */, 289710DF1CFB12660089D463 /* Mac128K.framework in Embed Frameworks */, 283423A31CF9C5880088B634 /* MacII.framework in Embed Frameworks */, 283422D21CF8EF8C0088B634 /* MacPlus4M.framework in Embed Frameworks */, @@ -274,6 +297,9 @@ 28BA89841CE73E7200A98104 /* TrackPad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TrackPad.m; sourceTree = ""; }; 28BA89861CE73FBC00A98104 /* MNVMApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MNVMApplication.h; sourceTree = ""; }; 28BA89871CE73FBC00A98104 /* MNVMApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MNVMApplication.m; sourceTree = ""; }; + 28BDBEB71D230EEB0072ED5B /* MacII-640x480.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "MacII-640x480.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 28BDBEBA1D230F280072ED5B /* CNFGGLOB.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNFGGLOB.h; sourceTree = ""; }; + 28BDBEBB1D230F280072ED5B /* EMCONFIG.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EMCONFIG.h; sourceTree = ""; }; 28CE8ECB1CD4CDC500FE25A8 /* MYOSGLUE.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYOSGLUE.m; sourceTree = ""; }; 28CE8ED41CD4F56C00FE25A8 /* ScreenView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenView.h; sourceTree = ""; }; 28CE8ED51CD4F56C00FE25A8 /* ScreenView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenView.m; sourceTree = ""; }; @@ -356,6 +382,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 28BDBEAE1D230EEB0072ED5B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 28F676BA1CD15E0B00FC6FA6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -408,6 +441,7 @@ 283422F01CF8F3530088B634 /* Shared */, 283422CB1CF8EF8C0088B634 /* MacPlus4M */, 283423981CF9C5380088B634 /* MacII */, + 28BDBEB91D230F280072ED5B /* MacII-640x480 */, 289710D51CFB11D90089D463 /* Mac128K */, ); name = "Emulator Bundles"; @@ -531,6 +565,15 @@ name = Keyboard; sourceTree = ""; }; + 28BDBEB91D230F280072ED5B /* MacII-640x480 */ = { + isa = PBXGroup; + children = ( + 28BDBEBA1D230F280072ED5B /* CNFGGLOB.h */, + 28BDBEBB1D230F280072ED5B /* EMCONFIG.h */, + ); + path = "MacII-640x480"; + sourceTree = ""; + }; 28F676B41CD15E0B00FC6FA6 = { isa = PBXGroup; children = ( @@ -549,6 +592,7 @@ 283422CA1CF8EF8C0088B634 /* MacPlus4M.framework */, 283423961CF9C4CB0088B634 /* MacII.framework */, 289710D41CFB11BF0089D463 /* Mac128K.framework */, + 28BDBEB71D230EEB0072ED5B /* MacII-640x480.framework */, ); name = Products; sourceTree = ""; @@ -690,6 +734,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 28BDBEAF1D230EEB0072ED5B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -747,6 +798,24 @@ productReference = 289710D41CFB11BF0089D463 /* Mac128K.framework */; productType = "com.apple.product-type.framework"; }; + 28BDBE9A1D230EEB0072ED5B /* MacII-640x480 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 28BDBEB41D230EEB0072ED5B /* Build configuration list for PBXNativeTarget "MacII-640x480" */; + buildPhases = ( + 28BDBE9B1D230EEB0072ED5B /* Sources */, + 28BDBEAE1D230EEB0072ED5B /* Frameworks */, + 28BDBEAF1D230EEB0072ED5B /* Headers */, + 28BDBEB01D230EEB0072ED5B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "MacII-640x480"; + productName = "minivmac-plus4m"; + productReference = 28BDBEB71D230EEB0072ED5B /* MacII-640x480.framework */; + productType = "com.apple.product-type.framework"; + }; 28F676BC1CD15E0B00FC6FA6 /* Mini vMac */ = { isa = PBXNativeTarget; buildConfigurationList = 28F676D41CD15E0B00FC6FA6 /* Build configuration list for PBXNativeTarget "Mini vMac" */; @@ -837,6 +906,9 @@ 2834237D1CF9C4CB0088B634 = { DevelopmentTeam = UJXNDZ5TNU; }; + 28BDBE9A1D230EEB0072ED5B = { + DevelopmentTeam = UJXNDZ5TNU; + }; 28F676BC1CD15E0B00FC6FA6 = { CreatedOnToolsVersion = 7.3; DevelopmentTeam = UJXNDZ5TNU; @@ -872,6 +944,7 @@ 283422C91CF8EF8C0088B634 /* MacPlus4M */, 2834237D1CF9C4CB0088B634 /* MacII */, 289710B81CFB11BF0089D463 /* Mac128K */, + 28BDBE9A1D230EEB0072ED5B /* MacII-640x480 */, ); }; /* End PBXProject section */ @@ -907,6 +980,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 28BDBEB01D230EEB0072ED5B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 28BDBEB11D230EEB0072ED5B /* Icon.png in Resources */, + 28BDBEB21D230EEB0072ED5B /* Icon@2x.png in Resources */, + 28BDBEB31D230EEB0072ED5B /* Icon@3x.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 28F676BB1CD15E0B00FC6FA6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1023,6 +1106,31 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 28BDBE9B1D230EEB0072ED5B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 28BDBE9C1D230EEB0072ED5B /* SONYEMDV.c in Sources */, + 28BDBE9D1D230EEB0072ED5B /* SCSIEMDV.c in Sources */, + 28BDBE9E1D230EEB0072ED5B /* SCRNEMDV.c in Sources */, + 28BDBE9F1D230EEB0072ED5B /* RTCEMDEV.c in Sources */, + 28BDBEA01D230EEB0072ED5B /* MYOSGLUE.m in Sources */, + 28BDBEA11D230EEB0072ED5B /* MINEM68K.c in Sources */, + 28BDBEA21D230EEB0072ED5B /* MOUSEMDV.c in Sources */, + 28BDBEA31D230EEB0072ED5B /* VIAEMDEV.c in Sources */, + 28BDBEA41D230EEB0072ED5B /* VIA2EMDV.c in Sources */, + 28BDBEA51D230EEB0072ED5B /* M68KITAB.c in Sources */, + 28BDBEA61D230EEB0072ED5B /* GLOBGLUE.c in Sources */, + 28BDBEA71D230EEB0072ED5B /* ROMEMDEV.c in Sources */, + 28BDBEA81D230EEB0072ED5B /* PROGMAIN.c in Sources */, + 28BDBEA91D230EEB0072ED5B /* ADBEMDEV.c in Sources */, + 28BDBEAA1D230EEB0072ED5B /* ASCEMDEV.c in Sources */, + 28BDBEAB1D230EEB0072ED5B /* SCCEMDEV.c in Sources */, + 28BDBEAC1D230EEB0072ED5B /* IWMEMDEV.c in Sources */, + 28BDBEAD1D230EEB0072ED5B /* VIDEMDEV.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 28F676B91CD15E0B00FC6FA6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1288,6 +1396,62 @@ }; name = Release; }; + 28BDBEB51D230EEB0072ED5B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macii; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\" \"$(SRCROOT)/Mini vMac/mnvm_core\""; + USE_HEADERMAP = NO; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 28BDBEB61D230EEB0072ED5B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Mini vMac/PlugIn-Info.plist"; + INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)/CNFGGLOB.h"; + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = PLIST_PREPROCESSOR; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = net.namedfork.minivmac.macii; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Mini vMac/$(PRODUCT_NAME)\" \"$(SRCROOT)/Mini vMac/mnvm_core\""; + USE_HEADERMAP = NO; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 28F676D21CD15E0B00FC6FA6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1500,6 +1664,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 28BDBEB41D230EEB0072ED5B /* Build configuration list for PBXNativeTarget "MacII-640x480" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 28BDBEB51D230EEB0072ED5B /* Debug */, + 28BDBEB61D230EEB0072ED5B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 28F676B81CD15E0B00FC6FA6 /* Build configuration list for PBXProject "Mini vMac" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Mini vMac.xcodeproj/xcshareddata/xcschemes/MacII-640x480.xcscheme b/Mini vMac.xcodeproj/xcshareddata/xcschemes/MacII-640x480.xcscheme new file mode 100644 index 0000000..bff55b4 --- /dev/null +++ b/Mini vMac.xcodeproj/xcshareddata/xcschemes/MacII-640x480.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mini vMac/MacII-640x480/CNFGGLOB.h b/Mini vMac/MacII-640x480/CNFGGLOB.h new file mode 100644 index 0000000..f1cd65f --- /dev/null +++ b/Mini vMac/MacII-640x480/CNFGGLOB.h @@ -0,0 +1,24 @@ +#define RomFileName "MacII.ROM" + +#define WantInitSpeedValue 2 +#define WantInitNotAutoSlow 0 +#define EnableAutoSlow 0 + +#define MySoundEnabled 1 +#define MySoundRecenterSilence 0 +#define kLn2SoundSampSz 3 + +#define NumDrives 8 + +#define vMacScreenHeight 480 +#define vMacScreenWidth 640 +#define vMacScreenDepth 3 + +#define kROM_Size 0x00040000 + +#ifdef PLIST_PREPROCESSOR +#define MNVMBundleDisplayName Mac II (640×480) +#define MNVMBundleGetInfoString 8M, 640×480 +#else +#include "../CNFGGLOB.h" +#endif diff --git a/Mini vMac/MacII-640x480/EMCONFIG.h b/Mini vMac/MacII-640x480/EMCONFIG.h new file mode 100644 index 0000000..258c330 --- /dev/null +++ b/Mini vMac/MacII-640x480/EMCONFIG.h @@ -0,0 +1,232 @@ +/* + Configuration options used by platform independent code. + + This file is automatically generated by the build system, + which tries to know what options are valid in what + combinations. Avoid changing this file manually unless + you know what you're doing. +*/ + +#define EmClassicKbrd 0 +#define EmADB 1 +#define EmRTC 1 +#define EmPMU 0 +#define EmVIA2 1 +#define Use68020 1 +#define EmFPU 1 +#define EmMMU 0 +#define EmASC 1 + +#define CurEmMd kEmMd_II + +#define kMyClockMult 2 + +#define WantCycByPriOp 1 +#define WantCloserCyc 0 + +#define kRAMa_Size 0x00400000 +#define kRAMb_Size 0x00400000 + +#define IncludeVidMem 1 +#define kVidMemRAM_Size 0x00080000 + +#define EmVidCard 1 +#define kVidROM_Size 0x000800 + +#define MaxATTListN 20 +#define IncludeExtnPbufs 1 +#define IncludeExtnHostTextClipExchange 1 + +#define Sony_SupportDC42 1 +#define Sony_SupportTags 0 +#define Sony_WantChecksumsUpdated 0 +#define Sony_VerifyChecksums 0 +#define CaretBlinkTime 0x08 +#define SpeakerVol 0x07 +#define DoubleClickTime 0x08 +#define MenuBlink 0x03 +#define AutoKeyThresh 0x06 +#define AutoKeyRate 0x03 + + +/* the Wire variables are 1/0, not true/false */ + +enum { + + Wire_unknown_SoundDisable, +#define SoundDisable (Wires[Wire_unknown_SoundDisable]) + + Wire_unknown_SoundVolb0, +#define SoundVolb0 (Wires[Wire_unknown_SoundVolb0]) + + Wire_unknown_SoundVolb1, +#define SoundVolb1 (Wires[Wire_unknown_SoundVolb1]) + + Wire_unknown_SoundVolb2, +#define SoundVolb2 (Wires[Wire_unknown_SoundVolb2]) + + Wire_VIA1_iA0_unknown, +#define VIA1_iA0 (Wires[Wire_VIA1_iA0_unknown]) + + Wire_VIA1_iA1_unknown, +#define VIA1_iA1 (Wires[Wire_VIA1_iA1_unknown]) + + Wire_VIA1_iA2_unknown, +#define VIA1_iA2 (Wires[Wire_VIA1_iA2_unknown]) + + Wire_VIA1_iB7_unknown, /* for compatibility with SoundDisable */ +#define VIA1_iB7 (Wires[Wire_VIA1_iB7_unknown]) + + Wire_VIA2_InterruptRequest, +#define VIA2_InterruptRequest (Wires[Wire_VIA2_InterruptRequest]) +#define VIA2_interruptChngNtfy VIAorSCCinterruptChngNtfy + + Wire_VIA2_iA7_unknown, +#define VIA2_iA7 (Wires[Wire_VIA2_iA7_unknown]) +#define VIA2_iA7_ChangeNtfy Addr32_ChangeNtfy + + Wire_VIA2_iA6_unknown, +#define VIA2_iA6 (Wires[Wire_VIA2_iA6_unknown]) +#define VIA2_iA6_ChangeNtfy Addr32_ChangeNtfy + + Wire_VIA2_iB7_unknown, +#define VIA2_iB7 (Wires[Wire_VIA2_iB7_unknown]) + + Wire_VIA2_iCB2_unknown, +#define VIA2_iCB2 (Wires[Wire_VIA2_iCB2_unknown]) + + Wire_VIA2_iB2_PowerOff, +#define VIA2_iB2 (Wires[Wire_VIA2_iB2_PowerOff]) +#define VIA2_iB2_ChangeNtfy PowerOff_ChangeNtfy + + Wire_VIA2_iB3_Addr32, +#define VIA2_iB3 (Wires[Wire_VIA2_iB3_Addr32]) +#define Addr32 (Wires[Wire_VIA2_iB3_Addr32]) +#define VIA2_iB3_ChangeNtfy Addr32_ChangeNtfy + + Wire_VIA1_iA4_MemOverlay, +#define MemOverlay (Wires[Wire_VIA1_iA4_MemOverlay]) +#define VIA1_iA4 (Wires[Wire_VIA1_iA4_MemOverlay]) +#define VIA1_iA4_ChangeNtfy MemOverlay_ChangeNtfy + + Wire_VIA1_iA5_IWMvSel, +#define IWMvSel (Wires[Wire_VIA1_iA5_IWMvSel]) +#define VIA1_iA5 (Wires[Wire_VIA1_iA5_IWMvSel]) + + Wire_VIA1_iA7_SCCwaitrq, +#define SCCwaitrq (Wires[Wire_VIA1_iA7_SCCwaitrq]) +#define VIA1_iA7 (Wires[Wire_VIA1_iA7_SCCwaitrq]) + + Wire_VIA1_iB0_RTCdataLine, +#define RTCdataLine (Wires[Wire_VIA1_iB0_RTCdataLine]) +#define VIA1_iB0 (Wires[Wire_VIA1_iB0_RTCdataLine]) +#define VIA1_iB0_ChangeNtfy RTCdataLine_ChangeNtfy + + Wire_VIA1_iB1_RTCclock, +#define RTCclock (Wires[Wire_VIA1_iB1_RTCclock]) +#define VIA1_iB1 (Wires[Wire_VIA1_iB1_RTCclock]) +#define VIA1_iB1_ChangeNtfy RTCclock_ChangeNtfy + + Wire_VIA1_iB2_RTCunEnabled, +#define RTCunEnabled (Wires[Wire_VIA1_iB2_RTCunEnabled]) +#define VIA1_iB2 (Wires[Wire_VIA1_iB2_RTCunEnabled]) +#define VIA1_iB2_ChangeNtfy RTCunEnabled_ChangeNtfy + + Wire_VIA1_iA3_SCCvSync, +#define VIA1_iA3 (Wires[Wire_VIA1_iA3_SCCvSync]) + + Wire_VIA1_iB3_ADB_Int, +#define ADB_Int (Wires[Wire_VIA1_iB3_ADB_Int]) +#define VIA1_iB3 (Wires[Wire_VIA1_iB3_ADB_Int]) + + Wire_VIA1_iB4_ADB_st0, +#define ADB_st0 (Wires[Wire_VIA1_iB4_ADB_st0]) +#define VIA1_iB4 (Wires[Wire_VIA1_iB4_ADB_st0]) +#define VIA1_iB4_ChangeNtfy ADBstate_ChangeNtfy + + Wire_VIA1_iB5_ADB_st1, +#define ADB_st1 (Wires[Wire_VIA1_iB5_ADB_st1]) +#define VIA1_iB5 (Wires[Wire_VIA1_iB5_ADB_st1]) +#define VIA1_iB5_ChangeNtfy ADBstate_ChangeNtfy + + Wire_VIA1_iCB2_ADB_Data, +#define ADB_Data (Wires[Wire_VIA1_iCB2_ADB_Data]) +#define VIA1_iCB2 (Wires[Wire_VIA1_iCB2_ADB_Data]) +#define VIA1_iCB2_ChangeNtfy ADB_DataLineChngNtfy + + Wire_VIA1_InterruptRequest, +#define VIA1_InterruptRequest (Wires[Wire_VIA1_InterruptRequest]) +#define VIA1_interruptChngNtfy VIAorSCCinterruptChngNtfy + + Wire_SCCInterruptRequest, +#define SCCInterruptRequest (Wires[Wire_SCCInterruptRequest]) +#define SCCinterruptChngNtfy VIAorSCCinterruptChngNtfy + + Wire_ADBMouseDisabled, +#define ADBMouseDisabled (Wires[Wire_ADBMouseDisabled]) + + Wire_VBLinterrupt, +#define Vid_VBLinterrupt (Wires[Wire_VBLinterrupt]) +#define VIA2_iA0 (Wires[Wire_VBLinterrupt]) + + Wire_VBLintunenbl, +#define Vid_VBLintunenbl (Wires[Wire_VBLintunenbl]) + + kNumWires +}; + + +/* VIA configuration */ +#define VIA1_ORA_FloatVal 0xBF + /* bit 6 used to check version of hardware */ +#define VIA1_ORB_FloatVal 0xFF +#define VIA1_ORA_CanIn 0x80 +#define VIA1_ORA_CanOut 0x3F +#define VIA1_ORB_CanIn 0x09 +#define VIA1_ORB_CanOut 0xB7 +#define VIA1_IER_Never0 0x00 +#define VIA1_IER_Never1 0x58 +#define VIA1_CB2modesAllowed 0x01 +#define VIA1_CA2modesAllowed 0x01 + +/* VIA 2 configuration */ +#define VIA2_ORA_FloatVal 0xFF +#define VIA2_ORB_FloatVal 0xFF +#define VIA2_ORA_CanIn 0x01 +#define VIA2_ORA_CanOut 0xC0 +#define VIA2_ORB_CanIn 0x00 +#define VIA2_ORB_CanOut 0x8C +#define VIA2_IER_Never0 0x00 +#define VIA2_IER_Never1 0xED +#define VIA2_CB2modesAllowed 0x01 +#define VIA2_CA2modesAllowed 0x01 + +#define Mouse_Enabled() (! ADBMouseDisabled) + +#define VIA1_iCA1_PulseNtfy VIA1_iCA1_Sixtieth_PulseNtfy +#define Sixtieth_PulseNtfy VIA1_iCA1_Sixtieth_PulseNtfy + +#define VIA1_iCA2_PulseNtfy VIA1_iCA2_RTC_OneSecond_PulseNtfy +#define RTC_OneSecond_PulseNtfy VIA1_iCA2_RTC_OneSecond_PulseNtfy + +#define VIA2_iCA1_PulseNtfy VIA2_iCA1_Vid_VBLinterrupt_PulseNtfy +#define Vid_VBLinterrupt_PulseNotify VIA2_iCA1_Vid_VBLinterrupt_PulseNtfy + +#define VIA2_iCB1_PulseNtfy VIA2_iCB1_ASC_interrupt_PulseNtfy +#define ASC_interrupt_PulseNtfy VIA2_iCB1_ASC_interrupt_PulseNtfy + +#define GetSoundInvertTime VIA1_GetT1InvertTime + +#define ADB_ShiftInData VIA1_ShiftOutData +#define ADB_ShiftOutData VIA1_ShiftInData + +#define kCheckSumRom_Size kROM_Size + +#define kExtn_Block_Base 0x50F0C000 +#define kExtn_ln2Spc 5 + +#define kROM_Base 0x00800000 +#define kROM_ln2Spc 20 + +#define WantDisasm 0 +#define ExtraAbnormalReports 0 diff --git a/Mini vMac/MacII/CNFGGLOB.h b/Mini vMac/MacII/CNFGGLOB.h index 294f5f2..100ba09 100644 --- a/Mini vMac/MacII/CNFGGLOB.h +++ b/Mini vMac/MacII/CNFGGLOB.h @@ -17,7 +17,7 @@ #define kROM_Size 0x00040000 #ifdef PLIST_PREPROCESSOR -#define MNVMBundleDisplayName Mac II +#define MNVMBundleDisplayName Mac II (1024×768) #define MNVMBundleGetInfoString 8M, 1024×768 #else #include "../CNFGGLOB.h"