From: hadeshyp Date: Thu, 18 Feb 2010 13:37:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: oldGBE~328 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=830185b17181480fc7dc83af9e5a39b75c4cfd59;p=trbnet.git *** empty log message *** --- diff --git a/trb_net16_addresses.vhd b/trb_net16_addresses.vhd index a2c8043..dd5d554 100644 --- a/trb_net16_addresses.vhd +++ b/trb_net16_addresses.vhd @@ -41,7 +41,7 @@ architecture trb_net16_addresses_arch of trb_net16_addresses is -- Placer Directives attribute HGROUP : string; -- for whole architecture - attribute HGROUP of trb_net16_addresses_arch : architecture is "HUBLOCIG_group"; + attribute HGROUP of trb_net16_addresses_arch : architecture is "HUBLOGIC_group"; component ram_16x16_dp is diff --git a/trb_net16_hub_streaming_port.vhd b/trb_net16_hub_streaming_port.vhd index 4c2a436..d33759c 100644 --- a/trb_net16_hub_streaming_port.vhd +++ b/trb_net16_hub_streaming_port.vhd @@ -196,20 +196,9 @@ begin MED_CTRL_OP(14+mii*16) <= '0'; MED_CTRL_OP(15+mii*16) <= hub_make_network_reset; - proc_network_reset : process(MED_STAT_OP) - variable tmp15, tmp13 : std_logic := '0'; - begin - tmp15 := '0'; - tmp13 := '0'; - for i in 0 to MII_NUMBER-1 loop - if MII_IS_UPLINK(i) = 1 then - tmp15 := tmp15 or MED_STAT_OP(i*16+15); - tmp13 := tmp13 or MED_STAT_OP(i*16+13); - end if; - end loop; - hub_make_network_reset <= tmp15; - hub_got_network_reset <= tmp13; - end process; + + hub_make_network_reset <= MED_STAT_OP(15) or MED_STAT_OP(15+mii*16); + hub_got_network_reset <= MED_STAT_OP(13) or MED_STAT_OP(13+mii*16); --------------------------------------------------------------------- -- Connecting I/O