mirror of
https://github.com/jscrane/r65emu.git
synced 2024-08-31 09:29:18 +00:00
don't assume ps/2 keyboard
This commit is contained in:
parent
072c15ff33
commit
25f7aad376
@ -26,7 +26,7 @@ spiram sram(SPIRAM_SIZE);
|
||||
|
||||
Memory memory;
|
||||
|
||||
#if defined(USE_KBD)
|
||||
#if defined(USE_PS2_KBD) && !defined(USE_OWN_KBD)
|
||||
#include "ps2drv.h"
|
||||
PS2Driver ps2;
|
||||
#endif
|
||||
@ -75,8 +75,8 @@ void hardware_init(CPU &cpu) {
|
||||
_cpu = &cpu;
|
||||
memory.begin();
|
||||
|
||||
#if defined(USE_KBD)
|
||||
ps2.begin(KBD_DATA, KBD_IRQ);
|
||||
#if defined(USE_PS2_KBD) && !defined(USE_OWN_KBD)
|
||||
ps2.begin(PS2_KBD_DATA, PS2_KBD_IRQ);
|
||||
#endif
|
||||
|
||||
#if defined(TFT_BACKLIGHT)
|
||||
|
@ -15,7 +15,7 @@ void hardware_init(class CPU &);
|
||||
void hardware_checkpoint(class Stream &);
|
||||
void hardware_restore(class Stream &);
|
||||
|
||||
#if defined(__PS2DRV_H__) && defined(USE_KBD)
|
||||
#if defined(__PS2DRV_H__) && defined(USE_PS2_KBD)
|
||||
extern class PS2Driver ps2;
|
||||
#endif
|
||||
#if defined(__SPIRAM_H__) && defined(USE_SPIRAM)
|
||||
|
@ -17,9 +17,11 @@
|
||||
//#define LOAD_GLCD
|
||||
|
||||
// PS/2 keyboard
|
||||
#define USE_KBD
|
||||
#define KBD_IRQ D3
|
||||
#define KBD_DATA D4
|
||||
#if !defined(USE_OWN_KBD)
|
||||
#define USE_PS2_KBD
|
||||
#define PS2_KBD_IRQ D3
|
||||
#define PS2_KBD_DATA D4
|
||||
#endif
|
||||
|
||||
// SPI-RAM
|
||||
#if !defined(NO_SPIRAM)
|
||||
|
@ -24,9 +24,11 @@
|
||||
//#define TFT_RST 26
|
||||
|
||||
// PS/2 keyboard
|
||||
#define USE_KBD
|
||||
#define KBD_DATA 34
|
||||
#define KBD_IRQ 35
|
||||
#if !defined(USE_OWN_KBD)
|
||||
#define USE_PS2_KBD
|
||||
#define PS2_KBD_DATA 34
|
||||
#define PS2_KBD_IRQ 35
|
||||
#endif
|
||||
|
||||
// Storage
|
||||
#if !defined(NO_STORAGE)
|
||||
|
@ -3,9 +3,11 @@
|
||||
#define RAM_SIZE 0x3000u
|
||||
|
||||
// PS/2 keyboard
|
||||
#define USE_KBD
|
||||
#define KBD_DATA PE_4
|
||||
#define KBD_IRQ PE_5
|
||||
#if !defined(USE_OWN_KBD)
|
||||
#define USE_PS2_KBD
|
||||
#define PS2_KBD_DATA PE_4
|
||||
#define PS2_KBD_IRQ PE_5
|
||||
#endif
|
||||
|
||||
// Storage
|
||||
#if !defined(NO_STORAGE)
|
||||
|
@ -9,9 +9,11 @@
|
||||
#endif
|
||||
|
||||
// PS/2 Keyboard
|
||||
#define USE_KBD
|
||||
#define KBD_DATA 32
|
||||
#define KBD_IRQ 33
|
||||
#if !defined(USE_OWN_KBD)
|
||||
#define USE_PS2_KBD
|
||||
#define PS2_KBD_DATA 32
|
||||
#define PS2_KBD_IRQ 33
|
||||
#endif
|
||||
|
||||
// 64kB RAM
|
||||
#define RAM_SIZE 0x10000u
|
||||
|
Loading…
Reference in New Issue
Block a user