claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
OBattler
2020-01-18 05:52:59 +01:00
committed by GitHub
parent dae4767357 995e2f0c61
commit 3ba1def248
192 changed files with 14558 additions and 6730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/machine/m_at.c
View File

@@ -8,15 +8,15 @@
*
* Standard PC/AT implementation.
*
* Version: @(#)m_at.c 1.0.11 2019/11/15
* Version: @(#)m_at.c 1.0.12 2020/01/13
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
*
* Copyright 2017-2019 Fred N. van Kempen.
* Copyright 2016-2019 Miran Grca.
* Copyright 2008-2019 Sarah Walker.
* Copyright 2017-2020 Fred N. van Kempen.
* Copyright 2016-2020 Miran Grca.
* Copyright 2008-2020 Sarah Walker.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@
void
machine_at_common_init_ex(const machine_t *model, int is_ibm)
machine_at_common_init_ex(const machine_t *model, int type)
{
machine_common_init(model);
@@ -67,12 +67,12 @@ machine_at_common_init_ex(const machine_t *model, int is_ibm)
pic2_init();
dma16_init();
if (is_ibm)
if (type == 1)
device_add(&ibmat_nvr_device);
else
else if (type == 0)
device_add(&at_nvr_device);
if (joystick_type != 7)
if (joystick_type != JOYSTICK_TYPE_NONE)
device_add(&gameport_device);
}