add LED to mimosis design

diff --git a/mimosis/trb5sc_mimosis.vhd b/mimosis/trb5sc_mimosis.vhd
index ce47099c37e08d866eea4b7a0806cb5aa3fa3df9..71218f640a9e8d5c6ee1b5316bc044229a3e7ea9 100644 (file)
--- a/mimosis/trb5sc_mimosis.vhd
+++ b/mimosis/trb5sc_mimosis.vhd
@@ -32,9 +32,10 @@ entity trb5sc_mimosis is
 --     FE_CLK     : out   std_logic_vector( 2 downto 1);\r
 --     FE_DIFF    : inout std_logic_vector(63 downto 0);\r
     --INP : inout std_logic_vector(63 downto 0);\r
-    LED_ADDON      : out   std_logic_vector(5 downto 0);\r
---     LED_ADDON_SFP_ORANGE : out   std_logic_vector(1 downto 0);\r
---     LED_ADDON_SFP_GREEN  : out   std_logic_vector(1 downto 0);\r
+    --LED_ADDON      : out   std_logic_vector(5 downto 0);\r
+    LED_ADDON_SFP_ORANGE : out   std_logic_vector(1 downto 0);\r
+    LED_ADDON_SFP_GREEN  : out   std_logic_vector(1 downto 0);\r
+    LED_ADDON_RJ         : out   std_logic_vector(1 downto 0);\r
     SFP_ADDON_TX_DIS : out std_logic_vector(1 downto 0);\r
     SFP_ADDON_LOS    : in  std_logic_vector(1 downto 0);\r
     \r
@@ -141,6 +142,7 @@ architecture arch of trb5sc_mimosis is
   signal out_data          : std_logic_vector(15 downto 0);\r
   signal out_i             : std_logic_vector( 7 downto 0);\r
   signal inp_i             : std_logic_vector( 7 downto 0);\r
+  signal gbe_status        : std_logic_vector(15 downto 0);\r
   \r
   \r
   signal i2c_reg_0, i2c_reg_1 : std_logic_vector(31 downto 0);\r
@@ -304,7 +306,8 @@ RJ(0) <= clk_40;
       I2C_SCL       => I2C_SCL,\r
       I2C_SDA       => I2C_SDA,\r
       --Timing registers\r
-      TIMERS_OUT    => timer\r
+      TIMERS_OUT    => timer,\r
+      STATUS_GBE_OUT=> gbe_status\r
       );\r
 \r
 ---------------------------------------------------------------------------\r
@@ -374,8 +377,6 @@ RJ(0) <= clk_40;
       --Header\r
       HEADER_IO         => open, --HDR_IO(9 downto 0),\r
       ADDITIONAL_REG    => add_reg,\r
-      --LCD\r
-      LCD_DATA_IN       => (others => '0'),\r
       --ADC\r
       ADC_CS            => ADC_NCS,\r
       ADC_MOSI          => ADC_MOSI,\r
@@ -440,7 +441,7 @@ PIN(1) <= i2c_reg_5_40(4);  --MIMOSIS_START
 PIN(2) <= i2c_reg_5_40(8);  --MIMOSIS_RESET\r
 \r
 PROC_I2C_REGS : process begin\r
-    wait until rising_edge(CLK_SYS);\r
+  wait until rising_edge(CLK_SYS);\r
   busi2c_tx.ack  <= '0';\r
   busi2c_tx.unknown <= '0';\r
   busi2c_tx.nack <= '0';\r
@@ -529,6 +530,11 @@ end process;
 \r
   FLASH_NCS <= flash_ncs_i;    \r
 \r
+  LED_ADDON_RJ <= "00";\r
+  LED_ADDON_SFP_GREEN(0)  <= (gbe_status(0) and gbe_status(1) and gbe_status(2));\r
+  LED_ADDON_SFP_GREEN(1)  <= '0';\r
+  LED_ADDON_SFP_ORANGE(0) <= (gbe_status(3) or gbe_status(4));\r
+  LED_ADDON_SFP_ORANGE(1) <= '0';\r
   \r
 -----------------------------------------------------------------------------\r
 ---- GbE\r

diff --git a/pinout/trb5sc_hdmi.lpf b/pinout/trb5sc_hdmi.lpf
index ac569f2c2319f7da0e9953e7946a81358a88b799..fc4791eb5899dd9b679052fb8177973450fd41b0 100644 (file)
--- a/pinout/trb5sc_hdmi.lpf
+++ b/pinout/trb5sc_hdmi.lpf
@@ -47,13 +47,21 @@ IOBUF PORT "SFP_MOD_0" IO_TYPE=LVTTL33 PULLMODE=NONE ;
 #################################################################
 # Frontend
 #################################################################
-LOCATE COMP "LED_ADDON[0]" SITE "A18" ; #was FE_GPIO[0] #RJ 0
-LOCATE COMP "LED_ADDON[1]" SITE "C18" ; #was FE_GPIO[1] #RJ 1
-LOCATE COMP "LED_ADDON[2]" SITE "D18" ; #was FE_GPIO[2] #SFP1 green
-LOCATE COMP "LED_ADDON[3]" SITE "F18" ; #was FE_GPIO[3] #SFP1 orange
-LOCATE COMP "LED_ADDON[4]" SITE "A19" ; #was FE_GPIO[4] #SFP2 green
+#LOCATE COMP "LED_ADDON[0]" SITE "A18" ; #was FE_GPIO[0] #RJ 0
+#LOCATE COMP "LED_ADDON[1]" SITE "C18" ; #was FE_GPIO[1] #RJ 1
+#LOCATE COMP "LED_ADDON[2]" SITE "D18" ; #was FE_GPIO[2] #SFP1 green
+#LOCATE COMP "LED_ADDON[3]" SITE "F18" ; #was FE_GPIO[3] #SFP1 orange
+#LOCATE COMP "LED_ADDON[4]" SITE "A19" ; #was FE_GPIO[4] #SFP2 green
+#LOCATE COMP "LED_ADDON[5]" SITE "C19" ; #was FE_GPIO[6] #SFP2 orange
+
+LOCATE COMP "LED_ADDON_RJ[0]" SITE "A18"         ; #was FE_GPIO[0] #RJ 0
+LOCATE COMP "LED_ADDON_RJ[1]" SITE "C18"         ; #was FE_GPIO[1] #RJ 1
+LOCATE COMP "LED_ADDON_SFP_GREEN[0]" SITE "D18"  ; #was FE_GPIO[2] #SFP1 green
+LOCATE COMP "LED_ADDON_SFP_ORANGE[0]" SITE "F18" ; #was FE_GPIO[3] #SFP1 orange
+LOCATE COMP "LED_ADDON_SFP_GREEN[1]" SITE "A19"  ; #was FE_GPIO[4] #SFP2 green
+LOCATE COMP "LED_ADDON_SFP_ORANGE[1]" SITE "C19" ; #was FE_GPIO[6] #SFP2 orange
+
 # LOCATE COMP "" SITE "B19" ; #was FE_GPIO[5]
-LOCATE COMP "LED_ADDON[5]" SITE "C19" ; #was FE_GPIO[6] #SFP2 orange
 # LOCATE COMP "" SITE "D19" ; #was FE_GPIO[7]
 LOCATE COMP "SFP_ADDON_TX_DIS[0]" SITE "E19" ; #was FE_GPIO[8]
 LOCATE COMP "SFP_ADDON_LOS[1]" SITE "F19" ; #was FE_GPIO[9]