Changeset 548 for trunk/platforms
- Timestamp:
- Oct 7, 2013, 6:35:20 PM (11 years ago)
- Location:
- trunk/platforms/tsar_generic_xbar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/platforms/tsar_generic_xbar/top.cpp
r547 r548 98 98 /////////////////////////////////////////////////// 99 99 100 #define USE_ALMOS 1101 //#define USE_GIET 100 //#define USE_ALMOS 1 101 #define USE_GIET 1 102 102 103 103 #ifdef USE_ALMOS -
trunk/platforms/tsar_generic_xbar/top.desc
r504 r548 7 7 8 8 vci_plen_size = 8 9 vci_addr_size = 329 vci_addr_size = 40 10 10 vci_rerror_size = 1 11 11 vci_clen_size = 1 -
trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h
r547 r548 204 204 dspin_rsp_width>* wt_fbuf; 205 205 206 // for almos 207 VciSimpleRom<vci_param_int>* mnic; 206 VciMultiNic<vci_param_int>* mnic; 208 207 209 208 VciDspinTargetWrapper<vci_param_int, -
trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp
r547 r548 357 357 x_width + y_width + l_width); 358 358 359 ///////////////////////////////////////////// 360 // Commented for almos; we don't want the nic; replaced by a rom 361 //int mac = 0xBEEF0000; 362 //mnic = new VciMultiNic<vci_param_int>( 363 // "mnic", 364 // IntTab(cluster_id, tgtid_mnic), 365 // mtd, 366 // nic_channels, 367 // nic_rx_name, 368 // nic_tx_name, 369 // mac, // mac_4 address 370 // 0xBABE ); // mac_2 address 371 mnic = new VciSimpleRom<vci_param_int>( 372 "mnic", 373 IntTab(cluster_id, tgtid_mnic), 374 mtd, 375 loader); 359 int mac = 0xBEEF0000; 360 mnic = new VciMultiNic<vci_param_int>( 361 "mnic", 362 IntTab(cluster_id, tgtid_mnic), 363 mtd, 364 nic_channels, 365 nic_rx_name, 366 nic_tx_name, 367 mac, // mac_4 address 368 0xBABE ); // mac_2 address 376 369 377 370 wt_mnic = new VciDspinTargetWrapper<vci_param_int, … … 726 719 for (size_t i = 0; i < nic_channels; i++) 727 720 { 728 //mnic->p_rx_irq[i] (signal_irq_mnic_rx[i]);729 //mnic->p_tx_irq[i] (signal_irq_mnic_tx[i]);721 mnic->p_rx_irq[i] (signal_irq_mnic_rx[i]); 722 mnic->p_tx_irq[i] (signal_irq_mnic_tx[i]); 730 723 } 731 724
Note: See TracChangeset
for help on using the changeset viewer.