Macintosh-Tools/uvmac
1
0
Fork 0
mirror of https://github.com/InvisibleUp/uvmac.git synced 2024-12-22 07:31:39 +00:00
Code Issues Projects Releases Wiki Activity

Move some #define fields into enums

Browse Source
This commit is contained in:
InvisibleUp 2020-04-15 20:42:56 -04:00
parent efb229d8d5
commit c7d505dcb6
4 changed files with 200 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,4 +3,5 @@
.vscode/* .vscode/*
bld bld
*.dsk *.dsk
*.ROM *.ROM
*.kdev4

31
src/ERRCODES.h Normal file
View File

@ -0,0 +1,31 @@
/*
error codes returned by Mini vMac extensions
(passed back to the emulated 68k code).
*/
#ifndef ERRCODES_H
#define ERRCODES_H
typedef enum MacErr {
mnvm_noErr = 0x0000, /* 0 - No Error */
mnvm_miscErr = 0xFFFF, /* 1 - Should probably replace these */
mnvm_controlErr = 0xFFEF, /* 17 - I/O System Errors */
mnvm_statusErr = 0xFFEE, /* 18 - Driver can't respond to Status call */
mnvm_closErr = 0xFFE8, /* 24 - I/O System Errors */
mnvm_eofErr = 0xFFD9, /* 39 - End of file */
mnvm_tmfoErr = 0xFFD6, /* 42 - too many files open */
mnvm_fnfErr = 0xFFD5, /* 43 - File not found */
mnvm_wPrErr = 0xFFD4, /* 44 - diskette is write protected */
mnvm_vLckdErr = 0xFFD2, /* 46 - volume is locked */
mnvm_dupFNErr = 0xFFD0, /* 48 - duplicate filename */
mnvm_opWrErr = 0xFFCF, /* 49 - file already open with with write permission */
mnvm_paramErr = 0xFFCE, /* 50 - error in parameter list */
mnvm_permErr = 0xFFCA, /* 54 - permissions error (on file open) */
mnvm_nsDrvErr = 0xFFC8, /* 56 - No Such Drive */
mnvm_wrPermErr = 0xFFC3, /* 61 - write permissions error */
mnvm_offLinErr = 0xFFBF, /* 65 - off-line drive */
mnvm_dirNFErr = 0xFF88, /* 120 - directory not found */
mnvm_afpAccessDenied = 0xEC78, /* 5000 - Insufficient access privileges for operation */
} MacErr_t;
#endif // ERRCODES_H

145
src/HW/KBRD/KEYCODES.h Normal file
View File

@ -0,0 +1,145 @@
#ifndef KEYCODES_H
#define KEYCODES_H
#define MKC_A 0x00
#define MKC_B 0x0B
#define MKC_C 0x08
#define MKC_D 0x02
#define MKC_E 0x0E
#define MKC_F 0x03
#define MKC_G 0x05
#define MKC_H 0x04
#define MKC_I 0x22
#define MKC_J 0x26
#define MKC_K 0x28
#define MKC_L 0x25
#define MKC_M 0x2E
#define MKC_N 0x2D
#define MKC_O 0x1F
#define MKC_P 0x23
#define MKC_Q 0x0C
#define MKC_R 0x0F
#define MKC_S 0x01
#define MKC_T 0x11
#define MKC_U 0x20
#define MKC_V 0x09
#define MKC_W 0x0D
#define MKC_X 0x07
#define MKC_Y 0x10
#define MKC_Z 0x06
#define MKC_1 0x12
#define MKC_2 0x13
#define MKC_3 0x14
#define MKC_4 0x15
#define MKC_5 0x17
#define MKC_6 0x16
#define MKC_7 0x1A
#define MKC_8 0x1C
#define MKC_9 0x19
#define MKC_0 0x1D
#define MKC_Command 0x37
#define MKC_Shift 0x38
#define MKC_CapsLock 0x39
#define MKC_Option 0x3A
#define MKC_Space 0x31
#define MKC_Return 0x24
#define MKC_BackSpace 0x33
#define MKC_Tab 0x30
#define MKC_Left /* 0x46 */ 0x7B
#define MKC_Right /* 0x42 */ 0x7C
#define MKC_Down /* 0x48 */ 0x7D
#define MKC_Up /* 0x4D */ 0x7E
#define MKC_Minus 0x1B
#define MKC_Equal 0x18
#define MKC_BackSlash 0x2A
#define MKC_Comma 0x2B
#define MKC_Period 0x2F
#define MKC_Slash 0x2C
#define MKC_SemiColon 0x29
#define MKC_SingleQuote 0x27
#define MKC_LeftBracket 0x21
#define MKC_RightBracket 0x1E
#define MKC_Grave 0x32
#define MKC_Clear 0x47
#define MKC_KPEqual 0x51
#define MKC_KPDevide 0x4B
#define MKC_KPMultiply 0x43
#define MKC_KPSubtract 0x4E
#define MKC_KPAdd 0x45
#define MKC_Enter 0x4C
#define MKC_KP1 0x53
#define MKC_KP2 0x54
#define MKC_KP3 0x55
#define MKC_KP4 0x56
#define MKC_KP5 0x57
#define MKC_KP6 0x58
#define MKC_KP7 0x59
#define MKC_KP8 0x5B
#define MKC_KP9 0x5C
#define MKC_KP0 0x52
#define MKC_Decimal 0x41
/* these aren't on the Mac Plus keyboard */
#define MKC_Control 0x3B
#define MKC_Escape 0x35
#define MKC_F1 0x7a
#define MKC_F2 0x78
#define MKC_F3 0x63
#define MKC_F4 0x76
#define MKC_F5 0x60
#define MKC_F6 0x61
#define MKC_F7 0x62
#define MKC_F8 0x64
#define MKC_F9 0x65
#define MKC_F10 0x6d
#define MKC_F11 0x67
#define MKC_F12 0x6f
#define MKC_Home 0x73
#define MKC_End 0x77
#define MKC_PageUp 0x74
#define MKC_PageDown 0x79
#define MKC_Help 0x72 /* = Insert */
#define MKC_ForwardDel 0x75
#define MKC_Print 0x69
#define MKC_ScrollLock 0x6B
#define MKC_Pause 0x71
#define MKC_AngleBracket 0x0A /* found on german keyboard */
/*
Additional codes found in Apple headers
#define MKC_RightShift 0x3C
#define MKC_RightOption 0x3D
#define MKC_RightControl 0x3E
#define MKC_Function 0x3F
#define MKC_VolumeUp 0x48
#define MKC_VolumeDown 0x49
#define MKC_Mute 0x4A
#define MKC_F16 0x6A
#define MKC_F17 0x40
#define MKC_F18 0x4F
#define MKC_F19 0x50
#define MKC_F20 0x5A
#define MKC_F13 MKC_Print
#define MKC_F14 MKC_ScrollLock
#define MKC_F15 MKC_Pause
*/
/* not Apple key codes, only for Mini vMac */
#define MKC_CM 0x80
#define MKC_None 0xFF
#endif // KEYCODES_H

230
src/UI/MYOSGLUE.h
View File

@ -29,7 +29,8 @@
#define MYOSGLUE_H #define MYOSGLUE_H
#include "UTIL/DATE2SEC.h" #include "UTIL/DATE2SEC.h"
#include "HW/KBRD/KEYCODES.h"
#include "ERRCODES.h"
#if WantAbnormalReports #if WantAbnormalReports
EXPORTOSGLUPROC WarnMsgAbnormalID(uint16_t id); EXPORTOSGLUPROC WarnMsgAbnormalID(uint16_t id);
@ -45,70 +46,23 @@ EXPORTOSGLUPROC dbglog_writeln(char *s);
EXPORTOSGLUPROC dbglog_writelnNum(char *s, simr v); EXPORTOSGLUPROC dbglog_writelnNum(char *s, simr v);
#endif #endif
EXPORTOSGLUPROC ReserveAllocOneBlock(uint8_t * *p, uimr n, uint8_t align, EXPORTOSGLUPROC ReserveAllocOneBlock(
bool FillOnes); uint8_t * *p, uimr n, uint8_t align, bool FillOnes
);
EXPORTOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount); EXPORTOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount);
EXPORTVAR(uint8_t *, ROM) EXPORTVAR(uint8_t *, ROM)
/*
error codes returned by Mini vMac extensions
(passed back to the emulated 68k code).
*/
#define tMacErr uint16_t
#define mnvm_noErr ((tMacErr) 0x0000)
/* (uint16_t) 0 - No Error */
#define mnvm_miscErr ((tMacErr) 0xFFFF)
/* (uint16_t) - 1 - Should probably replace these */
#define mnvm_controlErr ((tMacErr) 0xFFEF)
/* (uint16_t) - 17 - I/O System Errors */
#define mnvm_statusErr ((tMacErr) 0xFFEE)
/* (uint16_t) - 18 - Driver can't respond to Status call */
#define mnvm_closErr ((tMacErr) 0xFFE8)
/* (uint16_t) - 24 - I/O System Errors */
#define mnvm_eofErr ((tMacErr) 0xFFD9)
/* (uint16_t) - 39 - End of file */
#define mnvm_tmfoErr ((tMacErr) 0xFFD6)
/* (uint16_t) - 42 - too many files open */
#define mnvm_fnfErr ((tMacErr) 0xFFD5)
/* (uint16_t) - 43 - File not found */
#define mnvm_wPrErr ((tMacErr) 0xFFD4)
/* (uint16_t) - 44 - diskette is write protected */
#define mnvm_vLckdErr ((tMacErr) 0xFFD2)
/* (uint16_t) - 46 - volume is locked */
#define mnvm_dupFNErr ((tMacErr) 0xFFD0)
/* (uint16_t) - 48 - duplicate filename */
#define mnvm_opWrErr ((tMacErr) 0xFFCF)
/* (uint16_t) - 49 - file already open with with write permission */
#define mnvm_paramErr ((tMacErr) 0xFFCE)
/* (uint16_t) - 50 - error in parameter list */
#define mnvm_permErr ((tMacErr) 0xFFCA)
/* (uint16_t) - 54 - permissions error (on file open) */
#define mnvm_nsDrvErr ((tMacErr) 0xFFC8)
/* (uint16_t) - 56 - No Such Drive */
#define mnvm_wrPermErr ((tMacErr) 0xFFC3)
/* (uint16_t) - 61 - write permissions error */
#define mnvm_offLinErr ((tMacErr) 0xFFBF)
/* (uint16_t) - 65 - off-line drive */
#define mnvm_dirNFErr ((tMacErr) 0xFF88)
/* (uint16_t) - 120 - directory not found */
#define mnvm_afpAccessDenied ((tMacErr) 0xEC78)
/* (uint16_t) - 5000 - Insufficient access privileges for operation */
#if IncludePbufs #if IncludePbufs
#define tPbuf uint16_t #define tPbuf uint16_t
#define NotAPbuf ((tPbuf)0xFFFF) #define NotAPbuf ((tPbuf)0xFFFF)
EXPORTOSGLUFUNC tMacErr CheckPbuf(tPbuf Pbuf_No); EXPORTOSGLUFUNC MacErr_t CheckPbuf(tPbuf Pbuf_No);
EXPORTOSGLUFUNC tMacErr PbufGetSize(tPbuf Pbuf_No, uint32_t *Count); EXPORTOSGLUFUNC MacErr_t PbufGetSize(tPbuf Pbuf_No, uint32_t *Count);
EXPORTOSGLUFUNC tMacErr PbufNew(uint32_t count, tPbuf *r); EXPORTOSGLUFUNC MacErr_t PbufNew(uint32_t count, tPbuf *r);
EXPORTOSGLUPROC PbufDispose(tPbuf i); EXPORTOSGLUPROC PbufDispose(tPbuf i);
EXPORTOSGLUPROC PbufTransfer(uint8_t * Buffer, EXPORTOSGLUPROC PbufTransfer(uint8_t * Buffer,
tPbuf i, uint32_t offset, uint32_t count, bool IsWrite); tPbuf i, uint32_t offset, uint32_t count, bool IsWrite);
@ -123,11 +77,11 @@ EXPORTVAR(uint32_t, vSonyInsertedMask)
#define vSonyIsInserted(Drive_No) \ #define vSonyIsInserted(Drive_No) \
((vSonyInsertedMask & ((uint32_t)1 << (Drive_No))) != 0) ((vSonyInsertedMask & ((uint32_t)1 << (Drive_No))) != 0)
EXPORTOSGLUFUNC tMacErr vSonyTransfer(bool IsWrite, uint8_t * Buffer, EXPORTOSGLUFUNC MacErr_t vSonyTransfer(bool IsWrite, uint8_t * Buffer,
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count, tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
uint32_t *Sony_ActCount); uint32_t *Sony_ActCount);
EXPORTOSGLUFUNC tMacErr vSonyEject(tDrive Drive_No); EXPORTOSGLUFUNC MacErr_t vSonyEject(tDrive Drive_No);
EXPORTOSGLUFUNC tMacErr vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count); EXPORTOSGLUFUNC MacErr_t vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count);
EXPORTOSGLUFUNC bool AnyDiskInserted(void); EXPORTOSGLUFUNC bool AnyDiskInserted(void);
EXPORTOSGLUPROC DiskRevokeWritable(tDrive Drive_No); EXPORTOSGLUPROC DiskRevokeWritable(tDrive Drive_No);
@ -139,7 +93,7 @@ EXPORTVAR(bool, vSonyRawMode)
#if IncludeSonyNew #if IncludeSonyNew
EXPORTVAR(bool, vSonyNewDiskWanted) EXPORTVAR(bool, vSonyNewDiskWanted)
EXPORTVAR(uint32_t, vSonyNewDiskSize) EXPORTVAR(uint32_t, vSonyNewDiskSize)
EXPORTOSGLUFUNC tMacErr vSonyEjectDelete(tDrive Drive_No); EXPORTOSGLUFUNC MacErr_t vSonyEjectDelete(tDrive Drive_No);
#endif #endif
#if IncludeSonyNameNew #if IncludeSonyNameNew
@ -147,12 +101,12 @@ EXPORTVAR(tPbuf, vSonyNewDiskName)
#endif #endif
#if IncludeSonyGetName #if IncludeSonyGetName
EXPORTOSGLUFUNC tMacErr vSonyGetName(tDrive Drive_No, tPbuf *r); EXPORTOSGLUFUNC MacErr_t vSonyGetName(tDrive Drive_No, tPbuf *r);
#endif #endif
#if IncludeHostTextClipExchange #if IncludeHostTextClipExchange
EXPORTOSGLUFUNC tMacErr HTCEexport(tPbuf i); EXPORTOSGLUFUNC MacErr_t HTCEexport(tPbuf i);
EXPORTOSGLUFUNC tMacErr HTCEimport(tPbuf *r); EXPORTOSGLUFUNC MacErr_t HTCEimport(tPbuf *r);
#endif #endif
EXPORTVAR(uint32_t, OnTrueTime) EXPORTVAR(uint32_t, OnTrueTime)
@ -258,15 +212,16 @@ EXPORTOSGLUPROC LT_ReceivePacket(void);
EXPORTOSGLUPROC WaitForNextTick(void); EXPORTOSGLUPROC WaitForNextTick(void);
#define EvtQElKindKey 0 typedef enum EvtQKind {
#define EvtQElKindMouseButton 1 EvtQElKindKey,
#define EvtQElKindMousePos 2 EvtQElKindMouseButton,
#define EvtQElKindMouseDelta 3 EvtQElKindMousePos,
EvtQElKindMouseDelta
} EvtQKind_t;
struct EvtQEl { struct EvtQEl {
/* expected size : 8 bytes */ /* expected size : 8 bytes */
uint8_t kind; EvtQKind_t kind;
uint8_t pad[3];
union { union {
struct { struct {
uint8_t down; uint8_t down;
@ -283,145 +238,4 @@ typedef struct EvtQEl EvtQEl;
EXPORTOSGLUFUNC EvtQEl * EvtQOutP(void); EXPORTOSGLUFUNC EvtQEl * EvtQOutP(void);
EXPORTOSGLUPROC EvtQOutDone(void); EXPORTOSGLUPROC EvtQOutDone(void);
#define MKC_A 0x00
#define MKC_B 0x0B
#define MKC_C 0x08
#define MKC_D 0x02
#define MKC_E 0x0E
#define MKC_F 0x03
#define MKC_G 0x05
#define MKC_H 0x04
#define MKC_I 0x22
#define MKC_J 0x26
#define MKC_K 0x28
#define MKC_L 0x25
#define MKC_M 0x2E
#define MKC_N 0x2D
#define MKC_O 0x1F
#define MKC_P 0x23
#define MKC_Q 0x0C
#define MKC_R 0x0F
#define MKC_S 0x01
#define MKC_T 0x11
#define MKC_U 0x20
#define MKC_V 0x09
#define MKC_W 0x0D
#define MKC_X 0x07
#define MKC_Y 0x10
#define MKC_Z 0x06
#define MKC_1 0x12
#define MKC_2 0x13
#define MKC_3 0x14
#define MKC_4 0x15
#define MKC_5 0x17
#define MKC_6 0x16
#define MKC_7 0x1A
#define MKC_8 0x1C
#define MKC_9 0x19
#define MKC_0 0x1D
#define MKC_Command 0x37
#define MKC_Shift 0x38
#define MKC_CapsLock 0x39
#define MKC_Option 0x3A
#define MKC_Space 0x31
#define MKC_Return 0x24
#define MKC_BackSpace 0x33
#define MKC_Tab 0x30
#define MKC_Left /* 0x46 */ 0x7B
#define MKC_Right /* 0x42 */ 0x7C
#define MKC_Down /* 0x48 */ 0x7D
#define MKC_Up /* 0x4D */ 0x7E
#define MKC_Minus 0x1B
#define MKC_Equal 0x18
#define MKC_BackSlash 0x2A
#define MKC_Comma 0x2B
#define MKC_Period 0x2F
#define MKC_Slash 0x2C
#define MKC_SemiColon 0x29
#define MKC_SingleQuote 0x27
#define MKC_LeftBracket 0x21
#define MKC_RightBracket 0x1E
#define MKC_Grave 0x32
#define MKC_Clear 0x47
#define MKC_KPEqual 0x51
#define MKC_KPDevide 0x4B
#define MKC_KPMultiply 0x43
#define MKC_KPSubtract 0x4E
#define MKC_KPAdd 0x45
#define MKC_Enter 0x4C
#define MKC_KP1 0x53
#define MKC_KP2 0x54
#define MKC_KP3 0x55
#define MKC_KP4 0x56
#define MKC_KP5 0x57
#define MKC_KP6 0x58
#define MKC_KP7 0x59
#define MKC_KP8 0x5B
#define MKC_KP9 0x5C
#define MKC_KP0 0x52
#define MKC_Decimal 0x41
/* these aren't on the Mac Plus keyboard */
#define MKC_Control 0x3B
#define MKC_Escape 0x35
#define MKC_F1 0x7a
#define MKC_F2 0x78
#define MKC_F3 0x63
#define MKC_F4 0x76
#define MKC_F5 0x60
#define MKC_F6 0x61
#define MKC_F7 0x62
#define MKC_F8 0x64
#define MKC_F9 0x65
#define MKC_F10 0x6d
#define MKC_F11 0x67
#define MKC_F12 0x6f
#define MKC_Home 0x73
#define MKC_End 0x77
#define MKC_PageUp 0x74
#define MKC_PageDown 0x79
#define MKC_Help 0x72 /* = Insert */
#define MKC_ForwardDel 0x75
#define MKC_Print 0x69
#define MKC_ScrollLock 0x6B
#define MKC_Pause 0x71
#define MKC_AngleBracket 0x0A /* found on german keyboard */
/*
Additional codes found in Apple headers
#define MKC_RightShift 0x3C
#define MKC_RightOption 0x3D
#define MKC_RightControl 0x3E
#define MKC_Function 0x3F
#define MKC_VolumeUp 0x48
#define MKC_VolumeDown 0x49
#define MKC_Mute 0x4A
#define MKC_F16 0x6A
#define MKC_F17 0x40
#define MKC_F18 0x4F
#define MKC_F19 0x50
#define MKC_F20 0x5A
#define MKC_F13 MKC_Print
#define MKC_F14 MKC_ScrollLock
#define MKC_F15 MKC_Pause
*/
/* not Apple key codes, only for Mini vMac */
#define MKC_CM 0x80
#define MKC_None 0xFF
#endif #endif