ac6502 1.8.0 → 1.9.1

package/src/components/Machine.ts

@@ -15,7 +15,6 @@ import { JoystickAttachment } from './IO/Attachments/JoystickAttachment'
 import { LCDAttachment } from './IO/Attachments/LCDAttachment'
 import { KeypadAttachment } from './IO/Attachments/KeypadAttachment'
 import { Empty } from './IO/Empty'
-import { Terminal } from './IO/Terminal'
 import { IO } from './IO'
 
 export class Machine {
@@ -146,23 +145,36 @@ export class Machine {
       const rtc = new RTC()
       const storage = new Storage()
       const via = new VIA()
+      const sound = new Sound()
+      const video = new Video()
 
       this.io1 = new RAMBank()
       this.io2 = new RAMBank()
       this.io3 = rtc
       this.io4 = storage
       this.io6 = via
-      this.io7 = new Empty()
-      this.io8 = new Terminal()
+      this.io7 = sound
+      this.io8 = video
 
       // Connect RTC IRQ/NMI to CPU
       rtc.raiseIRQ = () => this.cpu.irq()
       rtc.raiseNMI = () => this.cpu.nmi()
 
-      // Connect VIA IRQ/NMI to CPU
+      // Connect Video IRQ/NMI to CPU
+      video.raiseIRQ = () => this.cpu.irq()
+      video.raiseNMI = () => this.cpu.nmi()
+
+      // Connect GPIO VIA IRQ/NMI to CPU
       via.raiseIRQ = () => this.cpu.irq()
       via.raiseNMI = () => this.cpu.nmi()
 
+      // Connect Sound pushSamples callback
+      sound.pushSamples = (samples: Float32Array) => {
+        if (this.play) {
+          this.play(samples)
+        }
+      }
+
       // Create standard GPIO attachments
       this.keyboardMatrixAttachment = new KeyboardMatrixAttachment(10)
       this.keyboardEncoderAttachment = new KeyboardEncoderAttachment(20)

package/src/index.ts

@@ -5,14 +5,13 @@ import { Machine } from './components/Machine'
 import { Command, Option } from 'commander'
 import { SerialPort } from 'serialport'
 import { Video } from './components/IO/Video'
-import { Terminal } from './components/IO/Terminal'
 import { Storage } from './components/IO/Storage'
 import { Sound } from './components/IO/Sound'
 import sdl from '@kmamal/sdl'
 import { readFile, writeFile } from 'fs/promises'
 import { existsSync } from 'fs'
 
-const VERSION = '1.8.0'
+const VERSION = '1.9.1'
 const WIDTH = 320
 const HEIGHT = 240
 
@@ -364,40 +363,10 @@ class Emulator {
         this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', Video.buffer)
       }
     } else if (this.options.target === 'dev') {
-      const devBoard = this.machine.io8 as Terminal
-      const rgbaBuffer = Buffer.alloc(WIDTH * HEIGHT * 4)
+      const video = this.machine.io8 as Video
       this.machine.render = () => {
         if (!this.window) { return }
-        const src = devBoard.vtac.buffer
-        for (let i = 0; i < WIDTH * HEIGHT; i++) {
-          const v = src[i]
-          const off = i * 4
-          const r3 = (v >> 5) & 0x07
-          const g3 = (v >> 2) & 0x07
-          const b2 = v & 0x03
-          rgbaBuffer[off]     = (r3 << 5) | (r3 << 2) | (r3 >> 1)
-          rgbaBuffer[off + 1] = (g3 << 5) | (g3 << 2) | (g3 >> 1)
-          rgbaBuffer[off + 2] = (b2 << 6) | (b2 << 4) | (b2 << 2) | b2
-          rgbaBuffer[off + 3] = 0xFF
-        }
-        this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', rgbaBuffer)
-
-        // Synthesize and play any queued VTAC bell tones
-        if (this.machine.play && this.audioDevice) {
-          const sampleRate = this.audioDevice.frequency
-          while (devBoard.vtac.hasQueuedBells()) {
-            const bell = devBoard.vtac.getNextBell()
-            if (bell) {
-              const numSamples = Math.floor((bell.duration / 60) * sampleRate)
-              const samples = new Float32Array(numSamples)
-              const twoPiF = 2 * Math.PI * bell.frequency
-              for (let i = 0; i < numSamples; i++) {
-                samples[i] = Math.sin(twoPiF * i / sampleRate)
-              }
-              this.machine.play(samples)
-            }
-          }
-        }
+        this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', video.buffer)
       }
     }
 

package/src/lib.ts

@@ -15,7 +15,6 @@ export { ACIA } from './components/IO/ACIA'
 export { SIDVoice, Sound } from './components/IO/Sound'
 export { Storage } from './components/IO/Storage'
 export { Video } from './components/IO/Video'
-export { Terminal } from './components/IO/Terminal'
 
 // GPIO attachments
 export type { Attachment } from './components/IO/Attachments/Attachment'

package/src/tests/IO/ACIA.test.ts

@@ -141,7 +141,7 @@ describe('ACIA (6551 ACIA)', () => {
         const mockIRQ = jest.fn()
         serialCard.raiseIRQ = mockIRQ
 
-        serialCard.write(0x02, 0x02) // RIIE=1: receive IRQ disabled (W65C51N: bit1=1 disables)
+        serialCard.write(0x02, 0x02) // RIIE=1: receive IRQ disabled (R6551: bit1=1 disables)
         serialCard.onData(0x42)
 
         expect(mockIRQ).not.toHaveBeenCalled()

package/src/tests/IO/RTC.test.ts

@@ -18,7 +18,7 @@ const setTime = (rtc: RTC, values: {
 	rtc.write(0x02, values.hours)
 	rtc.write(0x03, values.dayOfWeek)
 	rtc.write(0x04, values.date)
-	rtc.write(0x05, values.month) // EOSC=0: oscillator enabled (DS1511Y default)
+	rtc.write(0x05, values.month) // EOSC=0: oscillator enabled (DS1511Y+ default)
 	rtc.write(0x06, values.year)
 	rtc.write(0x07, values.century)
 	rtc.write(0x0f, 0x00) // Clear TE: falling edge commits user to internal

package/src/tests/IO/VIA.test.ts

@@ -49,7 +49,7 @@ const createMockAttachment = (options: {
   } as Attachment & { setPortAValue: (v: number) => void; setPortBValue: (v: number) => void }
 }
 
-describe('VIA (65C22 VIA)', () => {
+describe('VIA (6522 VIA)', () => {
   let gpio: VIA
 
   beforeEach(() => {

package/src/components/IO/Terminal.ts

@@ -1,34 +0,0 @@
-import { IO } from '../IO'
-import { VTAC } from 'vtac-terminal'
-
-/**
- * Terminal - Emulates the VTAC fantasy terminal
- *
- * Register Map:
- * $00: Data / Status Register
- *   Write: sends byte to VTAC for processing
- *   Read:  always returns 0 (bit 7 is a busy flag on the real device; busy is never set here)
- */
-export class Terminal implements IO {
-
-  raiseIRQ = () => {}
-  raiseNMI = () => {}
-
-  readonly vtac: VTAC = new VTAC()
-
-  read(address: number): number {
-    // Status register: bit 7 is busy flag on real device, never busy in emulation
-    return 0
-  }
-
-  write(address: number, data: number): void {
-    const register = address & 0x00
-    if (register === 0x00) {
-      this.vtac.parse(data)
-    }
-  }
-
-  tick(frequency: number): void {}
-  reset(coldStart: boolean): void {}
-
-}