-machine/spi_sdcard.cpp: Generate appropriate CSD for mounted image.

* The Linux/4004 firmware gets very upset if the CSD looks like an SDHC
  Card but the card acts like an SD Card or vice versa.

-machine/spi_psram.cpp: Added SPI ram device compatible with SPI SRAM
 and Pseudo-SRAM chips for small transfers.  Additional functionality
 will be added as use cases arise.

-cpu/mcs40: Don't log messages about NOP aliases for the 4004 (the
 Linux/4004 firmware uses these for instrumentation points).

Author: cuavas

scripts/src/machine.lua

@@ -4571,6 +4571,17 @@ if (MACHINES["SMARTMEDIA"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/spi_psram.h,MACHINES["SPIPSRAM"] = true
+---------------------------------------------------
+if (MACHINES["SPIPSRAM"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/spi_psram.cpp",
+		MAME_DIR .. "src/devices/machine/spi_psram.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/spi_sdcard.h,MACHINES["SPISDCARD"] = true

src/devices/bus/a2bus/a2sd.cpp

@@ -22,13 +22,18 @@
 #include "emu.h"
 #include "a2sd.h"
 
+#include "machine/at28c64b.h"
+#include "machine/spi_sdcard.h"
+
 #define LOG_SPI     (1U << 1)
 
-//#define VERBOSE (LOG_COMMAND)
+//#define VERBOSE (LOG_GENERAL)
 #define LOG_OUTPUT_FUNC osd_printf_info
 
 #include "logmacro.h"
 
+namespace {
+
 /***************************************************************************
     PARAMETERS
 ***************************************************************************/
@@ -41,17 +46,56 @@ static constexpr u8 C0N1_TC         = 0x80; // SPI transfer complete
 static constexpr u8 C0N3_CD         = 0x40; // card detect
 static constexpr u8 C0N3_BIT_SS     = 7;
 
-//**************************************************************************
-//  GLOBAL VARIABLES
-//**************************************************************************
-
-DEFINE_DEVICE_TYPE(A2BUS_A2SD, a2bus_a2sd_device, "a2sd", "Apple II SD Card")
-
 ROM_START( a2sd )
 	ROM_REGION(0x2000, "flash", ROMREGION_ERASE00)
 	ROM_LOAD( "appleiisd.bin", 0x000000, 0x000800, CRC(e82eea8a) SHA1(7e0acef01e622eeed6f8e87893d07c701bbef016) )
 ROM_END
 
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class a2bus_a2sd_device:
+		public device_t,
+		public device_a2bus_card_interface
+{
+public:
+	// construction/destruction
+	a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	a2bus_a2sd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+
+	// overrides of standard a2bus slot functions
+	virtual u8 read_c0nx(u8 offset) override;
+	virtual void write_c0nx(u8 offset, u8 data) override;
+	virtual u8 read_cnxx(u8 offset) override;
+	virtual void write_cnxx(u8 offset, u8 data) override;
+	virtual u8 read_c800(uint16_t offset) override;
+	virtual void write_c800(uint16_t offset, u8 data) override;
+
+	// SPI 4-wire interface
+	void spi_miso_w(int state) { m_in_bit = state; }
+
+	TIMER_CALLBACK_MEMBER(shift_tick);
+
+private:
+	required_device<at28c64b_device> m_flash;
+	required_device<spi_sdcard_device> m_sdcard;
+
+	u8 m_datain, m_in_latch, m_out_latch;
+	u8 m_c0n1, m_c0n3;
+	int m_in_bit;
+
+	int m_shift_count;
+	emu_timer *m_shift_timer;
+};
+
 /***************************************************************************
     FUNCTION PROTOTYPES
 ***************************************************************************/
@@ -64,6 +108,7 @@ void a2bus_a2sd_device::device_add_mconfig(machine_config &config)
 	AT28C64B(config, m_flash, 0);
 
 	SPI_SDCARD(config, m_sdcard, 0);
+	m_sdcard->set_prefer_sdhc();
 	m_sdcard->spi_miso_callback().set(FUNC(a2bus_a2sd_device::spi_miso_w));
 }
 
@@ -277,3 +322,12 @@ void a2bus_a2sd_device::write_c800(u16 offset, u8 data)
 {
 	m_flash->write(offset + 0x100, data);
 }
+
+} // anonymous namespace
+
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_A2SD, device_a2bus_card_interface, a2bus_a2sd_device, "a2sd", "Apple II SD Card")

src/devices/bus/a2bus/a2sd.h

@@ -14,54 +14,7 @@
 #pragma once
 
 #include "a2bus.h"
-#include "machine/at28c64b.h"
-#include "machine/spi_sdcard.h"
 
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-class a2bus_a2sd_device:
-	public device_t,
-	public device_a2bus_card_interface
-{
-public:
-	// construction/destruction
-	a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	a2bus_a2sd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
-	virtual void device_start() override ATTR_COLD;
-	virtual void device_reset() override ATTR_COLD;
-	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
-	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
-
-	// overrides of standard a2bus slot functions
-	virtual u8 read_c0nx(u8 offset) override;
-	virtual void write_c0nx(u8 offset, u8 data) override;
-	virtual u8 read_cnxx(u8 offset) override;
-	virtual void write_cnxx(u8 offset, u8 data) override;
-	virtual u8 read_c800(uint16_t offset) override;
-	virtual void write_c800(uint16_t offset, u8 data) override;
-
-	// SPI 4-wire interface
-	void spi_miso_w(int state) { m_in_bit = state; }
-
-	TIMER_CALLBACK_MEMBER(shift_tick);
-private:
-	required_device<at28c64b_device> m_flash;
-	required_device<spi_sdcard_device> m_sdcard;
-
-	u8 m_datain, m_in_latch, m_out_latch;
-	u8 m_c0n1, m_c0n3;
-	int m_in_bit;
-
-	int m_shift_count;
-	emu_timer *m_shift_timer;
-};
-
-// device type definition
-DECLARE_DEVICE_TYPE(A2BUS_A2SD, a2bus_a2sd_device)
+DECLARE_DEVICE_TYPE(A2BUS_A2SD, device_a2bus_card_interface)
 
 #endif // MAME_BUS_A2BUS_A2SD_H

src/devices/bus/bbc/cart/mastersd.cpp

@@ -12,13 +12,64 @@
 #include "emu.h"
 #include "mastersd.h"
 
+#include "machine/spi_sdcard.h"
+
+
+namespace {
 
 //**************************************************************************
-//  DEVICE DEFINITIONS
+//  TYPE DEFINITIONS
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(BBC_MASTERSD, bbc_mastersd_device, "bbc_mastersd", "MasterSD BBC Master SD Cartridge")
-DEFINE_DEVICE_TYPE(BBC_MASTERSDR2, bbc_mastersdr2_device, "bbc_mastersdr2", "MasterSD R2 BBC Master SD Cartridge")
+// ======================> bbc_mastersd_device
+
+class bbc_mastersd_device : public device_t, public device_bbc_cart_interface
+{
+public:
+	// construction/destruction
+	bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	bbc_mastersd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device_t implementation
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+
+	// device_bbc_cart_interface implementation
+	virtual uint8_t read(offs_t offset, int infc, int infd, int romqa, int oe, int oe2) override;
+	virtual void write(offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2) override;
+
+	TIMER_CALLBACK_MEMBER(spi_clock);
+
+	required_device<spi_sdcard_device> m_sdcard;
+
+	emu_timer *m_spi_clock;
+	bool m_spi_clock_state;
+	bool m_spi_clock_sysclk;
+	int m_spi_clock_cycles;
+	int m_in_bit;
+	uint8_t m_in_latch;
+	uint8_t m_out_latch;
+
+	std::unique_ptr<uint8_t[]> m_ram;
+};
+
+
+// ======================> bbc_mastersdr2_device
+
+class bbc_mastersdr2_device : public bbc_mastersd_device
+{
+public:
+	// construction/destruction
+	bbc_mastersdr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device_bbc_cart_interface implementation
+	virtual uint8_t read(offs_t offset, int infc, int infd, int romqa, int oe, int oe2) override;
+	virtual void write(offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2) override;
+};
 
 
 //-------------------------------------------------
@@ -28,6 +79,7 @@ DEFINE_DEVICE_TYPE(BBC_MASTERSDR2, bbc_mastersdr2_device, "bbc_mastersdr2", "Mas
 void bbc_mastersd_device::device_add_mconfig(machine_config &config)
 {
 	SPI_SDCARD(config, m_sdcard, 0);
+	m_sdcard->set_prefer_sdhc();
 	m_sdcard->spi_miso_callback().set([this](int state) { m_in_bit = state; });
 }
 
@@ -245,3 +297,13 @@ TIMER_CALLBACK_MEMBER(bbc_mastersd_device::spi_clock)
 		m_spi_clock->adjust(attotime::never);
 	}
 }
+
+} // anonymous namespace
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE_PRIVATE(BBC_MASTERSD, device_bbc_cart_interface, bbc_mastersd_device, "bbc_mastersd", "MasterSD BBC Master SD Cartridge")
+DEFINE_DEVICE_TYPE_PRIVATE(BBC_MASTERSDR2, device_bbc_cart_interface, bbc_mastersdr2_device, "bbc_mastersdr2", "MasterSD R2 BBC Master SD Cartridge")

src/devices/bus/bbc/cart/mastersd.h

@@ -9,71 +9,12 @@
 #ifndef MAME_BUS_BBC_CART_MASTERSD_H
 #define MAME_BUS_BBC_CART_MASTERSD_H
 
-#include "slot.h"
-#include "machine/spi_sdcard.h"
-
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// ======================> bbc_mastersd_device
-
-class bbc_mastersd_device : public device_t, public device_bbc_cart_interface
-{
-public:
-	// construction/destruction
-	bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	bbc_mastersd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
-	// device-level overrides
-	virtual void device_start() override ATTR_COLD;
-	virtual void device_reset() override ATTR_COLD;
-
-	// optional information overrides
-	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
-
-	// electron_cart_interface overrides
-	virtual uint8_t read(offs_t offset, int infc, int infd, int romqa, int oe, int oe2) override;
-	virtual void write(offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2) override;
-
-	required_device<spi_sdcard_device> m_sdcard;
-
-	TIMER_CALLBACK_MEMBER(spi_clock);
-
-	emu_timer *m_spi_clock;
-	bool m_spi_clock_state;
-	bool m_spi_clock_sysclk;
-	int m_spi_clock_cycles;
-	int m_in_bit;
-	uint8_t m_in_latch;
-	uint8_t m_out_latch;
-
-	std::unique_ptr<uint8_t[]> m_ram;
-};
-
-
-// ======================> bbc_mastersdr2_device
-
-class bbc_mastersdr2_device : public bbc_mastersd_device
-{
-public:
-	// construction/destruction
-	bbc_mastersdr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	// electron_cart_interface overrides
-	virtual uint8_t read(offs_t offset, int infc, int infd, int romqa, int oe, int oe2) override;
-	virtual void write(offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2) override;
-};
-
+#pragma once
 
+#include "slot.h"
 
-// device type definition
-DECLARE_DEVICE_TYPE(BBC_MASTERSD, bbc_mastersd_device)
-DECLARE_DEVICE_TYPE(BBC_MASTERSDR2, bbc_mastersdr2_device)
 
+DECLARE_DEVICE_TYPE(BBC_MASTERSD, device_bbc_cart_interface)
+DECLARE_DEVICE_TYPE(BBC_MASTERSDR2, device_bbc_cart_interface)
 
 #endif // MAME_BUS_BBC_CART_MASTERSD_H