Ignore:
Timestamp:
Jul 19, 2013, 12:05:33 PM (11 years ago)
Author:
lgarcia
Message:

fixing merging bug in vci_mem_cache.cpp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

    r456 r457  
    284284{
    285285  "ALLOC_DIR_RESET",
     286  "ALLOC_DIR_CONFIG",
    286287  "ALLOC_DIR_READ",
    287288  "ALLOC_DIR_WRITE",
     
    301302const char *alloc_upt_fsm_str[] =
    302303{
     304  "ALLOC_UPT_CONFIG",
    303305  "ALLOC_UPT_WRITE",
    304306  "ALLOC_UPT_XRAM_RSP",
     
    68556857
    68566858        // WRITE
     6859        if(r_read_to_cc_send_req.read())
     6860        {
     6861          r_cc_send_fsm = CC_SEND_READ_NCC_INVAL_HEADER;
     6862          break;
     6863        }
     6864
     6865        if(r_write_to_cc_send_req.read())
     6866        {
     6867          r_cc_send_fsm = CC_SEND_WRITE_NCC_INVAL_HEADER;
     6868          break;
     6869        }
    68576870        if(m_write_to_cc_send_inst_fifo.rok() or
    68586871            r_write_to_cc_send_multi_req.read())
     
    69346947        }
    69356948        // WRITE
     6949        if(r_read_to_cc_send_req.read())
     6950        {
     6951          r_cc_send_fsm = CC_SEND_READ_NCC_INVAL_HEADER;
     6952          break;
     6953        }
     6954
     6955        if(r_write_to_cc_send_req.read())
     6956        {
     6957          r_cc_send_fsm = CC_SEND_WRITE_NCC_INVAL_HEADER;
     6958          break;
     6959        }
    69366960        if(m_write_to_cc_send_inst_fifo.rok() or
    69376961            r_write_to_cc_send_multi_req.read())
Note: See TracChangeset for help on using the changeset viewer.