Changeset 56746cf in buchla-emu for emu

Timestamp:

01/05/2018 01:39:08 PM (6 years ago)

Author:

Alexander Heinrich <alex.heinrich@…>

Branches:

master

Children:

379ffd9

Parents:

3231e25 (diff), 49efb91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into mida

Location:

emu

Files:

• fdd.c (modified) (5 diffs)
• lcd.c (modified) (1 diff)
• ser.c (modified) (2 diffs)

emu/fdd.c

@@ -44 +44 @@
 #define COM_WR_SEC 0xa2
 #define COM_INT 0xd0
-#define COM_WR_TRA 0xf0
+#define COM_WR_TRA_WP 0xf0
+#define COM_WR_TRA 0xf2
 
 #define COM_LAT_CYC 5
@@ -98 +99 @@
                 return "COM_WR_SEC";
 
+        case COM_WR_TRA_WP:
+                return "COM_WR_TRA_WP";
+
         case COM_WR_TRA:
                 return "COM_WR_TRA";
@@ -140 +144 @@
 {
         ver("fdd init");
-        inf("loading disk image file %s", disk);
+        inf("reading disk image file %s", disk);
 
         SDL_RWops *ops = SDL_RWFromFile(disk, "rb");
 
         if (ops == NULL) {
-                fail("error while opening disk image file %s", disk);
+                fail("error while opening disk image file %s for reading", disk);
         }
 
@@ -166 +170 @@
 {
         ver("fdd quit");
+        inf("writing disk image file %s", disk);
+
+        SDL_RWops *ops = SDL_RWFromFile(disk, "wb");
+
+        if (ops == NULL) {
+                fail("error while opening disk image file %s for writing", disk);
+        }
+
+        size_t stored = 0;
+
+        while (stored < SZ_DISK) {
+                size_t n_wr = SDL_RWwrite(ops, image + stored, 1, SZ_DISK - stored);
+
+                if (n_wr == 0) {
+                        fail("error while writing disk image file %s", disk);
+                }
+
+                stored += n_wr;
+        }
+
+        SDL_RWclose(ops);
 }
 
@@ -338 +363 @@
 
                 case COM_WR_TRA:
+                case COM_WR_TRA_WP:
                         state.tra_0 = false;
                         fail("format not yet supported");

emu/lcd.c

@@ -24 +24 @@
 int32_t lcd_verbose = 0;
 
-#define WIN_W (1615 * 2 / 3)
-#define WIN_H (304 * 2 / 3)
+#define WIN_W (1615 / 2)
+#define WIN_H (304 / 2)
 
 #define GFX_BGR 0x00000000

emu/ser.c

@@ -24 +24 @@
 int32_t ser_verbose = 0;
 
-#define WIN_W (1520 * 2 / 3)
-#define WIN_H (950 * 2 / 3)
+#define WIN_W (1520 / 2)
+#define WIN_H (950 / 2)
 
 #define BEL_CYC 10000
 #define MOU_CYC 10000
+
+#if defined EMU_WIN
+#define MOU_DIV 64
+#elif defined EMU_OS_X
+#define MOU_DIV 1
+#else
+#define MOU_DIV 4
+#endif
 
 #define CON_W 80
@@ -335 +343 @@
                 mou_dx, mou_dy, mou_l ? 'l' : '-', mou_r ? 'r' : '-');
 
-        int32_t dx = mou_dx;
-        int32_t dy = mou_dy;
+        int32_t dx = mou_dx / MOU_DIV;
+        int32_t dy = mou_dy / MOU_DIV;
 
         if (dx < -128) {