Merge pull request #1828 from ZeroByteOrg/x16_ym

Fixed YM2151 struct to match HW behavior
2022-08-09 00:50:08 +02:00
parent 4de40a20cb 5608453aea
commit 0c8366c1e9
2 changed files with 5 additions and 5 deletions
--- a/asminc/cx16.inc
+++ b/asminc/cx16.inc
@@ -538,11 +538,11 @@ NMIVec          := $0318
 ; YM2151 audio chip
 .struct YM2151
                .org    $9F40
-  .union
-  STATUS        .byte
  ADDR          .byte
-  .endunion
+  .union
  DATA          .byte
+  STATUS        .byte
+  .endunion
 .endstruct

 ; X16 Emulator device
--- a/include/cx16.h
+++ b/include/cx16.h
@@ -285,11 +285,11 @@ struct __vera {

 /* Audio chip */
 struct __ym2151 {
+    unsigned char       reg;            /* Register number for data */
    union {
-        unsigned char   reg;            /* Register number for data */
+        unsigned char   data;
        unsigned char   status;         /* Busy flag */
    };
-    unsigned char       data;
 };
 #define YM2151  (*(volatile struct __ym2151 *)0x9F40)