claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes for Travis (and updated code.)

Browse Source
This commit is contained in:
waltje
2018-05-08 19:09:51 -04:00
parent 6f9f26951c
commit 8ea3d62640
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -62,9 +62,14 @@ env:
before_install: before_install:
# Kill off the (most likely running) APT daily update. # Kill off the (most likely running) APT daily update.
- sudo systemctl disable apt-daily.timer
- sudo systemctl stop apt-daily.timer
- sudo systemctl disable apt-daily.service
- sudo systemctl stop apt-daily.service - sudo systemctl stop apt-daily.service
- sudo systemctl kill --kill-who=all apt-daily.service - sudo systemctl kill --kill-who=all apt-daily.service
- sleep 5 - sleep 10
- sudo rm -f /var/lib/dpkg/lock
# Now install some packages we need.
- sudo apt-get install libz-mingw-w64-dev - sudo apt-get install libz-mingw-w64-dev
# - sudo apt-get install libpng-mingw-w64-dev # - sudo apt-get install libpng-mingw-w64-dev

15
src/machines/m_amstrad.c
View File

@@ -32,7 +32,7 @@
* BIOSES: I need to re-do the bios.txt format so we can load non-BIOS * BIOSES: I need to re-do the bios.txt format so we can load non-BIOS
* ROM files for a given machine, such as font roms here.. * ROM files for a given machine, such as font roms here..
* *
* Version: @(#)m_amstrad.c 1.0.17 2018/05/08 * Version: @(#)m_amstrad.c 1.0.18 2018/05/08
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -73,7 +73,6 @@
#include "../timer.h" #include "../timer.h"
#include "../device.h" #include "../device.h"
#include "../nvr.h" #include "../nvr.h"
#include "../ui/ui.h"
#include "../devices/system/nmi.h" #include "../devices/system/nmi.h"
#include "../devices/system/pic.h" #include "../devices/system/pic.h"
#include "../devices/system/pit.h" #include "../devices/system/pit.h"
@@ -941,7 +940,7 @@ static void
kbd_adddata(uint16_t val) kbd_adddata(uint16_t val)
{ {
key_queue[key_queue_end] = (uint8_t)(val&0xff); key_queue[key_queue_end] = (uint8_t)(val&0xff);
#if ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("keyboard_amstrad : %02X added to key queue at %i\n", pclog("keyboard_amstrad : %02X added to key queue at %i\n",
val, key_queue_end); val, key_queue_end);
#endif #endif
@@ -964,7 +963,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
int i = 0; int i = 0;
#endif #endif
#if ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("keyboard_amstrad : write %04X %02X %02X\n", port, val, ams->pb); pclog("keyboard_amstrad : write %04X %02X %02X\n", port, val, ams->pb);
#endif #endif
@@ -984,11 +983,11 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
* *
* This register is controlled by BIOS and/or ROS. * This register is controlled by BIOS and/or ROS.
*/ */
#if ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("AMSkb: write PB %02x (%02x)\n", val, ams->pb); pclog("AMSkb: write PB %02x (%02x)\n", val, ams->pb);
#endif #endif
if (!(ams->pb & 0x40) && (val & 0x40)) { /*Reset keyboard*/ if (!(ams->pb & 0x40) && (val & 0x40)) { /*Reset keyboard*/
#if ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("AMSkb: reset keyboard\n"); pclog("AMSkb: reset keyboard\n");
#endif #endif
kbd_adddata(0xaa); kbd_adddata(0xaa);
@@ -1146,14 +1145,14 @@ kbd_poll(void *priv)
{ {
ams->wantirq = 0; ams->wantirq = 0;
ams->pa = ams->key_waiting; ams->pa = ams->key_waiting;
picint(2); picint(2);
#ifdef ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("keyboard_amstrad : take IRQ\n"); pclog("keyboard_amstrad : take IRQ\n");
#endif #endif
} }
if (key_queue_start != key_queue_end && !ams->pa) { if (key_queue_start != key_queue_end && !ams->pa) {
ams->key_waiting = key_queue[key_queue_start]; ams->key_waiting = key_queue[key_queue_start];
#ifdef ENABLE_KEYBOARD_LOG #ifdef ENABLE_KEYBOARD_LOG
pclog("Reading %02X from the key queue at %i\n", pclog("Reading %02X from the key queue at %i\n",
ams->key_waiting, key_queue_start); ams->key_waiting, key_queue_start);