Print a warning if two devices are sharing the same interrupt

[gem5.git] / dev / etherpkt.hh

diff --git a/dev/etherpkt.hh b/dev/etherpkt.hh
index 9c5f004910d00cb441fbfd7a4a48619a5e6b9a9b..7a7809f0a1f12f5ad8a34f73d0df335938d05c94 100644 (file)
--- a/dev/etherpkt.hh
+++ b/dev/etherpkt.hh
@@ -38,7 +38,6 @@
 #include <assert.h>
 
 #include "base/refcnt.hh"
-#include "base/inet.hh"
 #include "sim/host.hh"
 
 /*
@@ -53,24 +52,15 @@ class PacketData : public RefCounted
 
   public:
     PacketData() : data(NULL), length(0) { }
+    explicit PacketData(size_t size) : data(new uint8_t[size]), length(0) { }
     PacketData(std::auto_ptr<uint8_t> d, int l)
         : data(d.release()), length(l) { }
     ~PacketData() { if (data) delete [] data; }
 
   public:
-    const EthHdr *eth() const { return (const EthHdr *)data; }
-    const IpHdr *ip() const {const EthHdr *h = eth(); return h ? h->ip() : 0;}
-    const TcpHdr *tcp() const {const IpHdr *h = ip(); return h ? h->tcp() : 0;}
-    const UdpHdr *udp() const {const IpHdr *h = ip(); return h ? h->udp() : 0;}
-
-    EthHdr *eth() { return (EthHdr *)data; }
-    IpHdr *ip()   { EthHdr *h = eth(); return h ? h->ip() : 0; }
-    TcpHdr *tcp() { IpHdr *h = ip(); return h ? h->tcp() : 0; }
-    UdpHdr *udp() { IpHdr *h = ip(); return h ? h->udp() : 0; }
-
-  public:
-    void serialize(std::ostream &os);
-    void unserialize(Checkpoint *cp, const std::string &section);
+    void serialize(const std::string &base, std::ostream &os);
+    void unserialize(const std::string &base, Checkpoint *cp,
+                     const std::string &section);
 };
 
 typedef RefCountingPtr<PacketData> PacketPtr;