Return a flashair IP from the simulated SD (#290)

* Add support for returning a flashair IP from the SD
* Add test case to check IP address read.

Author: vintagepc

.github/workflows/build.yml

@@ -119,7 +119,7 @@ jobs:
 
     - name: Install packages
       run: |
-          brew cask install xquartz
+          brew install --cask xquartz
           brew tap osx-cross/avr
           brew install libelf freeglut glew SDL avr-gcc libpng
 

parts/components/SDCard.cpp

@@ -158,7 +158,7 @@ const uint16_t SDCard::m_crctab[256] = {
 /* Debug macros. */
 // #define SD_CARD_DEBUG
 #ifdef SD_CARD_DEBUG
-#define DEBUG(m, ...) fprintf (stderr, "%lu: sdcard: " m "\n", avr->cycle, __VA_ARGS__);
+#define DEBUG(m, ...) fprintf(stderr, "%lu: sdcard:" m "\n", m_pAVR->cycle, __VA_ARGS__ )
 #else
 #define DEBUG(m, ...) do{}while(0)
 #endif
@@ -280,6 +280,29 @@ SDCard::State SDCard::ProcessCommand()
 			/* Application-specific. TODO: No idea what this does. */
 			COMMAND_RESPONSE_R1 (0x00);
 			break;
+		case Command::CMD48:
+		{
+			/* FlashAir specific, just for the IP */
+			extRegRead cmd {.all = m_CmdIn.bits.address};
+			if (cmd.bits.mio == 1 && cmd.bits.function == 0b0010 && cmd.bits.address == 0x550)
+			{
+				if (cmd.bits.length == 3)
+				{
+					// IP request. (12.34.56.78)
+					COMMAND_RESPONSE_R1(0x00);
+					next_state = State::DATA_READ_TOKEN;
+					memset(m_tmpdata.begin(), 0, m_tmpdata.size_bytes());
+					m_tmpdata[0] = 123;
+					m_tmpdata[1] = 45;
+					m_tmpdata[2] = 67;
+					m_tmpdata[3] = 89;
+					m_currOp.SetData(m_tmpdata);
+					break;
+				}
+			}
+			DEBUG("Unimplemented Extension Register (CMD48) request! %u", m_CmdIn.bits.address);
+			break;
+		}
 		case Command::CMD55:
 			/* APP_CMD. Indicates to the card that the next command is an application specific command. */
 			COMMAND_RESPONSE_R1 (0x00);
@@ -302,7 +325,7 @@ SDCard::State SDCard::ProcessCommand()
 void SDCard::OnCSELIn (struct avr_irq_t *, uint32_t value)
 {
 	m_bSelected = value==0;
-	DEBUG ("SD card selected: %u. In state: %d", m_bSelected, m_state);
+	//DEBUG ("SD card selected: %u. In state: %d", m_bSelected, static_cast<int>(m_state));
 	if (!m_bSelected)
 	{
 		m_state = State::IDLE;
@@ -311,7 +334,7 @@ void SDCard::OnCSELIn (struct avr_irq_t *, uint32_t value)
 
 uint8_t SDCard::OnSPIIn(struct avr_irq_t *, uint32_t value)
 {
-	DEBUG ("Received byte %x (in state %d).", value, m_state);
+	//DEBUG ("Received byte %x (in state %d).", value, static_cast<int>(m_state));
 	uint8_t uiReply = 0xFF;
 	/* Handle the command. */
 	switch (m_state) {
@@ -494,7 +517,7 @@ void SDCard::SetCSDCSize(off_t c_size)
 	m_csd[15] = CRC7(m_csd.subspan(0,m_csd.size()-1));
 #ifdef SD_CARD_DEBUG
 	printf("CSD: ");
-	for (int i = 0; i < sizeof(m_csd); i++)
+	for (auto i = 0u; i < sizeof(m_csd); i++)
 	{
 		printf("%02hX", m_csd[i]);
 	}

parts/components/SDCard.h

@@ -128,6 +128,7 @@ class SDCard:public SPIPeripheral, public Scriptable, private IKeyClient
 			CMD17 = 17,
 			CMD24 = 24,
 			CMD41 = 41,
+			CMD48 = 48,
 			CMD55 = 55,
 			CMD58 = 58,
 		};
@@ -151,6 +152,18 @@ class SDCard:public SPIPeripheral, public Scriptable, private IKeyClient
 
 		uint8_t m_CmdCount = 0;
 
+		using extRegRead = union {
+			uint32_t all;
+			struct {
+				uint32_t length :9;
+				uint32_t address :17;
+				uint32_t rev :1;
+				uint32_t function :4;
+				uint32_t mio :1;
+
+			} __attribute__ ((__packed__)) bits;
+		};
+
 		struct {
 			uint8_t data[5];
 			uint8_t length; /* number of bytes of data which are valid */
@@ -189,6 +202,9 @@ class SDCard:public SPIPeripheral, public Scriptable, private IKeyClient
 		uint8_t _m_ByteCRC[2] = {0,0};
 		gsl::span<uint8_t> m_byteCRC {_m_ByteCRC};
 
+		uint8_t _m_tmpdata[512] = {0};
+		gsl::span<uint8_t> m_tmpdata {_m_tmpdata};
+
 		/* Card data. */
 		gsl::span<uint8_t> m_data; /* mmap()ed data */
 		int m_data_fd = -1;

scripts/tests/test_SD.c

@@ -200,6 +200,9 @@ int main()
 	// Read a block, address OOR
 	SDTX(0x11,0xFFFFFFFFFFULL,1);
 
+	// Get extended register for IP address (flashair)
+	SDTX(48u,0x900AA003ULL,513);
+
 	// Read a block, address misalign
 	SDTX(0x11,0x0ULL,516);
 

scripts/tests/test_SD.txt

@@ -24,6 +24,7 @@ Serial0::NextLineMustBe(REPLY 00c0000000) #CMD58
 Serial0::NextLineMustBe(REPLY 00) #CMD41
 Serial0::NextLineMustBe(REPLY 00) #CMD55
 Serial0::NextLineMustBe(REPLY 40) #17 with bad address
+Serial0::NextLineMustBe(REPLY 00fe7b2d4359000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000) # IP check
 Serial0::NextLineMustBe(REPLY 00feeb58906d6b66732e66617400020120000200000000f80000200040000000000000000200f103000000000000020000000100060000000000000000000000000080002900000000202020202020202020202046415433322020200e1fbe777cac22c0740b56b40ebb0700cd105eebf032e4cd16cd19ebfe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055aa14cc)
 Serial0::NextLineMustBe(REPLY 40) #24 with bad address
 Serial0::NextLineMustBe(WRITTEN)