Changeset 1489228 in buchla-emu for emu

Timestamp:

07/31/2017 05:48:15 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8967dbc

Parents:

c5b6c90

Message:

Fix single-sector commands.

File:

• emu/fdd.c (modified) (3 diffs)

emu/fdd.c

@@ -46 +46 @@
 #define COM_WR_TRA 0xf0
 
-#define COM_LAT_CYC 10
-#define COM_EXE_CYC 10
+#define COM_LAT_CYC 5
+#define COM_EXE_CYC 5
 
 typedef enum {
@@ -256 +256 @@
 
                 rv = *state.dat;
-                size_t addr = (size_t)(state.dat - image);
+                int32_t addr = (int32_t)(state.dat - image);
 
                 if ((addr & (SZ_SEC - 1)) == 0) {
-                        ver2("addr 0x%06zx -> 0x%02x", addr, rv);
+                        ver2("addr 0x%06x -> 0x%02x", addr, rv);
                 }
                 else {
-                        ver3("addr 0x%06zx -> 0x%02x", addr, rv);
+                        ver3("addr 0x%06x -> 0x%02x", addr, rv);
                 }
 
                 ++state.dat;
-                state.cyc = COM_EXE_CYC;
+                ++addr;
+
+                if ((addr & (SZ_SEC - 1)) == 0 && state.com == COM_RD_SEC) {
+                        state.step = STEP_IDLE;
+                        state.cyc = 0;
+                }
+                else {
+                        state.cyc = COM_EXE_CYC;
+                }
+
                 break;
 
@@ -349 +358 @@
                                 (state.com == COM_WR_SEC || state.com == COM_WR_SEC_WP)) {
                         *state.dat = (uint8_t)val;
-                        size_t addr = (size_t)(state.dat - image);
+                        int32_t addr = (int32_t)(state.dat - image);
 
                         if ((addr & (SZ_SEC - 1)) == 0) {
-                                ver2("addr 0x%06zx <- 0x%02x", addr, val);
+                                ver2("addr 0x%06x <- 0x%02x", addr, val);
                         }
                         else {
-                                ver3("addr 0x%06zx <- 0x%02x", addr, val);
+                                ver3("addr 0x%06x <- 0x%02x", addr, val);
                         }
 
                         ++state.dat;
-                        state.cyc = COM_EXE_CYC;
+                        ++addr;
+
+                        if ((addr & (SZ_SEC - 1)) == 0) {
+                                state.step = STEP_IDLE;
+                                state.cyc = 0;
+                        }
+                        else {
+                                state.cyc = COM_EXE_CYC;
+                        }
                 }
                 else {