Changes in / [56746cf:3231e25] in buchla-emu

Files:

• emu/fdd.c (modified) (5 diffs)
• emu/lcd.c (modified) (1 diff)
• emu/ser.c (modified) (2 diffs)
• readme.txt (modified) (6 diffs)

emu/fdd.c

@@ -44 +44 @@
 #define COM_WR_SEC 0xa2
 #define COM_INT 0xd0
-#define COM_WR_TRA_WP 0xf0
-#define COM_WR_TRA 0xf2
+#define COM_WR_TRA 0xf0
 
 #define COM_LAT_CYC 5
@@ -99 +98 @@
                 return "COM_WR_SEC";
 
-        case COM_WR_TRA_WP:
-                return "COM_WR_TRA_WP";
-
         case COM_WR_TRA:
                 return "COM_WR_TRA";
@@ -144 +140 @@
 {
         ver("fdd init");
-        inf("reading disk image file %s", disk);
+        inf("loading disk image file %s", disk);
 
         SDL_RWops *ops = SDL_RWFromFile(disk, "rb");
 
         if (ops == NULL) {
-                fail("error while opening disk image file %s for reading", disk);
+                fail("error while opening disk image file %s", disk);
         }
 
@@ -170 +166 @@
 {
         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);
 }
 
@@ -363 +338 @@
 
                 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)
-#define WIN_H (304 / 2)
+#define WIN_W (1615 * 2 / 3)
+#define WIN_H (304 * 2 / 3)
 
 #define GFX_BGR 0x00000000

emu/ser.c

@@ -24 +24 @@
 int32_t ser_verbose = 0;
 
-#define WIN_W (1520 / 2)
-#define WIN_H (950 / 2)
+#define WIN_W (1520 * 2 / 3)
+#define WIN_H (950 * 2 / 3)
 
 #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
@@ -343 +335 @@
                 mou_dx, mou_dy, mou_l ? 'l' : '-', mou_r ? 'r' : '-');
 
-        int32_t dx = mou_dx / MOU_DIV;
-        int32_t dy = mou_dy / MOU_DIV;
+        int32_t dx = mou_dx;
+        int32_t dy = mou_dy;
 
         if (dx < -128) {

readme.txt

@@ -288 +288 @@
 -----------------
 
-Here's what we currently emulate:
+Here's what we emulate:
 
   * Motorola 68000 CPU. This is actually the Musashi CPU emulator by
@@ -295 +295 @@
       https://github.com/kstenerud/Musashi
 
+  * Motorola MC6840: Timers.
+
+  * Rockwell R65C52: Serial console and MIDI ports.
+
+  * Epson SED1335: LCD controller.
+
   * Intel 82716: Video chip.
 
-  * Epson SED1335: LCD controller.
+  * National Semiconductor LMC835: Equalizer.
+
+  * General Instrument AY-3-8910: A sound chip, which is not used for
+    sound generation, but only for its I/O ports. It connects the CPU
+    to the above equalizer chip.
 
   * Western Digital WD1772: Floppy disk controller.
 
-  * Rockwell R65C52: Serial console and MIDI ports.
-
-  * Motorola MC6840: Timers.
-
-  * Unknown item #1: A program running on a microcontroller. It
-    converts the analog signals from the Buchla's controller pads to
-    digital values.
+  * A few LEDs.
+
+  * Item X: A program running on a microcontroller. It converts the
+    analog signals from the Buchla's controller pads to digital
+    values.
 
     Neither the program, nor the microcontroller are known, but the
@@ -313 +321 @@
     and self-explanatory.
 
-The next development milestone will hopefully emulate the following
-additional components:
-
-  * National Semiconductor LMC835: Equalizer.
-
-  * General Instrument AY-3-8910: A sound chip, which is not used for
-    sound generation, but only for its I/O ports. It connects the CPU
-    to the above equalizer chip.
-
-  * A few indicator LEDs.
-
-  * Unknown item #2: The actual sound generator, referred to by the
-    firmware source code as "the FPU." This is the biggest unknown so
-    far. Judging from the firmware source code it consist of two
-    parts:
-
-      1. The function generator that generates the 15 different
+  * Item Y: The actual sound generator, referred to by the firmware
+    source code as "the FPU." This could actually be two chips:
+
+      1. One chip, maybe a DSP, for generating the 15 different
          parameter envelopes for each of the 12 voices:
 
@@ -344 +339 @@
            - 1x Output signal stereo location.
 
-           - 1x "Dynamics" - whatever that is.
-
-         The firmware feeds the the points of the envelopes drawn in
-         the MIDAS VII instrument editor to the function generator,
-         which then interpolates between them.
-
-      2. The digital oscillator.
+           - 1x "Dynamics." (TBD - currently not emulated.)
+
+         Over time, the chip interpolates between the points of the
+         envelopes drawn in the MIDAS VII instrument editor.
+
+      2. A second chip for the actual sound generation. This is likely
+         a DSP.
 
          XXX - Details to be filled in.
@@ -358 +353 @@
          of the envelopes probably control analog circuits.
 
-    This "two FPU parts" hypothesis would be in line with the "four
+         Obviously, the emulator does everything digitally.
+
+    This "two chip" hypothesis would be in line with the "four
     computers" marketing claim from the Buchla 700 marketing copy. The
     four "computers" would be the Motorola 68000, the microcontroller
-    that does the A/D conversion of the pad inputs, plus the two parts
+    that does the A/D conversion of the pad inputs, plus the two CPUs
     that constitute "the FPU."
-
-    The firmware source code archive indicates that the FPU is based
-    on micro-programmable hardware. We recently ran this by Lynx, the
-    developer of the firmware, who generously agreed to meet up with
-    us in Oakland, CA. While he did not work on the FPU and thus was
-    not familiar with its implementation details, he was able to
-    confirm that the FPU is based on AMD's Am2900 family.
 
 If you have access to an actual Buchla 700, please do contact us. It
@@ -375 +365 @@
 
 If your Buchla is non-functional, this is also fine. We might be able
-to gain some insights from reading out the FPU microcode PROMs or from
-figuring out how the FPU chips are wired together.
+to gain some insights from reading out the FPU microcode PROMs.