Skip to content

Commit 681b787

Browse files
committed
- 6.0.2.3 Fixed PAULA_8364(AMIGA) Wait I/O error.
1 parent 0519560 commit 681b787

File tree

7 files changed

+15
-5
lines changed

7 files changed

+15
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MAmidiMEmo 6.0.2.2 Itoken (c)2019, 2025 / GPL-2.0
1+
MAmidiMEmo 6.0.2.3 Itoken (c)2019, 2025 / GPL-2.0
22

33
*** What is the MAmidiMEmo? ***
44

@@ -274,6 +274,7 @@ e.g.) YM2151 has 8ch FM sounds, so you can play 8 chords on MIDI 1ch or sharing
274274
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SNQ9JE3JAQMNQ)
275275

276276
*** Changes
277+
- 6.0.2.3 Fixed PAULA_8364(AMIGA) Wait I/O error.
277278
- 6.0.2.2 Fixed PAULA_8364(AMIGA) annoying noize issue.
278279
- 6.0.2.1 Fixed PAULA_8364(AMIGA) freezing issue.
279280
- 6.0.2.0 Improved UART transmission of PAULA_8364(AMIGA).

src/VSIF/VSIF_AMIGA/.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"tasks.h": "c",
3434
"lists.h": "c",
3535
"workbench.h": "c",
36-
"wb_protos.h": "c"
36+
"wb_protos.h": "c",
37+
"errors.h": "c"
3738
},
3839
"amiga.program": "out/VSIF_AMIGA",
3940
"m68k.includePaths": [

src/VSIF/VSIF_AMIGA/main.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <proto/exec.h>
33
#include <proto/dos.h>
44
#include <dos/dostags.h>
5+
#include <exec/errors.h>
56

67
#include <exec/execbase.h>
78
#include <exec/io.h>
92 Bytes
Binary file not shown.

src/VSIF/VSIF_AMIGA/serial.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ UBYTE * waitSerialData()
5555
showMessage("Parity error");
5656
if (error & SERD_BREAK)
5757
showMessage("Break signal received");
58+
ULONG arg[] = {error};
59+
VWritef("Wait error (%N)\n", arg);
5860
}
5961
return serialIO->IOSer.io_Data;
6062
}else{
@@ -70,11 +72,14 @@ UBYTE * waitSerialData()
7072
if (error & SERD_BREAK)
7173
showMessage("Break signal received");
7274
}
73-
showMessage("Wait I/O was aborted");
75+
ULONG arg[] = {error};
76+
VWritef("Wait I/O was aborted (%N)\n", arg);
7477
return NULL;
7578
}
7679
}else{
77-
showMessage("Check I/O was aborted");
80+
LONG error = serialIO->IOSer.io_Error;
81+
ULONG arg[] = {error};
82+
VWritef("Check I/O was aborted (%N)\n", arg);
7883

7984
// 念のため強制終了
8085
AbortIO((struct IORequest *)serialIO);

src/VSIF/VSIF_AMIGA/utils.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ void TakeSystem() {
3636
SystemDMA=custom->dmaconr;
3737

3838
Forbid();
39+
Disable();
3940

4041
#ifndef NO_INT
4142
//Save current interrupts and DMA settings so we can restore them upon exit.
@@ -141,6 +142,7 @@ void FreeSystem() {
141142
#ifndef NO_INT
142143
Enable();
143144
#endif
145+
Enable();
144146
Permit();
145147

146148
Exit(0);

src/mamidimemo/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static class Program
4141
/// <summary>
4242
///
4343
/// </summary>
44-
public const string FILE_VERSION = "6.0.2.2";
44+
public const string FILE_VERSION = "6.0.2.3";
4545

4646
public const string FILE_COPYRIGHT = @"Virtual chiptune sound MIDI module ""MAmidiMEmo"" Version {0}
4747
Copyright(C) 2019, 2025 Itoken.All rights reserved.";

0 commit comments

Comments
 (0)