Hand merge

--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b

1 files changed, 16 insertions, 7 deletions

diff --git a/objects/Ethernet.mpy b/objects/Ethernet.mpy
index 64eab00a3..088df4b93 100644
--- a/objects/Ethernet.mpy
+++ b/objects/Ethernet.mpy
@@ -2,10 +2,12 @@ from Device import DmaDevice
 from Pci import PciDevice
 
 simobj EtherInt(SimObject):
+    type = 'EtherInt'
     abstract = True
     peer = Param.EtherInt(NULL, "peer interface")
 
 simobj EtherLink(SimObject):
+    type = 'EtherLink'
     int1 = Param.EtherInt("interface 1")
     int2 = Param.EtherInt("interface 2")
     delay = Param.Tick(0, "transmit delay of packets in us")
@@ -13,31 +15,35 @@ simobj EtherLink(SimObject):
     dump = Param.EtherDump(NULL, "dump object")
 
 simobj EtherBus(SimObject):
-    loopback = Param.Bool(true,
+    type = 'EtherBus'
+    loopback = Param.Bool(True,
         "send packet back to the interface from which it came")
     dump = Param.EtherDump(NULL, "dump object")
     speed = Param.UInt64(100000000, "bus speed in bits per second")
 
 simobj EtherTap(EtherInt):
+    type = 'EtherTap'
     bufsz = Param.Int(10000, "tap buffer size")
     dump = Param.EtherDump(NULL, "dump object")
     port = Param.UInt16(3500, "tap port")
 
 simobj EtherDump(SimObject):
+    type = 'EtherDump'
     file = Param.String("dump file")
 
 simobj EtherDev(DmaDevice):
+    type = 'EtherDev'
     hardware_address = Param.EthernetAddr(NextEthernetAddr,
         "Ethernet Hardware Address")
 
-    dma_data_free = Param.Bool(false, "DMA of Data is free")
-    dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
+    dma_data_free = Param.Bool(False, "DMA of Data is free")
+    dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
     dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
     dma_read_factor = Param.Tick(0, "multiplier for dma reads")
     dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
     dma_write_factor = Param.Tick(0, "multiplier for dma writes")
 
-    rx_filter = Param.Bool(true, "Enable Receive Filter")
+    rx_filter = Param.Bool(True, "Enable Receive Filter")
     rx_delay = Param.Tick(1000, "Receive Delay")
     tx_delay = Param.Tick(1000, "Transmit Delay")
 
@@ -47,17 +53,18 @@ simobj EtherDev(DmaDevice):
     tlaser = Param.Turbolaser(Super, "Turbolaser")
 
 simobj NSGigE(PciDevice):
+    type = 'NSGigE'
     hardware_address = Param.EthernetAddr(NextEthernetAddr,
         "Ethernet Hardware Address")
 
-    dma_data_free = Param.Bool(false, "DMA of Data is free")
-    dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
+    dma_data_free = Param.Bool(False, "DMA of Data is free")
+    dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
     dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
     dma_read_factor = Param.Tick(0, "multiplier for dma reads")
     dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
     dma_write_factor = Param.Tick(0, "multiplier for dma writes")
 
-    rx_filter = Param.Bool(true, "Enable Receive Filter")
+    rx_filter = Param.Bool(True, "Enable Receive Filter")
     rx_delay = Param.Tick(1000, "Receive Delay")
     tx_delay = Param.Tick(1000, "Transmit Delay")
 
@@ -69,9 +76,11 @@ simobj NSGigE(PciDevice):
     physmem = Param.PhysicalMemory(Super, "Physical Memory")
 
 simobj EtherDevInt(EtherInt):
+    type = 'EtherDevInt'
     device = Param.EtherDev("Ethernet device of this interface")
 
 simobj NSGigEInt(EtherInt):
+    type = 'NSGigEInt'
     device = Param.NSGigE("Ethernet device of this interface")