Skip to content

Commit

Permalink
Revert "Merge pull request #197 from intel/ethernet-1-4"
Browse files Browse the repository at this point in the history
This reverts commit dd1f55e, reversing
changes made to ead347f.
  • Loading branch information
JonatanWaern committed Jul 10, 2023
1 parent dd1f55e commit 845d3fa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions RELEASENOTES.docu
Original file line number Diff line number Diff line change
Expand Up @@ -1721,6 +1721,4 @@ extern typedef struct { } my_type_t;</pre> </add-note></build-id>
<build-id value="6205"><add-note> Fixed a bug with how template types were
handled by DMLC that could cause the compiler to still exhibit
nondeterministic behaviour.</add-note></build-id>
<build-id value="next"><add-note> Ported the ethernet.dml lib file to
DML 1.4, no functionality change for 1.2 users.</add-note></build-id>
</rn>
12 changes: 6 additions & 6 deletions lib/ethernet.dml → lib/1.2/ethernet.dml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// This module contains types needed when implementing ethernet
// devices.

dml 1.4;
dml 1.2;

import "simics/devs/ethernet.dml";

Expand All @@ -22,7 +22,7 @@ constant ETHERTYPE_REVARP = 0x8035; /* Reverse ARP */
// Use it like this:
//
// connect link is (ethernet_connect) {
// param documentation = "...";
// parameter documentation = "...";
// method update_mac_info {
// ... code to register MAC addresses with the link ...
// }
Expand All @@ -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:
//
// link.send_frame(frame, false)
// call $link.send_frame(frame, false)
//
template ethernet_connect {
interface ethernet_common;
Expand All @@ -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);
}
}

0 comments on commit 845d3fa

Please sign in to comment.