Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-18 06:31:57 +00:00
Code Issues Projects Releases Wiki Activity

Initial version for supporting the IMC-2001 (Taiwanese Apple ][ clone):

Browse Source 
* a new entry in the list of clones and a dedicated RUN button
* has differences in IMC2001.rom to support Apple ][e like
  lowercase characters in the monitor ROM
* the video ROM for 40-character more IMC2001-Video.rom is quite different
  (mainly to support lowercase ASCII characters in NORMAL mode)
* the keybaord act more like a Apple][e, decided to use the CAPS mode
  switch as for the Apple][e in the emulator
* TODO: support for special keyboard features like the separate HOME, DEL,
  UP, DOWN, LEFT, RIGHT block of keys. Also F1 to F12 keys which are
  hard-coded in the keyboard ROM (with a switch for APPLE and CP/M mode)
This commit is contained in:
Andreas Baumann 2024-11-08 11:21:39 +01:00
parent 5ddb2357aa
commit b207534426
18 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AppleWin-VS2022.vcxproj
View File

@ -303,6 +303,8 @@
<None Include="resource\Apple2_Plus.rom" />
<None Include="resource\Base64A.rom" />
<None Include="resource\Base64A_German_Video.rom" />
<None Include="resource\IMC2001.rom" />
<None Include="resource\IMC2001-Video.rom" />
<None Include="resource\Disk2-13sector.rom" />
<None Include="resource\DISK2.rom" />
<None Include="resource\Freezes_Non-autostart_F8_Rom.rom" />
@ -367,6 +369,7 @@
<Image Include="resource\RUN.BMP" />
<Image Include="resource\RUN3000E.bmp" />
<Image Include="resource\RUNBASE64A.BMP" />
<Image Include="resource\RUNIMC2001.BMP" />
<Image Include="resource\RUNP.BMP" />
<Image Include="resource\SETUP.BMP" />
</ItemGroup>

9
AppleWin-VS2022.vcxproj.filters
View File

@ -734,6 +734,9 @@
<Image Include="resource\ApplewinLogo.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="resource\RUNIMC2001.BMP">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<None Include="resource\Apple2.rom">
@ -799,6 +802,12 @@
<None Include="resource\Base64A_German_Video.rom">
<Filter>Resource Files</Filter>
</None>
<None Include="resource\IMC2001.rom">
<Filter>Resource Files</Filter>
</None>
<None Include="resource\IMC2001-Video.rom">
<Filter>Resource Files</Filter>
</None>
<None Include="resource\Apple2_JPlus.rom">
<Filter>Resource Files</Filter>
</None>

3
resource/Applewin.rc
View File

@ -56,6 +56,7 @@ RUN_BUTTON BITMAP "RUN.BMP"
RUNP_BUTTON BITMAP "RUNP.BMP"
RUN3000E_BUTTON BITMAP "RUN3000E.BMP"
RUNBASE64A_BUTTON BITMAP "RUNBASE64A.BMP"
RUNIMC2001_BUTTON BITMAP "RUNIMC2001.BMP"
DEBUG_BUTTON BITMAP "DEBUG.BMP"
DRIVE1_BUTTON BITMAP "DRIVE1.BMP"
DRIVE2_BUTTON BITMAP "DRIVE2.BMP"
@ -354,6 +355,7 @@ IDR_PRAVETS_8M_ROM ROM "Pravets8M.rom"
IDR_PRAVETS_8C_ROM ROM "Pravets8C.rom"
IDR_TK3000_2E_ROM ROM "TK3000e.rom"
IDR_BASE_64A_ROM ROM "Base64A.rom"
IDR_IMC2001_ROM ROM "IMC2001.rom"
IDR_FREEZES_F8_ROM ROM "FREEZES_NON-AUTOSTART_F8_ROM.rom"
/////////////////////////////////////////////////////////////////////////////
@ -365,6 +367,7 @@ IDR_APPLE2_VIDEO_ROM ROM "Apple2_Video.rom"
IDR_APPLE2_JPLUS_VIDEO_ROM ROM "Apple2_JPlus_Video.rom"
IDR_APPLE2E_ENHANCED_VIDEO_ROM ROM "Apple2e_Enhanced_Video.rom"
IDR_BASE64A_VIDEO_ROM ROM "Base64A_German_Video.rom"
IDR_IMC2001_VIDEO_ROM ROM "IMC2001-Video.rom"
/////////////////////////////////////////////////////////////////////////////
//

BIN
resource/IMC2001-Video.rom Normal file
View File

Binary file not shown.

BIN
resource/IMC2001.rom Normal file
View File

Binary file not shown.

BIN
resource/RUNIMC2001.BMP Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

2
resource/resource.h
View File

@ -56,6 +56,8 @@
#define IDR_BASE64A_VIDEO_ROM 154
#define IDR_HDDRVR_V2_FW 155
#define IDR_HDC_SMARTPORT_FW 156
#define IDR_IMC2001_ROM 157
#define IDR_IMC2001_VIDEO_ROM 158
#define IDC_KEYB_BUFFER_ENABLE 1005
#define IDC_SAVESTATE 1006
#define IDC_SAVESTATE_ON_EXIT 1007

7
source/Common.h
View File

@ -57,6 +57,7 @@ enum AppMode_e
#define TITLE_PRAVETS_8A TEXT("Pravets 8A Emulator")
#define TITLE_TK3000_2E TEXT("TK3000 //e Emulator")
#define TITLE_BASE64A TEXT("Base64A Emulator")
#define TITLE_IMC2001 TEXT("IMC-2001 Emulator")
#define TITLE_PAUSED TEXT("* PAUSED *")
#define TITLE_STEPPING TEXT("Stepping")
@ -181,6 +182,7 @@ enum eApple2Type {
A2TYPE_PRAVETS8M, // Apple ][ clone
A2TYPE_PRAVETS82, // Apple ][ clone
A2TYPE_BASE64A, // Apple ][ clone
A2TYPE_IMC2001, // Apple ][ clone
// (Gap for more Apple ][ clones)
A2TYPE_CLONE_A2_MAX,
@ -250,6 +252,11 @@ inline bool IsPravets(eApple2Type type)
return type == A2TYPE_PRAVETS8M || type == A2TYPE_PRAVETS82 || type == A2TYPE_PRAVETS8A;
}
inline bool IsIMC2001(eApple2Type type)
{
return type == A2TYPE_IMC2001;
}
enum eBUTTON {BUTTON0=0, BUTTON1};
enum eBUTTONSTATE {BUTTON_UP=0, BUTTON_DOWN};

7
source/Configuration/PageAdvanced.cpp
View File

@ -36,13 +36,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
CPageAdvanced* CPageAdvanced::ms_this = 0; // reinit'd in ctor
enum CLONECHOICE {MENUITEM_CLONEMIN, MENUITEM_PRAVETS82=MENUITEM_CLONEMIN, MENUITEM_PRAVETS8M, MENUITEM_PRAVETS8A, MENUITEM_TK30002E, MENUITEM_BASE64A, MENUITEM_CLONEMAX};
enum CLONECHOICE {MENUITEM_CLONEMIN, MENUITEM_PRAVETS82=MENUITEM_CLONEMIN, MENUITEM_PRAVETS8M, MENUITEM_PRAVETS8A, MENUITEM_TK30002E, MENUITEM_BASE64A, MENUITEM_IMC2001, MENUITEM_CLONEMAX};
const TCHAR CPageAdvanced::m_CloneChoices[] =
TEXT("Pravets 82\0") // Bulgarian
TEXT("Pravets 8M\0") // Bulgarian
TEXT("Pravets 8A\0") // Bulgarian
TEXT("TK3000 //e\0") // Brazilian
TEXT("Base 64A\0"); // Taiwanese
TEXT("Base 64A\0") // Taiwanese
TEXT("IMC 2001\0"); // Taiwanese
const TCHAR CPageAdvanced::m_gameIOConnectorChoices[] =
"Empty\0"
@ -251,6 +252,7 @@ eApple2Type CPageAdvanced::GetCloneType(DWORD NewMenuItem)
case MENUITEM_PRAVETS8A: return A2TYPE_PRAVETS8A;
case MENUITEM_TK30002E: return A2TYPE_TK30002E;
case MENUITEM_BASE64A: return A2TYPE_BASE64A;
case MENUITEM_IMC2001: return A2TYPE_IMC2001;
default: return A2TYPE_PRAVETS82;
}
}
@ -279,6 +281,7 @@ int CPageAdvanced::GetCloneMenuItem(void)
case A2TYPE_PRAVETS8A: nMenuItem = MENUITEM_PRAVETS8A; break;
case A2TYPE_TK30002E: nMenuItem = MENUITEM_TK30002E; break;
case A2TYPE_BASE64A: nMenuItem = MENUITEM_BASE64A; break;
case A2TYPE_IMC2001: nMenuItem = MENUITEM_IMC2001; break;
default: // New clone needs adding here?
_ASSERT(0);
}

1
source/Configuration/PageConfig.cpp
View File

@ -207,6 +207,7 @@ INT_PTR CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPA
case A2TYPE_PRAVETS8A: nCurrentChoice = MENUITEM_CLONE; break;
case A2TYPE_TK30002E: nCurrentChoice = MENUITEM_CLONE; break;
case A2TYPE_BASE64A: nCurrentChoice = MENUITEM_CLONE; break;
case A2TYPE_IMC2001: nCurrentChoice = MENUITEM_CLONE; break;
default: _ASSERT(0); break;
}

12
source/Keyboard.cpp
View File

@ -134,7 +134,7 @@ void KeybQueueKeypress (WPARAM key, Keystroke_e bASCII)
return;
// Initially default to non-clone behaviour:
if (IsAppleIIeOrAbove(GetApple2Type()))
if (IsAppleIIeOrAbove(GetApple2Type()) || IsIMC2001(GetApple2Type()))
{
if (!IS_CLONE() && key > 0x7F) // accented chars, eg. AltGr+A
return;
@ -223,6 +223,14 @@ void KeybQueueKeypress (WPARAM key, Keystroke_e bASCII)
if (key >= VK_LEFT && key <= VK_DELETE)
{
UINT model = IsCopamBase64A(GetApple2Type()) ? 2 : IS_APPLE2 ? 0 : 1;
if (IsIMC2001(GetApple2Type()))
{
// TODO: the IMC-2001 actually has black LEFT and RIGTH arrow keys which behave as
// on an Apple IIe, but it also has light arrow keys UP, DOWN, LEFT, RIGHT, which
// actually position the cursor on the screen, not sure how to emulate this.
// for now just doing the black LEFT and RIGHT keys
model = 1;
}
BYTE n = asciicode[model][key - VK_LEFT]; // Convert to Apple arrow keycode
if (!n)
return;
@ -450,7 +458,7 @@ BYTE KeybReadFlag (void)
//===========================================================================
void KeybToggleCapsLock ()
{
if (!IS_APPLE2)
if (!IS_APPLE2 ||IsIMC2001(g_Apple2Type))
{
g_bCapsLock = (GetKeyState(VK_CAPITAL) & 1);
GetFrame().FrameRefreshStatus(DRAW_LEDS | DRAW_DISK_STATUS);

2
source/Memory.cpp
View File

@ -1731,6 +1731,7 @@ void MemInitializeROM(void)
case A2TYPE_PRAVETS8A: resourceId = IDR_PRAVETS_8C_ROM ; ROM_SIZE = Apple2eRomSize; break;
case A2TYPE_TK30002E: resourceId = IDR_TK3000_2E_ROM ; ROM_SIZE = Apple2eRomSize; break;
case A2TYPE_BASE64A: resourceId = IDR_BASE_64A_ROM ; ROM_SIZE = Base64ARomSize; break;
case A2TYPE_IMC2001: resourceId = IDR_IMC2001_ROM ; ROM_SIZE = Apple2RomSize; break;
}
BYTE* pData = NULL;
@ -1754,6 +1755,7 @@ void MemInitializeROM(void)
case A2TYPE_PRAVETS8A: _tcscpy(sRomFileName, TEXT("PRAVETS8C.ROM" )); break;
case A2TYPE_TK30002E: _tcscpy(sRomFileName, TEXT("TK3000e.ROM" )); break;
case A2TYPE_BASE64A: _tcscpy(sRomFileName, TEXT("BASE64A.ROM" )); break;
case A2TYPE_IMC2001: _tcscpy(sRomFileName, TEXT("IMC2001.ROM" )); break;
default:
{
_tcscpy(sRomFileName, TEXT("Unknown type!"));

1
source/NTSC.cpp
View File

@ -367,6 +367,7 @@ static void set_csbits()
case A2TYPE_PRAVETS8A: csbits = &csbits_pravets8C[0]; break; // Apple //e clone
case A2TYPE_TK30002E: csbits = &csbits_enhanced2e[0]; break; // Enhanced Apple //e clone
case A2TYPE_BASE64A: csbits = &csbits_base64a[GetVideo().GetVideoRomRockerSwitch() ? 0 : 1]; g_nVideoCharSet = 0; break; // Apple ][ clone
case A2TYPE_IMC2001: csbits = &csbits_imc2001[0]; g_nVideoCharSet = 0; break;
default: _ASSERT(0); csbits = &csbits_enhanced2e[0]; break;
}
}

30
source/NTSC_CharSet.cpp
View File

@ -35,7 +35,7 @@ unsigned char csbits_pravets82[1][256][8]; // Pravets 82
unsigned char csbits_pravets8M[1][256][8]; // Pravets 8M
unsigned char csbits_pravets8C[2][256][8]; // Pravets 8A & 8C
unsigned char csbits_base64a[2][256][8]; // Base 64A
unsigned char csbits_imc2001[1][256][8]; // IMC-2001
//
@ -198,6 +198,12 @@ static void userVideoRom2K(csbits_t csbits, const BYTE* pVideoRom, const eApple2
{
BYTE n = pVideoRom[RA+y];
if (type == A2TYPE_IMC2001)
{
// characters are shifted by one position in the ROM
n = ( n >> 1 );
}
// UTAII:8-30 "Bit 7 of your EPROM fonts will control flashing in the lower 1024 bytes of the EPROM"
// UTAII:8-31 "If you leave O7 (EPROM Output7) reset in these patterns, the resulting characters will be inversions..."
// Apple II J-Plus: simplest logic is just invert if reading low 1K of video ROM
@ -209,6 +215,12 @@ static void userVideoRom2K(csbits_t csbits, const BYTE* pVideoRom, const eApple2
if (!(n & 0x01))
n = n ^ 0xfe;
}
else if (type == A2TYPE_IMC2001)
{
// for now just unconditionally negate the pattern for inverse (does
// this work for small letters too?)
n = n ^ 0xfe;
}
else
{
if (!(n & 0x80) || (type == A2TYPE_APPLE2JPLUS))
@ -222,6 +234,11 @@ static void userVideoRom2K(csbits_t csbits, const BYTE* pVideoRom, const eApple2
// On the Base 64A bits are ordered 1345672.
d = (n >> 2) | ((n & 2) >> 1) | ((n & 4) << 4);
}
else if (type == A2TYPE_IMC2001)
{
// bits are reversed and shifted
d = (n >> 1);
}
else
{
// UTAII:8-30 "TEXT ROM pattern is ... reversed"
@ -255,6 +272,15 @@ static void VideoRomForIIandIIPlus(void)
userVideoRom2K(&csbits_a2[0], pVideoRom);
}
static void VideoRomForImc2001()
{
BYTE* pVideoRom = GetFrame().GetResource(IDR_IMC2001_VIDEO_ROM, "ROM", Video::kVideoRomSize2K);
if (pVideoRom == NULL)
return;
userVideoRom2K(&csbits_imc2001[0], pVideoRom, A2TYPE_IMC2001, 0);
}
static void VideoRomForIIJPlus(void)
{
BYTE* pVideoRom = GetFrame().GetResource(IDR_APPLE2_JPLUS_VIDEO_ROM, "ROM", Video::kVideoRomSize2K);
@ -303,6 +329,8 @@ void make_csbits(void)
VideoRomForIIJPlus(); // GH#773
VideoRomForBase64A(); // GH#806
VideoRomForImc2001();
// Try to use any user-provided video ROM for Original/Enhanced //e
userVideoRomForIIe();

1
source/NTSC_CharSet.h
View File

@ -9,6 +9,7 @@ extern unsigned char csbits_pravets82[1][256][8]; // Pravets 82
extern unsigned char csbits_pravets8M[1][256][8]; // Pravets 8M
extern unsigned char csbits_pravets8C[2][256][8]; // Pravets 8A & 8C
extern unsigned char csbits_base64a[2][256][8]; // Base64A
extern unsigned char csbits_imc2001[1][256][8]; // IMC-2001
void make_csbits(void);

3
source/SaveState.cpp
View File

@ -208,6 +208,7 @@ static const std::string& GetSnapshotUnitMiscName(void)
#define SS_YAML_VALUE_PRAVETS8A "Pravets8A"
#define SS_YAML_VALUE_TK30002E "TK3000//e"
#define SS_YAML_VALUE_BASE64A "Base 64A"
#define SS_YAML_VALUE_IMC2001 "IMC 2001"
static eApple2Type ParseApple2Type(std::string type)
{
@ -222,6 +223,7 @@ static eApple2Type ParseApple2Type(std::string type)
else if (type == SS_YAML_VALUE_PRAVETS8A) return A2TYPE_PRAVETS8A;
else if (type == SS_YAML_VALUE_TK30002E) return A2TYPE_TK30002E;
else if (type == SS_YAML_VALUE_BASE64A) return A2TYPE_BASE64A;
else if (type == SS_YAML_VALUE_IMC2001) return A2TYPE_IMC2001;
throw std::runtime_error("Load: Unknown Apple2 type");
}
@ -241,6 +243,7 @@ static std::string GetApple2TypeAsString(void)
case A2TYPE_PRAVETS8A: return SS_YAML_VALUE_PRAVETS8A;
case A2TYPE_TK30002E: return SS_YAML_VALUE_TK30002E;
case A2TYPE_BASE64A: return SS_YAML_VALUE_BASE64A;
case A2TYPE_IMC2001: return SS_YAML_VALUE_IMC2001;
default:
throw std::runtime_error("Save: Unknown Apple2 type");
}

1
source/Utilities.cpp
View File

@ -477,6 +477,7 @@ void GetAppleWindowTitle()
case A2TYPE_PRAVETS8A: g_pAppTitle = TITLE_PRAVETS_8A; break;
case A2TYPE_TK30002E: g_pAppTitle = TITLE_TK3000_2E; break;
case A2TYPE_BASE64A: g_pAppTitle = TITLE_BASE64A; break;
case A2TYPE_IMC2001: g_pAppTitle = TITLE_IMC2001; break;
}
#if _DEBUG

3
source/Windows/WinFrame.cpp
View File

@ -196,6 +196,9 @@ void Win32Frame::CreateGdiObjects(void)
case A2TYPE_BASE64A:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUNBASE64A_BUTTON"));
break;
case A2TYPE_IMC2001:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUNIMC2001_BUTTON"));
break;
default:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUN_BUTTON"));
break;