badline 0.15.0 → 0.15.1

data/lib/badline/snapshot/plus4_setup.rb

@@ -4,20 +4,33 @@ module Badline
   module Snapshot
     # How a 264 series machine was built: its model's name, one of
     # Plus4::Model::ALL, which also says whether the Plus/4's function ROMs
-    # are fitted, its RAM in K, and whether a 1551's TCBM interface is
-    # plugged in, the arguments Plus4.new takes.
-    Plus4Setup = Data.define(:model, :ram_kb, :tcbm)
+    # are fitted, its RAM in K, whether a 1551's TCBM interface is plugged
+    # in, the SID card's SID model, or nil without one, and its address,
+    # and the RAM expansion's kind, or nil without one, the arguments
+    # Plus4.new takes.
+    Plus4Setup = Data.define(:model, :ram_kb, :tcbm, :sid_card, :sid_card_address, :ram_expansion)
 
     class Plus4Setup
       MODELS = Plus4::Model::ALL.map(&:name).freeze
 
+      SID_CARDS = %w[none mos6581 mos8580].freeze
+
+      RAM_EXPANSIONS = ["none", *Plus4::RAMExpansion::KINDS.keys.map(&:to_s)].freeze
+
       # The setup of `machine`.
-      def self.of(machine) = new(model: machine.model.name, ram_kb: machine.ram_kb, tcbm: !machine.tias.empty?)
+      def self.of(machine)
+        card = machine.sid_card
+        new(model: machine.model.name, ram_kb: machine.ram_kb, tcbm: !machine.tias.empty?, sid_card: card&.model,
+            sid_card_address: card ? card.address : Plus4::SIDCard::ADDRESSES.first,
+            ram_expansion: machine.ram_expansion&.kind)
+      end
 
-      # The model by name, the RAM and the TCBM interface, in a keyed
-      # snapshot module.
+      # The model by name, the RAM, the TCBM interface, the SID card's
+      # model and address and the RAM expansion's kind, "none" without
+      # them, in a keyed snapshot module.
       def write_fields(out)
-        out.text("model", model).int("ram_kb", ram_kb).bool("tcbm", tcbm)
+        out.text("model", model).int("ram_kb", ram_kb).bool("tcbm", tcbm).text("sid_card", (sid_card || :none).to_s)
+        out.int("sid_card_address", sid_card_address).text("ram_expansion", (ram_expansion || :none).to_s)
       end
 
       def self.read_fields(input)
@@ -27,13 +40,42 @@ module Badline
           raise FormatError, "the snapshot is of a Plus/4 with #{ram_kb}K of RAM, which badline doesn't build"
         end
 
-        new(model:, ram_kb:, tcbm: input.bool("tcbm", false))
+        sid_card = named(input.choice("sid_card", SID_CARDS, "none"))
+        ram_expansion = named(input.choice("ram_expansion", RAM_EXPANSIONS, "none"))
+        new(model:, ram_kb:, tcbm: input.bool("tcbm", false), sid_card:, sid_card_address: sid_card_address(input),
+            ram_expansion:)
       end
 
+      # A choice's name as a Symbol, or nil for "none".
+      def self.named(name) = name == "none" ? nil : name.to_sym
+
+      def self.sid_card_address(input)
+        address = input.int("sid_card_address", Plus4::SIDCard::ADDRESSES.first)
+        return address if Plus4::SIDCard::ADDRESSES.include?(address)
+
+        raise FormatError, format("the snapshot is of a Plus/4 with a SID card at $%<address>04X, " \
+                                  "which badline doesn't build", address:)
+      end
+      private_class_method :named, :sid_card_address
+
       # A machine built this way, at power-on.
-      def build = Plus4.new(model:, ram: ram_kb, tcbm:)
+      def build = Plus4.new(model:, ram: ram_kb, tcbm:, sid_card:, sid_card_address:, ram_expansion:)
+
+      def to_s
+        parts = ["#{ram_kb}K"]
+        parts << "a TCBM interface" if tcbm
+        parts << sid_card_part if sid_card
+        parts << "a #{ram_expansion} RAM expansion" if ram_expansion
+        "#{model} with #{parts.join(' and ')}"
+      end
 
-      def to_s = "#{model} with #{ram_kb}K#{' and a TCBM interface' if tcbm}"
+      private
+
+      def sid_card_part
+        format("%<article>s %<model>s SID card at $%<address>04X", article: sid_card == :mos8580 ? "an" : "a",
+                                                                   model: sid_card.to_s.delete_prefix("mos"),
+                                                                   address: sid_card_address)
+      end
     end
   end
 end

data/lib/badline/storage/g64_image.rb

@@ -47,7 +47,7 @@ module Badline
       # track 1 and 1 for track 1.5, laid out as VICE lays one out: every
       # block as long as the longest track.
       def self.create(path, tracks, half_tracks: HALF_TRACKS)
-        max = tracks.values.map { |bytes, _| bytes.length }.push(MAX_TRACK_SIZE).max
+        max = [MAX_TRACK_SIZE, *tracks.values.map { |bytes, _| bytes.length }].max
         offsets = Array.new(half_tracks, 0)
         zones = Array.new(half_tracks, 0)
         blocks = +"".b

data/lib/badline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Badline
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -259,6 +259,7 @@ files:
 - lib/badline/drives/engine/idle.rb
 - lib/badline/drives/engine/idle_cpu.rb
 - lib/badline/drives/engine/orbit.rb
+- lib/badline/drives/engine/serial_connection.rb
 - lib/badline/drives/engine/serial_lines.rb
 - lib/badline/drives/engine/sleep.rb
 - lib/badline/drives/engine/vias.rb
@@ -276,6 +277,13 @@ files:
 - lib/badline/drives/model1541/sector_reader.rb
 - lib/badline/drives/model1541/serial_port.rb
 - lib/badline/drives/model1541/track.rb
+- lib/badline/drives/model1551.rb
+- lib/badline/drives/model1551/bus.rb
+- lib/badline/drives/model1551/cable.rb
+- lib/badline/drives/model1551/cpu.rb
+- lib/badline/drives/model1551/keyed_state.rb
+- lib/badline/drives/model1551/port.rb
+- lib/badline/drives/model1551/tia.rb
 - lib/badline/drives/model1571.rb
 - lib/badline/drives/model1571/bus.rb
 - lib/badline/drives/model1571/cpu.rb
@@ -401,6 +409,7 @@ files:
 - lib/badline/options/validation.rb
 - lib/badline/plus4.rb
 - lib/badline/plus4/acia.rb
+- lib/badline/plus4/acia/frames.rb
 - lib/badline/plus4/bus.rb
 - lib/badline/plus4/cassette_sense.rb
 - lib/badline/plus4/cpu.rb
@@ -410,6 +419,10 @@ files:
 - lib/badline/plus4/keyed_parts.rb
 - lib/badline/plus4/keyed_state.rb
 - lib/badline/plus4/model.rb
+- lib/badline/plus4/ram_expansion.rb
+- lib/badline/plus4/sid_card.rb
+- lib/badline/plus4/sound_mix.rb
+- lib/badline/plus4/tcbm_drive.rb
 - lib/badline/plus4/user_port.rb
 - lib/badline/region.rb
 - lib/badline/rom.rb
@@ -421,6 +434,7 @@ files:
 - lib/badline/roms/c64gs.rom
 - lib/badline/roms/character.rom
 - lib/badline/roms/dos1541.rom
+- lib/badline/roms/dos1551.rom
 - lib/badline/roms/dos1571.rom
 - lib/badline/roms/dos1581.rom
 - lib/badline/roms/eapi/LICENSE.md