badline 0.16.0 → 0.16.1

data/lib/badline/pet/ieee_drive.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "badline/drives/model2031"
+
+module Badline
+  class PET
+    # The PET's true drive: a Drives::Model2031 on the IEEE-488 bus
+    # (IEEEPorts), clocked after the CPU each cycle and reset with it, as
+    # the PET's RES line reaches IFC. The traps on the KERNAL's primitives
+    # (IEEETraps) leave device 8 to the drive while it is device 8.
+    module IEEEDrive
+      # The 2031 on the bus, or nil.
+      attr_reader :drive2031
+
+      # Plugs in a Drives::Model2031, in place of the one there.
+      def attach_drive2031(drive)
+        detach_drive2031
+        drive.host_clock_hz = 1_000_000
+        drive.connect(@ieee.bus)
+        @drive2031 = drive
+        @ieee.lines_written
+        @ieee_trap&.device = trap_device
+        @init_threshold = [@init_threshold, Badline::Drives::Model2031::BOOT_CYCLES].max if @cycles < @init_threshold
+      end
+
+      # Unplugs the 2031, leaving it on a bus of its own.
+      def detach_drive2031
+        drive = @drive2031
+        return unless drive
+
+        drive.connect(Badline::Drives::IEEEBus.new)
+        @drive2031 = nil
+        @ieee_trap&.device = trap_device
+      end
+
+      # The true drive on the bus, or nil.
+      def true_drive = @drive2031
+
+      # Plugs in a 2031 as device 8, in place of the drive there, and
+      # returns it.
+      def plug_true_drive
+        Badline::Drives::Model2031.new.tap { |drive| attach_drive2031(drive) }
+      end
+
+      private
+
+      # The 2031 as keyed snapshot modules named from its device number:
+      # BL-D8, BL-D8-CPU and so on for device 8.
+      def save_drive_modules(sections)
+        drive = @drive2031
+        drive&.save_modules(sections, "BL-D#{drive.device}")
+        sections
+      end
+
+      # The 2031 a snapshot's modules hold, built afresh unless one is on
+      # the bus as the same device, or none when they hold no drive. The
+      # bus then carries the PET's lines as its chips left them.
+      def load_drive_modules(modules)
+        device = 8
+        input = modules.optional("BL-D8")
+        while input.nil? && device < 11
+          device += 1
+          input = modules.optional("BL-D#{device}")
+        end
+        if input
+          detach_drive2031 if @drive2031 && @drive2031.device != device
+          attach_drive2031(Badline::Drives::Model2031.new(device:)) unless @drive2031
+          @drive2031.load_modules(modules, input, "BL-D#{device}")
+        else
+          detach_drive2031
+        end
+        @ieee.lines_written
+      end
+    end
+  end
+end

data/lib/badline/pet/ieee_ports.rb

@@ -15,8 +15,12 @@ module Badline
     # The outputs go through inverting drivers onto the bus, so a 0 on a
     # data line's port bit pulls the line low, and the inputs read the
     # lines as they are, a 0 for a low line. It is PIA 2's peripheral, and
-    # answers what PIA 1 and the VIA read of the bus.
+    # answers what PIA 1 and the VIA read of the bus. It pushes the lines
+    # the PET pulls into the bus for the drives on it after every write to
+    # the chips (lines_written).
     class IEEEPorts
+      attr_reader :bus
+
       def initialize(bus)
         @bus = bus
         @pia1 = @pia2 = @via = nil
@@ -46,6 +50,13 @@ module Badline
         value
       end
 
+      # The PET wrote one of its chips: the drives on the bus see the lines
+      # it pulls now.
+      def lines_written
+        bus = @bus
+        bus.host_lines = controller_lines unless bus.drives.empty?
+      end
+
       private
 
       def low_lines = @bus.low_lines(controller_lines)

data/lib/badline/pet/ieee_traps.rb

@@ -8,12 +8,15 @@ module Badline
     # commands, run through the primitives.
     module IEEETraps
       # Puts the storage in device 8. Mounting again swaps the disk while
-      # the machine runs, and the drive keeps its RAM and its status.
+      # the machine runs, and the drive keeps its RAM and its status. The
+      # traps leave device 8 to a true drive with that number.
       def mount(storage)
         return @dos.insert(storage) if @dos
 
         @dos = dos = KernalTrap::DOS.new(storage, channel_saves: true)
         @ieee_trap = KernalTrap::IEEE.new(cpu:, bus:, layout: trap_layout, dos:).install
+        @ieee_trap.device = trap_device
+        @ieee_trap
       end
 
       # Takes device 8's storage out, and the traps with it, so the KERNAL
@@ -33,10 +36,6 @@ module Badline
       # The path of the disk or directory device 8 serves, or an empty one.
       def mounted_path = @dos.nil? ? "" : @dos.path
 
-      # The true drive on the bus, which a PET has none of yet: every disk
-      # goes in device 8 through the traps.
-      def true_drive = nil
-
       # Device 8 through the traps in a keyed snapshot module (BL-TRAPDOS):
       # the storage under storage.*, the DOS, and the IEEE-488 trap under
       # ieee.*. Nothing mounted writes nothing.
@@ -70,6 +69,12 @@ module Badline
 
       # The IEEELayout of the KERNAL the model runs.
       def trap_layout = @model.trap_layout
+
+      # Device 8, unless a true drive is device 8.
+      def trap_device
+        device = KernalTrap::Routine::DEVICE
+        true_drive&.device == device ? nil : device
+      end
     end
   end
 end

data/lib/badline/pet/keyed_modules.rb

@@ -7,7 +7,8 @@ module Badline
     # the screen RAM, the last byte on the bus and an 8096's board, both
     # PIAs, the VIA, the CRTC where the model has one, the picture with
     # the video's beam, the CPU, the datasettes at cassette ports #1 and
-    # #2, and device 8 through the traps.
+    # #2, a 2031 on the IEEE-488 bus (IEEEDrive), and device 8 through the
+    # traps.
     #
     # A load lays the pages out before the chips load, and works out what
     # each unit derives from its fields once every unit is loaded.
@@ -24,6 +25,7 @@ module Badline
         cassettes = @cassettes
         sections << Snapshot::Keyed.section("BL-TAPE1") { |out| cassettes.datasette1.save_fields(out) }
         sections << Snapshot::Keyed.section("BL-TAPE2") { |out| cassettes.datasette2.save_fields(out) }
+        save_drive_modules(sections)
         sections << Snapshot::Keyed.section("BL-TRAPDOS") { |out| save_trap_dos_fields(out) } if mounted?
         sections
       end
@@ -43,6 +45,7 @@ module Badline
         @cpu.load_fields(modules.required("BL-CPU"))
         @cassettes.datasette1.load_fields(modules.required("BL-TAPE1"))
         @cassettes.datasette2.load_fields(modules.required("BL-TAPE2"))
+        load_drive_modules(modules)
         trap_dos = modules.optional("BL-TRAPDOS")
         trap_dos ? load_trap_dos_fields(trap_dos, detached: modules.detached?) : unmount
         @cpu.restored!

data/lib/badline/pet/keyed_parts.rb

@@ -80,26 +80,30 @@ module Badline
 
     class Bus
       class Expansion
-        # The control register and the board's 64K, under `prefix`. The
-        # banks are laid over the pages again once the bus is loaded.
+        # The control register and the board's 64K, under `prefix`, and
+        # on the 8296 the user port lines its RAM last followed. The banks
+        # are laid over the pages again once the bus is loaded.
         module KeyedState
           def save_fields(out, prefix)
             out.int("#{prefix}control", @control).bytes("#{prefix}ram", @cells)
+            out.int("#{prefix}user_port", @lines) if @board8296
           end
 
           def load_fields(input, prefix)
             @control = input.byte("#{prefix}control", @control)
             input.bytes_into("#{prefix}ram", @cells)
+            @lines = input.int("#{prefix}user_port", USER_PORT_LINES) & USER_PORT_LINES
           end
         end
 
         include KeyedState
       end
 
-      # The RAM below $8000, the screen RAM, the last byte on the bus under
-      # bus.* and an 8096's board under expansion.*, in a keyed snapshot
-      # module (BL-RAM). The pages are laid out again once they are loaded
-      # (#restored!). The ROMs come with the model.
+      # The RAM below $8000, the screen RAM, all 32K from $8000 on an 8296,
+      # the last byte on the bus under bus.* and an 8096's or 8296's board
+      # under expansion.*, in a keyed snapshot module (BL-RAM). The pages
+      # are laid out again once they are loaded (#restored!). The ROMs come
+      # with the model.
       module KeyedState
         def save_fields(out)
           @ram.save_fields(out, "ram")

data/lib/badline/pet/model.rb

@@ -3,8 +3,8 @@
 module Badline
   class PET
     # The PETs and CBMs badline builds by name, after xpet's -model names:
-    # the board's RAM, its stock ROM set and video, and whether the 8096's
-    # 64K board is fitted.
+    # the board's RAM, its stock ROM set and video, and whether a 64K
+    # board banked through $FFF0 is fitted, the 8096's or the 8296's own.
     #
     # +video+ is :discrete, the fixed 40-column, 60 Hz generator of the
     # 2001 and 3000 series, :crtc40 or :crtc80, a 6545 the editor ROM
@@ -14,7 +14,10 @@ module Badline
     #
     # The 2001's 1K of screen RAM repeats four times through $8000-$8FFF.
     # Later boards decode $8000-$87FF alone, the 40-column ones with their
-    # 1K twice over and the 80-column ones with 2K.
+    # 1K twice over and the 80-column ones with 2K. The 8296 has 128K of
+    # dynamic RAM, the 32K below $8000, the 32K above it, of which the
+    # screen is the start and the rest lies under the ROMs, and the 64K
+    # board (Bus::Expansion).
     module Model
       Profile = Data.define(:name, :ram_kb, :basic, :editor_50hz, :editor_60hz, :kernal, :characters, :keyboard,
                             :video, :expansion) do
@@ -22,10 +25,18 @@ module Badline
 
         def editor(refresh_hz) = refresh_hz == 50 ? editor_50hz : editor_60hz
 
-        def screen_bytes = video == :crtc80 ? 0x800 : 0x400
+        # The 8296, whose board decodes its memory in a PLA.
+        def cbm8296? = name == "8296"
+
+        # The screen RAM's bytes, and on the 8296 all 32K of RAM from $8000.
+        def screen_bytes
+          return 0x8000 if cbm8296?
+
+          video == :crtc80 ? 0x800 : 0x400
+        end
 
         # How many pages from $8000 on the screen RAM answers in.
-        def screen_pages = name == "2001" ? 0x10 : 0x08
+        def screen_pages = name == "2001" || cbm8296? ? 0x10 : 0x08
 
         # The BASIC 1 KERNAL keeps its keyboard buffer and jiffy clock in
         # page 2; BASIC 2 and 4 keep them where each other does.
@@ -70,7 +81,12 @@ module Badline
                             kernal: "pet/kernal4.rom", characters: "pet/characters2.rom", keyboard: :business,
                             video: :crtc80, expansion: true)
 
-      ALL = [PET2001, PET3032, PET3032B, PET4032, CBM8032, CBM8096].freeze
+      CBM8296 = Profile.new(name: "8296", ram_kb: 32, basic: "pet/basic4.rom",
+                            editor_50hz: "pet/editor4-80-b-50hz-8296.rom", editor_60hz: "pet/editor4-80-b-60hz.rom",
+                            kernal: "pet/kernal4.rom", characters: "pet/characters2.rom", keyboard: :business,
+                            video: :crtc80, expansion: true)
+
+      ALL = [PET2001, PET3032, PET3032B, PET4032, CBM8032, CBM8096, CBM8296].freeze
 
       DEFAULT = "8032"
 
@@ -85,6 +101,40 @@ module Badline
         model
       end
 
+      # Whether the +profile+'s board takes +ram_kb+ below $8000: the 8296
+      # has its 32K soldered on.
+      def self.ram_fits?(profile, ram_kb)
+        profile.cbm8296? ? ram_kb == 32 : RAM_SIZES.include?(ram_kb)
+      end
+
+      # The +jumpers+ the +profile+'s board has fitted, which only the
+      # 8296's takes (ROMSets::JUMPERS), in that order. Raises
+      # ArgumentError for any it doesn't have.
+      def self.checked_jumpers(profile, jumpers)
+        known = ROMSets.jumpers(profile.name)
+        unknown = jumpers.reject { |jumper| known.include?(jumper) }
+        raise ArgumentError, "the #{profile.name} has no jumper #{unknown.first}" unless unknown.empty?
+
+        known.select { |jumper| jumpers.include?(jumper) }
+      end
+
+      # The +profile+ with the character ROM ROMSets::CHARACTERS names in
+      # place of its own, nil for its own. Raises ArgumentError for one the
+      # model doesn't take.
+      def self.fitted(profile, characters)
+        return profile if characters.nil?
+
+        name = profile.name
+        unless ROMSets.characters(name).include?(characters)
+          raise ArgumentError, "the #{name} takes no character ROM #{characters}"
+        end
+
+        Profile.new(name:, ram_kb: profile.ram_kb, basic: profile.basic, editor_50hz: profile.editor_50hz,
+                    editor_60hz: profile.editor_60hz, kernal: profile.kernal,
+                    characters: ROMSets::CHARACTERS.fetch(characters), keyboard: profile.keyboard,
+                    video: profile.video, expansion: profile.expansion)
+      end
+
       # The +profile+ with the BASIC and the editor ROMSets names in place
       # of its own: +basic+ a key of ROMSets::BASICS and +editor+ one of
       # ROMSets::EDITORS, each nil for the one that fits. An editor named

data/lib/badline/pet/rom_sets.rb

@@ -4,8 +4,9 @@ module Badline
   class PET
     # The BASIC and editor ROMs each model's board takes: its own, and the
     # upgrades Commodore sold for it, BASIC 2 for the 2001 and BASIC 4 for
-    # the 3032s. Options reads it to check --basic and --editor, so it
-    # loads nothing else.
+    # the 3032s, and the 8296's character ROMs and board jumpers. Options
+    # reads it to check --basic, --editor, --characters and --jumpers, so
+    # it loads nothing else.
     #
     # An editor ROM goes with one BASIC, scans one keyboard and drives one
     # board's video, so a model and a BASIC fit one editor, and on a CRTC
@@ -23,26 +24,42 @@ module Badline
         "1" => "pet/editor1.rom", "2-n" => "pet/editor2-n.rom", "2-b" => "pet/editor2-b.rom",
         "4-n" => "pet/editor4-n.rom", "4-b" => "pet/editor4-b.rom", "4-40-n-50hz" => "pet/editor4-40-n-50hz.rom",
         "4-40-n-60hz" => "pet/editor4-40-n-60hz.rom", "4-80-b-50hz" => "pet/editor4-80-b-50hz.rom",
-        "4-80-b-50hz-0283" => "pet/editor4-80-b-50hz-0283.rom", "4-80-b-60hz" => "pet/editor4-80-b-60hz.rom"
+        "4-80-b-50hz-0283" => "pet/editor4-80-b-50hz-0283.rom", "4-80-b-60hz" => "pet/editor4-80-b-60hz.rom",
+        "4-80-b-50hz-8296" => "pet/editor4-80-b-50hz-8296.rom"
       }.freeze
 
       # The BASICs each model takes, its own first, and the editors that
       # fit each, the 50 Hz one first and the 60 Hz one last on a CRTC
       # board. The 8032's other 50 Hz editor, 901474-04 dated 0283, sits
-      # between them.
+      # between them, and the 8296 takes the 8032's as well as its own.
       FITS = {
         "2001" => { "1" => %w[1], "2" => %w[2-n] },
         "3032" => { "2" => %w[2-n], "4" => %w[4-n] },
         "3032b" => { "2" => %w[2-b], "4" => %w[4-b] },
         "4032" => { "4" => %w[4-40-n-50hz 4-40-n-60hz] },
         "8032" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] },
-        "8096" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] }
+        "8096" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] },
+        "8296" => { "4" => %w[4-80-b-50hz-8296 4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] }
       }.freeze
 
+      # The character ROMs by the names --characters takes, and the ones
+      # each model's board takes, its own first: the 8296's socket takes
+      # 901447-10, its ASCII one, or the 4K 324242-01, which holds a DIN set
+      # in its first half and 901447-10 in its second.
+      CHARACTERS = { "ascii" => "pet/characters2.rom", "din" => "pet/characters-din.rom" }.freeze
+
+      CHARACTER_FITS = { "8296" => %w[ascii din] }.freeze
+
+      # The jumpers each model's board takes, by the names --jumpers takes
+      # (Bus::Expansion), none on a board not named.
+      JUMPERS = { "8296" => %w[ram9 rama userport] }.freeze
+
       # The cycles a line and the lines a frame the CRTC editors set up
       # where they differ from 50-cycle lines, 400 a frame at 50 Hz and 333
       # at 60 Hz, by the editor's ROM.
-      CRTC_FRAMES = { "pet/editor4-80-b-50hz-0283.rom" => [64, 313] }.freeze
+      CRTC_FRAMES = {
+        "pet/editor4-80-b-50hz-0283.rom" => [64, 313], "pet/editor4-80-b-50hz-8296.rom" => [59, 339]
+      }.freeze
 
       # The cycles a line and the lines a frame the CRTC editor in the ROM
       # named sets up at +refresh_hz+.
@@ -55,6 +72,13 @@ module Badline
       # a BASIC it doesn't take.
       def self.editors(model, basic) = FITS.fetch(model).fetch(basic, [])
 
+      # The character ROMs the model takes, by name, none for one that takes
+      # only its own.
+      def self.characters(model) = CHARACTER_FITS.fetch(model, [])
+
+      # The jumpers the model's board takes.
+      def self.jumpers(model) = JUMPERS.fetch(model, [])
+
       # The editor that fits the model with the BASIC at +refresh_hz+.
       def self.editor(model, basic, refresh_hz)
         fitting = editors(model, basic)

data/lib/badline/pet.rb

@@ -8,6 +8,7 @@ require "badline/pet/via_ports"
 require "badline/pet/keyboard_ports"
 require "badline/pet/ieee_ports"
 require "badline/pet/ieee_traps"
+require "badline/pet/ieee_drive"
 require "badline/pet/cassettes"
 require "badline/pet/characters"
 require "badline/pet/canvas"
@@ -42,13 +43,15 @@ module Badline
   # The VIA's CB2 is the sound (Sound).
   #
   # Device 8 answers through traps on the KERNAL's IEEE-488 primitives
-  # (IEEETraps), on a bus nothing else is plugged into (IEEEPorts), and
-  # each cassette port has a datasette (Cassettes). It runs headless.
+  # (IEEETraps), on the IEEE-488 bus (IEEEPorts), or a true 2031 on the
+  # bus answers (IEEEDrive), and each cassette port has a datasette
+  # (Cassettes). It runs headless.
   class PET
     include Machine::KeyboardBuffer
     include Machine::Clocking
     include Machine::Settling
     include IEEETraps
+    include IEEEDrive
 
     attr_reader :model, :bus, :cpu, :pia1, :pia2, :via, :crtc, :keyboard, :ieee, :cassettes, :cycles, :init_threshold
 
@@ -58,6 +61,9 @@ module Badline
     # The RAM below $8000, in K.
     attr_reader :ram_kb
 
+    # The 8296's board jumpers that are fitted, by name.
+    attr_reader :jumpers
+
     def ram = @bus.ram
 
     # Reads and writes memory as the CPU sees it, through the bus.
@@ -75,14 +81,17 @@ module Badline
     # +model+ names one of Model::ALL, with +ram_kb+ of RAM below $8000
     # (Model::RAM_SIZES) in place of the model's own when not nil. A CRTC
     # model runs its 50 Hz editor, or its 60 Hz one for +refresh_hz+ 60.
-    # +basic+ and +editor+ name ROMs the board takes in place of its own
-    # (Model.upgraded).
-    def initialize(model: Model::DEFAULT, ram_kb: nil, refresh_hz: 50, debug: false, basic: nil, editor: nil)
-      @model = Model.upgraded(Model.named(model), basic, editor)
+    # +basic+, +editor+ and +characters+ name ROMs the board takes in place
+    # of its own (Model.upgraded, Model.fitted), and +jumpers+ the 8296's
+    # board jumpers (ROMSets::JUMPERS).
+    def initialize(model: Model::DEFAULT, ram_kb: nil, refresh_hz: 50, debug: false, basic: nil, editor: nil,
+                   characters: nil, jumpers: [])
+      @model = Model.fitted(Model.upgraded(Model.named(model), basic, editor), characters)
       ram_kb ||= @model.ram_kb
-      raise ArgumentError, "a PET has no #{ram_kb}K RAM board" unless Model::RAM_SIZES.include?(ram_kb)
+      raise ArgumentError, "the #{@model.name} has no #{ram_kb}K RAM board" unless Model.ram_fits?(@model, ram_kb)
 
       @ram_kb = ram_kb
+      @jumpers = Model.checked_jumpers(@model, jumpers)
 
       @refresh_hz = @model.crtc? ? refresh_hz : 60
       @crtc_video = @model.crtc?
@@ -99,16 +108,21 @@ module Badline
       @cassettes = Cassettes.new(@pia1, @via)
       keyboard_ports.connect(@pia1, @ieee, @cassettes)
       characters = Characters.new(@model.characters)
-      @crtc_output = CRTCVideo.new(characters, @via, registers, columns80: @model.video == :crtc80)
+      @crtc_output = CRTCVideo.new(characters, @via, registers, columns80: @model.video == :crtc80,
+                                                                board8296: @model.cbm8296?)
       @crtc = Chips::CRTC.new(@crtc_output, registers:)
       @ieee.connect(@pia1, @pia2, @via)
       @bus = Bus.new(model: @model, ram_kb:, editor: @model.editor(@refresh_hz), pia1: @pia1, pia2: @pia2,
-                     via: @via, crtc: @crtc)
+                     via: @via, crtc: @crtc, jumpers: @jumpers)
       @crtc_output.cells = @bus.screen.cells
       @discrete = DiscreteVideo.new(@bus.screen.cells, characters, @via)
       @canvas = @crtc_video ? @crtc_output.canvas : @discrete.canvas
       cassettes = @cassettes
-      @bus.on_io_write { cassettes.lines_written }
+      ieee = @ieee
+      @bus.on_io_write do
+        cassettes.lines_written
+        ieee.lines_written
+      end
       @cpu = CPU.new(@bus, debug:)
       @cycles = 0
       @init_handlers = []
@@ -116,6 +130,7 @@ module Badline
       @dos = nil
       @ieee_trap = nil
       @capture_output = nil
+      @drive2031 = nil
       @init_threshold = boot_cycles(ram_kb)
     end
 
@@ -123,8 +138,8 @@ module Badline
     def vertical_drive? = @vertical_drive
 
     # The model, its RAM and its editor's frame rate as the pause menu
-    # names them, such as "8032, 32K RAM, 50 HZ".
-    def model_label = "#{@model.name.upcase}, #{@ram_kb}K RAM, #{@refresh_hz} HZ"
+    # names them, such as "8032, 32K RAM, 50 HZ", all 128K on an 8296.
+    def model_label = "#{@model.name.upcase}, #{@model.cbm8296? ? 128 : @ram_kb}K RAM, #{@refresh_hz} HZ"
 
     # The Canvas a front end shows.
     def video = @canvas
@@ -146,7 +161,7 @@ module Badline
     end
 
     # The video counts and moves the vertical drive line, then the PIAs
-    # and the VIA clock, ahead of the CPU.
+    # and the VIA clock, ahead of the CPU, and the drive after it.
     def cycle!
       handle_init if @cycles == @init_threshold
       feed_keyboard if @pending_keys
@@ -165,6 +180,7 @@ module Badline
       @cassettes.cycle!
       @cpu.irq = @pia1.irq? || @pia2.irq? || @via.irq?
       @cpu.cycle!
+      @drive2031&.host_cycle!
 
       @cycles += 1
     end
@@ -173,14 +189,16 @@ module Badline
     # and #drain_samples.
     def sound_source = @sound
 
-    # The RES line reaches the CPU, the PIAs, the VIA, the CRTC and the
-    # 8096's control register.
+    # The RES line reaches the CPU, the PIAs, the VIA, the CRTC, the
+    # 8096's control register and, as IFC, the drive.
     def reset!
       @pia1.reset!
       @pia2.reset!
       @via.reset!
       @crtc.reset!
       @bus.reset!
+      @drive2031&.reset!
+      @ieee.lines_written
       @cpu.reset!
     end
 

data/lib/badline/roms/README

@@ -88,6 +88,18 @@ Downloaded from
 https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/new/1551/1551.318008-01.bin
 SHA-1 fae3c788ad9a6cc2dbdfbcf6c0264b2ca921d55e.
 
+dos2031.rom
+-----------
+The 2031 disk drive's DOS 2.6, 16 KB for $C000-$FFFF: 901484-03
+($C000-$DFFF, SHA-1 54d608f7f07860f24186749f21c96724dd48bc50)
+followed by 901484-05 ($E000-$FFFF, SHA-1
+ec6b75ecfdd4744e5d57979ef6af990444c11ae1). Drives::Model2031 loads it.
+
+Both halves downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/2031/
+and concatenated.
+SHA-1 c53e180a96649ceb3f421739e8dc66faba7cba44.
+
 Commodore VIC-20 ROMs
 =====================
 
@@ -253,7 +265,9 @@ BASIC 4 for $B000-$DFFF, 901465-23, 901465-20 and 901465-21
 (basic-4-b000.901465-23.bin, basic-4-c000.901465-20.bin,
 basic-4-d000.901465-21.bin) concatenated. 901465-23 is the patched
 $B000 chip that replaced 901465-19. The 8296's 324746-01 holds the same
-four chips.
+four chips (8296/kernal-basic-324746-01.bin, SHA-1
+e3e1431969bf317c885e47f3790e0bcbdf61fe77, $C000, $D000, $B000 and
+$F000 in that order), so the 8296 runs this file and kernal4.rom.
 SHA-1 d70bec479e1e3a0d0908a4897066e9959bbc11c8.
 
 pet/kernal4.rom
@@ -316,3 +330,21 @@ pet/editor4-80-b-60hz.rom
 The 8032's 60 Hz editor, 901474-03 (edit-4-80-b-60Hz.901474-03.bin),
 for $E000-$E7FF.
 SHA-1 c605fa343fd77c73cbe1e0e9567e2f014f6e7e30.
+
+pet/editor4-80-b-50hz-8296.rom
+------------------------------
+The 8296's 50 Hz editor, 324243-02B, the EPROM marked "8296 UE8" in
+Andre Fachat's working 8296 (8296/edit-50hz-324243-02b.bin), for
+$E000-$E7FF. The 8296 parts list names it the ASCII board's. It is
+901474-04 with the CRTC's register tables at $E72A changed to lines of
+59 cycles and frames of 339 lines (8296/edit-50hz-324243-02b.txt).
+SHA-1 b715db83fd26458dfd254bef5c4aae636753f7f5.
+
+pet/characters-din.rom
+----------------------
+The 8296's 4K character generator for the DIN board, 324242-01
+(8296/characters-324242-01.bin), which --characters din fits. Its
+second half is 901447-10 byte for byte, and its first a DIN set, with
+the German letters and the section sign in place of @ [ \ ] and in
+some of the graphics. The CRTC's MA13, bit 5 of R12, picks the half.
+SHA-1 9616f7f18757cccefb702a945f954b644d5b17d1.

data/lib/badline/snapshot/container.rb

@@ -38,6 +38,9 @@ module Badline
       PLUS4 = "PLUS4"
       # xpet names its machine PET, for every model.
       PET = "PET"
+      # The file format version each machine's VICE emulator reads, where
+      # it isn't FORMAT_MAJOR.0: xpet refuses any other than 1.0.
+      FORMAT_MAJORS = { PET => 1 }.freeze
       GZIP_MAGIC = "\x1f\x8b".b
 
       # The VICE version block, when VICE wrote the file: four version
@@ -67,7 +70,7 @@ module Badline
       def [](name) = @sections.find { |section| section.name == name }
 
       def to_s
-        header = MAGIC + [FORMAT_MAJOR, FORMAT_MINOR].pack("CC") + padded(@machine)
+        header = MAGIC + [FORMAT_MAJORS.fetch(@machine, FORMAT_MAJOR), FORMAT_MINOR].pack("CC") + padded(@machine)
         header += VERSION_MAGIC + @vice_version if @vice_version
         header + @sections.map { |section| encode(section) }.join
       end

data/lib/badline/snapshot/field_doc.rb

@@ -37,8 +37,8 @@ module Badline
       # The machines the doc is made from: each family at power-on, the C64
       # with each kind of expansion, cartridge and media, and a second SID,
       # the 264 series' models, its TCBM interface, cartridge, tape and
-      # true drives, the 1541 and the 1551, and a CRTC PET, a 2001, an 8096
-      # and a PET with a disk and tapes.
+      # true drives, the 1541 and the 1551, and a CRTC PET, a 2001, an 8096,
+      # an 8296 with its user port jumpered and a PET with a disk and tapes.
       def self.machines
         {
           "c64" => [C64.new, C64.new(ram_expansion: :plus256k), C64.new(reu: 512),
@@ -50,7 +50,8 @@ module Badline
                       Plus4.new(sid_card: :mos8580, sid_card_address: 0xfe80),
                       Plus4.new(ram_expansion: :csory256),
                       plus4_with_cartridge, plus4_with_tape, plus4_with_drive, plus4_with_drive("1551")],
-          "pet" => [PET.new, PET.new(model: "2001"), PET.new(model: "8096"), pet_with_media]
+          "pet" => [PET.new, PET.new(model: "2001"), PET.new(model: "8096"),
+                    PET.new(model: "8296", characters: "din", jumpers: %w[userport]), pet_with_media]
         }
       end