diff --git a/RELEASENOTES.docu b/RELEASENOTES.docu index 437ed5758..0df59a44f 100644 --- a/RELEASENOTES.docu +++ b/RELEASENOTES.docu @@ -1721,4 +1721,6 @@ extern typedef struct { } my_type_t; Fixed a bug with how template types were handled by DMLC that could cause the compiler to still exhibit nondeterministic behaviour. + Ported the ethernet.dml lib file to + DML 1.4, no functionality change for 1.2 users. diff --git a/lib/1.2/ethernet.dml b/lib/ethernet.dml similarity index 81% rename from lib/1.2/ethernet.dml rename to lib/ethernet.dml index 73bcbc954..36a2f7a7c 100644 --- a/lib/1.2/ethernet.dml +++ b/lib/ethernet.dml @@ -6,7 +6,7 @@ // This module contains types needed when implementing ethernet // devices. -dml 1.2; +dml 1.4; import "simics/devs/ethernet.dml"; @@ -22,7 +22,7 @@ constant ETHERTYPE_REVARP = 0x8035; /* Reverse ARP */ // Use it like this: // // connect link is (ethernet_connect) { -// parameter documentation = "..."; +// param documentation = "..."; // method update_mac_info { // ... code to register MAC addresses with the link ... // } @@ -31,7 +31,7 @@ constant ETHERTYPE_REVARP = 0x8035; /* Reverse ARP */ // To send a frame, the send_frame method can be used instead of // calling the interface function directly: // -// call $link.send_frame(frame, false) +// link.send_frame(frame, false) // template ethernet_connect { interface ethernet_common; @@ -40,8 +40,8 @@ template ethernet_connect { method send_frame(dbuffer_t *frame, bool crc_calculated) { local frags_t f; frags_init_add(&f, dbuffer_read_all(frame), dbuffer_len(frame)); - $ethernet_common.frame(&f, - (crc_calculated) ? Eth_Frame_CRC_Unknown - : Eth_Frame_CRC_Match); + ethernet_common.frame(&f, + (crc_calculated) ? Eth_Frame_CRC_Unknown + : Eth_Frame_CRC_Match); } }