Changed ev5_trap from a function of the execution context to a function of the fault...

[gem5.git] / dev / etherbus.hh

diff --git a/dev/etherbus.hh b/dev/etherbus.hh
index f64aa45e1d3da6f66b46ebb7a397a9ba86d22ad7..ca859d85f5fa51ad59cdf8e332d344fd5db121c3 100644 (file)
--- a/dev/etherbus.hh
+++ b/dev/etherbus.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
 #ifndef __ETHERBUS_H__
 #define __ETHERBUS_H__
 
-#include "eventq.hh"
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "sim/eventq.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
 
 class EtherDump;
 class EtherInt;
@@ -44,7 +44,7 @@ class EtherBus : public SimObject
   protected:
     typedef std::list<EtherInt *> devlist_t;
     devlist_t devlist;
-    double ticks_per_byte;
+    double ticksPerByte;
     bool loopback;
 
   protected:
@@ -66,14 +66,14 @@ class EtherBus : public SimObject
     EtherDump *dump;
 
   public:
-    EtherBus(const std::string &name, double ticks_per_byte, bool loopback,
+    EtherBus(const std::string &name, double speed, bool loopback,
              EtherDump *dump);
     virtual ~EtherBus() {}
 
     void txDone();
     void reg(EtherInt *dev);
     bool busy() const { return (bool)packet; }
-    bool send(EtherInt *sender, PacketPtr packet);
+    bool send(EtherInt *sender, PacketPtr &packet);
 };
 
 #endif // __ETHERBUS_H__