diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-12 18:16:07 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-12 18:16:07 -0400 |
commit | 03a00e5d32411f467735b2af890c1ca54930e949 (patch) | |
tree | 4154e4703c0c3e18bd4d6b4de98fe8650d6f704d /dev/sinic.hh | |
parent | a91ee5abc2275709871b016d43ca2d2440fa5000 (diff) | |
parent | 7929b9ee19b6fabc7e69b704fa07fdb6daa35c70 (diff) | |
download | gem5-03a00e5d32411f467735b2af890c1ca54930e949.tar.xz |
Merge zeep.pool:/z/saidi/work/m5.head
into zeep.pool:/z/saidi/work/m5.nm_m5_pull
SConscript:
dram memory needs to be converted to newmem before we can use it
dev/ide_ctrl.cc:
don't need this printing in newmem
dev/ide_disk.cc:
will read stats in next commit
dev/sinic.cc:
merge sinic from head, still needs work
--HG--
extra : convert_revision : b9aabd8c7814d07d54ce6f971aad3ec349fa24e1
Diffstat (limited to 'dev/sinic.hh')
-rw-r--r-- | dev/sinic.hh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/dev/sinic.hh b/dev/sinic.hh index 63a8585dc..a786c3e44 100644 --- a/dev/sinic.hh +++ b/dev/sinic.hh @@ -117,7 +117,7 @@ class Device : public Base uint32_t RxMaxCopy; // 0x10 uint32_t TxMaxCopy; // 0x14 uint32_t RxMaxIntr; // 0x18 - uint32_t Reserved0; // 0x1c + uint32_t VirtualCount; // 0x1c uint32_t RxFifoSize; // 0x20 uint32_t TxFifoSize; // 0x24 uint32_t RxFifoMark; // 0x28 @@ -142,6 +142,9 @@ class Device : public Base int rxPacketBytes; uint64_t rxDoneData; + Counter rxUnique; + Counter txUnique; + VirtualReg() : RxData(0), RxDone(0), TxData(0), TxDone(0), rxPacketOffset(0), rxPacketBytes(0), rxDoneData(0) @@ -149,8 +152,12 @@ class Device : public Base }; typedef std::vector<VirtualReg> VirtualRegs; typedef std::list<int> VirtualList; + Counter rxUnique; + Counter txUnique; VirtualRegs virtualRegs; VirtualList rxList; + VirtualList rxBusy; + int rxActive; VirtualList txList; uint8_t ®Data8(Addr daddr) { return *((uint8_t *)®s + daddr); } @@ -162,6 +169,7 @@ class Device : public Base PacketFifo rxFifo; PacketFifo::iterator rxFifoPtr; bool rxEmpty; + bool rxLow; Addr rxDmaAddr; uint8_t *rxDmaData; int rxDmaLen; @@ -318,6 +326,8 @@ class Device : public Base uint32_t rx_fifo_size; uint32_t tx_fifo_size; uint32_t rx_fifo_threshold; + uint32_t rx_fifo_low_mark; + uint32_t tx_fifo_high_mark; uint32_t tx_fifo_threshold; Tick dma_read_delay; Tick dma_read_factor; @@ -326,6 +336,10 @@ class Device : public Base bool rx_thread; bool tx_thread; bool rss; + uint32_t virtual_count; + bool zero_copy; + bool delay_copy; + bool virtual_addr; }; protected: |