sd: SdCard renamed to SdCardPeripheral.

This is the type which meets the via6522.ParallelPeripheral interface,
but doesn't implement the SD card details.

Author: pda

go6502.go

@@ -76,7 +76,7 @@ func mainReturningStatus() int {
 	}
 
 	if len(options.SdCard) > 0 {
-		sd, err := sd.NewSdCard(spi.PinMap{
+		sd, err := sd.NewSdCardPeripheral(spi.PinMap{
 			Sclk: 0,
 			Mosi: 6,
 			Miso: 7,

sd/sd.go

@@ -2,68 +2,3 @@
 	Package SD emulates an SD/MMC card.
 */
 package sd
-
-import (
-	"io/ioutil"
-
-	"github.com/pda/go6502/spi"
-)
-
-type SdCard struct {
-	state *sdState
-	spi   *spi.Slave
-}
-
-// SdFromFile creates a new SdCard based on the contents of a file.
-func NewSdCard(pm spi.PinMap) (sd *SdCard, err error) {
-	sd = &SdCard{
-		state: newSdState(),
-		spi:   spi.NewSlave(pm),
-	}
-
-	// two busy bytes, then ready.
-	sd.state.queueMisoBytes(0x00, 0x00, 0xFF)
-
-	return
-}
-
-func (sd *SdCard) PinMask() byte {
-	return sd.spi.PinMask()
-}
-
-// LoadFile is equivalent to inserting an SD card.
-func (sd *SdCard) LoadFile(path string) (err error) {
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return
-	}
-	sd.state.data = data
-	return
-}
-
-func (sd *SdCard) Shutdown() {
-}
-
-func (sd *SdCard) Read() byte {
-	return sd.spi.Read()
-}
-
-// Write takes an updated parallel port state.
-func (sd *SdCard) Write(data byte) {
-	if sd.spi.Write(data) {
-		if sd.spi.Done {
-			mosi := sd.spi.Mosi
-			//fmt.Printf("SD MOSI $%02X %08b <-> $%02X %08b MISO\n",
-			//	mosi, mosi, sd.spi.Miso, sd.spi.Miso)
-
-			// consume the byte read, queue miso bytes internally
-			sd.state.consumeByte(mosi)
-			// dequeues one miso byte, or a default byte if queue empty.
-			sd.spi.QueueMisoBits(sd.state.shiftMiso())
-		}
-	}
-}
-
-func (sd *SdCard) String() string {
-	return "SD card"
-}

sd/sd_card_peripheral.go

@@ -0,0 +1,68 @@
+package sd
+
+import (
+	"io/ioutil"
+
+	"github.com/pda/go6502/spi"
+)
+
+type SdCardPeripheral struct {
+	state *sdState
+	spi   *spi.Slave
+}
+
+// SdFromFile creates a new SdCardPeripheral based on the contents of a file.
+func NewSdCardPeripheral(pm spi.PinMap) (sd *SdCardPeripheral, err error) {
+	sd = &SdCardPeripheral{
+		state: newSdState(),
+		spi:   spi.NewSlave(pm),
+	}
+
+	// two busy bytes, then ready.
+	sd.state.queueMisoBytes(0x00, 0x00, 0xFF)
+
+	return
+}
+
+// LoadFile is equivalent to inserting an SD card.
+func (sd *SdCardPeripheral) LoadFile(path string) (err error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return
+	}
+	sd.state.data = data
+	return
+}
+
+// via6522.ParallelPeripheral interface
+
+func (sd *SdCardPeripheral) PinMask() byte {
+	return sd.spi.PinMask()
+}
+
+func (sd *SdCardPeripheral) Read() byte {
+	return sd.spi.Read()
+}
+
+func (sd *SdCardPeripheral) Shutdown() {
+}
+
+// Write takes an updated parallel port state.
+func (sd *SdCardPeripheral) Write(data byte) {
+	if sd.spi.Write(data) {
+		if sd.spi.Done {
+			mosi := sd.spi.Mosi
+			//fmt.Printf("SD MOSI $%02X %08b <-> $%02X %08b MISO\n",
+			//	mosi, mosi, sd.spi.Miso, sd.spi.Miso)
+
+			// consume the byte read, queue miso bytes internally
+			sd.state.consumeByte(mosi)
+			// dequeues one miso byte, or a default byte if queue empty.
+			sd.spi.QueueMisoBits(sd.state.shiftMiso())
+		}
+	}
+}
+
+func (sd *SdCardPeripheral) String() string {
+	return "SD card"
+}

sd/sd_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestSdPinMask(t *testing.T) {
-	sd, _ := NewSdCard(spi.PinMap{Sclk: 4, Mosi: 5, Miso: 6, Ss: 7})
+	sd, _ := NewSdCardPeripheral(spi.PinMap{Sclk: 4, Mosi: 5, Miso: 6, Ss: 7})
 	if sd.PinMask() != 0xF0 {
 		t.Error(fmt.Sprintf("0b%08b != 0b%08b", sd.PinMask(), 0xF0))
 	}