updated fpga_architecture.xsd definitions for xml_lint target

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

fpga_architecture.xsd

diff --git a/fpga_architecture.xsd b/fpga_architecture.xsd
index a5c5f21..c5e8908 100644
--- a/fpga_architecture.xsd
+++ b/fpga_architecture.xsd
@@ -308,7 +308,7 @@
     </xs:restriction>

   </xs:simpleType>

 

-  <xs:simpleType name="pb_input_equivalent">

+  <xs:simpleType name="input_equivalent">

      <xs:restriction base="xs:string">

       <xs:enumeration value="none"/>

       <xs:enumeration value="full"/>

@@ -316,35 +316,35 @@
     </xs:restriction>

   </xs:simpleType>

 

-  <xs:complexType name="pb_type_input">

+  <xs:complexType name="input_port">

     <xs:sequence>

       <xs:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded"/>

     </xs:sequence>

     <xs:attribute name="name" type="xs:string" use="required"/>

-    <xs:attribute name="equivalent" type="pb_input_equivalent" default="none"/>

+    <xs:attribute name="equivalent" type="input_equivalent" default="none"/>

     <xs:attribute name="num_pins" type="xs:int" use="required"/>

     <xs:attribute name="is_non_clock_global" type="xs:boolean"/>

     <xs:attribute name="port_class" type="xs:string" />

   </xs:complexType>

 

-  <xs:simpleType name="pb_output_equivalent">

+  <xs:simpleType name="output_equivalent">

      <xs:restriction base="xs:string">

       <xs:enumeration value="none"/>

       <xs:enumeration value="full"/>

     </xs:restriction>

   </xs:simpleType>

 

-  <xs:complexType name="pb_type_output">

+  <xs:complexType name="output_port">

     <xs:sequence>

       <xs:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded"/>

     </xs:sequence>

     <xs:attribute name="name" type="xs:string" use="required"/>

-    <xs:attribute name="equivalent" type="pb_output_equivalent" default="none"/>

+    <xs:attribute name="equivalent" type="output_equivalent" default="none"/>

     <xs:attribute name="num_pins" type="xs:int" use="required"/>

     <xs:attribute name="port_class" type="xs:string" />

   </xs:complexType>

 

-  <xs:simpleType name="pb_clock_equivalent">

+  <xs:simpleType name="clock_equivalent">

      <xs:restriction base="xs:string">

       <xs:enumeration value="none"/>

       <xs:enumeration value="full"/>

@@ -352,9 +352,9 @@
     </xs:restriction>

   </xs:simpleType>

 

-  <xs:complexType name="pb_type_clock">

+  <xs:complexType name="clock_port">

     <xs:attribute name="name" type="xs:string" use="required"/>

-    <xs:attribute name="equivalent" type="pb_clock_equivalent" default="none"/>

+    <xs:attribute name="equivalent" type="clock_equivalent" default="none"/>

     <xs:attribute name="num_pins" type="xs:int" use="required"/>

     <xs:attribute name="port_class" type="xs:string"/>

   </xs:complexType>

@@ -625,20 +625,27 @@
     <xs:attribute name="name" type="xs:string" use="required"/>

   </xs:complexType>

 

-  <xs:complexType name="equivalent_tiles">

+  <xs:complexType name="equivalent_sites">

     <xs:choice maxOccurs="unbounded" minOccurs="0">

-      <xs:element name="mode" type="tile_mode"/>

+      <xs:element name="site"/>

     </xs:choice>

   </xs:complexType>

 

   <xs:complexType name="tile">

     <xs:choice maxOccurs="unbounded" minOccurs="0">

-      <xs:element name="equivalent_tiles" type="equivalent_tiles"/>

+      <xs:element name="input" type="input_port"/>

+      <xs:element name="output" type="output_port"/>

+      <xs:element name="clock" type="clock_port"/>

+      <xs:element name="equivalent_sites" type="equivalent_sites"/>

       <xs:element name="pinlocations" type="pinlocations"/>

       <xs:element name="fc" type="fc"/>

       <xs:element name="switchblock_locations" type="switchblock_locations"/>

     </xs:choice>

     <xs:attribute name="name" type="xs:string" use="required"/>

+    <xs:attribute name="capacity" type="xs:int"/>

+    <xs:attribute name="width" type="xs:int"/>

+    <xs:attribute name="height" type="xs:int"/>

+    <xs:attribute name="area" type="xs:float"/>

   </xs:complexType>

 

   <xs:complexType name="tiles">

@@ -650,25 +657,18 @@
   <xs:complexType name="pb_type">

     <xs:choice maxOccurs="unbounded" minOccurs="0">

       <xs:element name="pb_type" type="pb_type"/>

-      <xs:element name="input" type="pb_type_input"/>

-      <xs:element name="output" type="pb_type_output"/>

-      <xs:element name="clock" type="pb_type_clock"/>

+      <xs:element name="input" type="input_port"/>

+      <xs:element name="output" type="output_port"/>

+      <xs:element name="clock" type="clock_port"/>

       <xs:element name="metadata" type="metadata"/>

       <xs:element name="mode" type="mode"/>

       <xs:element name="interconnect" type="interconnect"/>

-      <xs:element name="pinlocations" type="pinlocations"/>

-      <xs:element name="switchblock_locations" type="switchblock_locations"/>

-      <xs:element name="fc" type="fc"/>

       <xs:group ref="timing_group_pbtype"/>

       <xs:element name="power" type="power"/>

     </xs:choice>

     <xs:attribute name="name" type="xs:string" use="required"/>

     <xs:attribute name="num_pb" type="xs:int"/>

     <xs:attribute name="blif_model" type="xs:string"/>

-    <xs:attribute name="capacity" type="xs:int"/>

-    <xs:attribute name="width" type="xs:int"/>

-    <xs:attribute name="height" type="xs:int"/>

-    <xs:attribute name="area" type="xs:float"/>

     <xs:attribute name="class" type="pb_type_class"/>

   </xs:complexType>