greenpak4: Added pin 13 reset output support for SLG46140V

azonenberg · azonenberg · commit 43627e923502 · 2016-10-25T21:21:23.000-07:00
diff --git a/src/gp4par/par_main.cpp b/src/gp4par/par_main.cpp
@@ -356,37 +356,49 @@ bool PostPARDRC(PARGraph* netlist, Greenpak4Device* device)
 		//TODO: Cannot use DAC1 when ADC is used
 	}
 
-	//If POR is driven to an IOB, it should be pin 8 using dedicated routing
+	//If POR is driven to an IOB, it should use dedicated routing
 	//If not, warn about timing
-	if(
-		(device->GetPart() == Greenpak4Device::GREENPAK4_SLG46620) ||
-		(device->GetPart() == Greenpak4Device::GREENPAK4_SLG46621)
-		)
+	auto por = device->GetPowerOnReset()->GetPARNode()->GetMate();
+	if(por)
 	{
-		//Get all IOB loads of the POR
-		auto p8 = device->GetIOB(8);
-		auto por = device->GetPowerOnReset()->GetPARNode()->GetMate();
-		if(por)
+		Greenpak4IOB* reset_iob = NULL;
+
+		//Find the dedicated reset pin
+		auto part = device->GetPart();
+		switch(part)
 		{
-			for(uint32_t i=0; i<por->GetEdgeCount(); i++)
-			{
-				auto dest = por->GetEdgeByIndex(i)->m_destnode->GetMate();
-				auto n = static_cast<Greenpak4BitstreamEntity*>(dest->GetData())->GetRealEntity();
+			case Greenpak4Device::GREENPAK4_SLG46620:
+			case Greenpak4Device::GREENPAK4_SLG46621:
+				reset_iob = device->GetIOB(8);
+				break;
 
-				auto ioba = dynamic_cast<Greenpak4IOBTypeA*>(n);
-				auto iobb = dynamic_cast<Greenpak4IOBTypeB*>(n);
+			case Greenpak4Device::GREENPAK4_SLG46140:
+				reset_iob = device->GetIOB(13);
+				break;
 
-				if( (ioba == NULL) && (iobb == NULL) )
-					continue;
+			default:
+				LogError("unrecognized device, cannot DRC POR routing\n");
+		}
 
-				if(n != p8)
-				{
-					LogWarning(
-						"Pin %s is driven by the power-on reset, but is does not have dedicated reset routing.\n"
-						"This may lead to synchronization issues or glitches if this pin is used to drive resets on "
-						"external logic.\n",
-						n->GetDescription().c_str());
-				}
+		//Look for IOBs driven by the PAR
+		for(uint32_t i=0; i<por->GetEdgeCount(); i++)
+		{
+			auto dest = por->GetEdgeByIndex(i)->m_destnode->GetMate();
+			auto n = static_cast<Greenpak4BitstreamEntity*>(dest->GetData())->GetRealEntity();
+
+			auto ioba = dynamic_cast<Greenpak4IOBTypeA*>(n);
+			auto iobb = dynamic_cast<Greenpak4IOBTypeB*>(n);
+
+			if( (ioba == NULL) && (iobb == NULL) )
+				continue;
+
+			if(n != reset_iob)
+			{
+				LogWarning(
+					"Pin %s is driven by the power-on reset, but is does not have dedicated reset routing.\n"
+					"This may lead to synchronization issues or glitches if this pin is used to drive resets on "
+					"external logic.\n",
+					n->GetDescription().c_str());
 			}
 		}
 	}
diff --git a/src/greenpak4/Greenpak4IOBTypeB.cpp b/src/greenpak4/Greenpak4IOBTypeB.cpp
@@ -79,20 +79,25 @@ bool Greenpak4IOBTypeB::Save(bool* bitstream)
 	if(!WriteMatrixSelector(bitstream, m_inputBaseWord, m_outputSignal))
 		return false;
 
-	//If we are pin 8 on the SLG4662x, use dedicated routing when driven by the POR block
-	if((m_pinNumber == 8) && (m_outputSignal.GetRealEntity() == m_device->GetPowerOnReset()) )
+	//Use dedicated routing when driven by the POR block
+	if(m_outputSignal.GetRealEntity() == m_device->GetPowerOnReset())
 	{
-		if(
-			(m_device->GetPart() == Greenpak4Device::GREENPAK4_SLG46620) ||
-			(m_device->GetPart() == Greenpak4Device::GREENPAK4_SLG46621)
+		if( (m_pinNumber == 8) &&
+			(
+				(m_device->GetPart() == Greenpak4Device::GREENPAK4_SLG46620) ||
+				(m_device->GetPart() == Greenpak4Device::GREENPAK4_SLG46621)
+			)
 		)
 		{
 			bitstream[2012] = true;
 			bitstream[2011] = false;
 		}
 
-		else
-			LogError("Greenpak4IOBTypeB: not implemented for 46140 yet\n");
+		else if( (m_pinNumber == 13) && (m_device->GetPart() == Greenpak4Device::GREENPAK4_SLG46140) )
+		{
+			bitstream[999] = 1;
+			bitstream[998] = 0;
+		}
 	}
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
