80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

The Amstrad machines now initialize the correct FDC types;

Browse Source 
Removed an excess logging line from keyboard_xt.c.
This commit is contained in:
OBattler
2018-02-02 20:42:50 +01:00
parent 4452b4e278
commit ccb5fdf563
4 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/floppy/fdc.c
View File

@@ -9,7 +9,7 @@
* Implementation of the NEC uPD-765 and compatible floppy disk
* controller.
*
* Version: @(#)fdc->c 1.0.15 2018/02/02
* Version: @(#)fdc->c 1.0.16 2018/02/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -2062,16 +2062,6 @@ device_t fdc_xt_device = {
NULL, NULL, NULL, NULL
};
device_t fdc_xt_amstrad_device = {
"PC/XT Floppy Drive Controller (Amstrad)",
0,
FDC_FLAG_DISKCHG_ACTLOW,
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
};
device_t fdc_pcjr_device = {
"PCjr Floppy Drive Controller",
0,

3
src/floppy/fdc.h
View File

@@ -9,7 +9,7 @@
* Implementation of the NEC uPD-765 and compatible floppy disk
* controller.
*
* Version: @(#)fdc.h 1.0.3 2018/01/16
* Version: @(#)fdc.h 1.0.4 2018/02/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -156,7 +156,6 @@ extern uint8_t fdc_ps1_525(void);
#ifdef EMU_DEVICE_H
extern device_t fdc_xt_device;
extern device_t fdc_xt_amstrad_device;
extern device_t fdc_pcjr_device;
extern device_t fdc_at_device;
extern device_t fdc_at_actlow_device;

3
src/keyboard_xt.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the XT-style keyboard.
*
* Version: @(#)keyboard_xt.c 1.0.7 2018/01/28
* Version: @(#)keyboard_xt.c 1.0.8 2018/02/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -387,7 +387,6 @@ kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val))
}
break;
case FAKE_LSHIFT_OFF:
pclog("fake left shift on, scan code: ");
if (num_lock) {
if (!shift_states) {
/* Num lock on and no shifts are pressed, send non-inverted fake shift. */

32
src/machine/m_amstrad.c
View File

@@ -32,7 +32,7 @@
* in alpha mode, but in highres ("ECD350") mode, it displays
* some semi-random junk. Video-memory pointer maybe?
*
* Version: @(#)m_amstrad.c 1.0.9 2018/01/29
* Version: @(#)m_amstrad.c 1.0.10 2018/02/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1225,6 +1225,34 @@ machine_amstrad_init(machine_t *model)
io_sethandler(0x007a, 1,
ms_read, NULL, NULL, ms_write, NULL, NULL, ams);
// device_add(&fdc_at_actlow_device);
switch(romset) {
case ROM_PC1512:
device_add(&fdc_xt_device);
break;
case ROM_PC1640:
device_add(&fdc_xt_device);
break;
case ROM_PC200:
device_add(&fdc_xt_device);
break;
case ROM_PC2086:
device_add(&fdc_at_actlow_device);
break;
case ROM_PC3086:
device_add(&fdc_at_actlow_device);
break;
case ROM_MEGAPC:
device_add(&fdc_at_actlow_device);
break;
}
if (gfxcard == GFX_INTERNAL) switch(romset) {
case ROM_PC1512:
@@ -1271,6 +1299,4 @@ machine_amstrad_init(machine_t *model)
mouse_set_poll(ms_poll, ams);
if (joystick_type != 7)
device_add(&gameport_device);
device_add(&gameport_device);