X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fdev%2Fi8254xGBe_defs.hh;h=71a7c16da57f9d4f06c752014c1d65d5cc527d72;hb=eae1e97fb002b44a9d8c46df2da1ddc1d0156ce4;hp=4634dd9a3433613cca423c955f96fd43800ab3dd;hpb=2adc60795b0e21d46f983293b3b71b48ee105c14;p=gem5.git diff --git a/src/dev/i8254xGBe_defs.hh b/src/dev/i8254xGBe_defs.hh index 4634dd9a3..71a7c16da 100644 --- a/src/dev/i8254xGBe_defs.hh +++ b/src/dev/i8254xGBe_defs.hh @@ -481,15 +481,15 @@ struct Regs { ADD_FIELD32(pmcf,23,1); // pass mac control frames ADD_FIELD32(bsex,25,1); // buffer size extension ADD_FIELD32(secrc,26,1); // strip ethernet crc from incoming packet - int descSize() + unsigned descSize() { switch(bsize()) { - case 0: return bsex() == 0 ? 2048 : -1; + case 0: return bsex() == 0 ? 2048 : 0; case 1: return bsex() == 0 ? 1024 : 16384; case 2: return bsex() == 0 ? 512 : 8192; case 3: return bsex() == 0 ? 256 : 4096; default: - return -1; + return 0; } } }; @@ -559,8 +559,8 @@ struct Regs { ADD_FIELD32(hdrlen, 8, 8); // guess based on header, not documented ADD_FIELD32(desctype, 25,3); // type of descriptor 000 legacy, 001 adv, //101 hdr split - int bufLen() { return pktlen() << 10; } - int hdrLen() { return hdrlen() << 6; } + unsigned bufLen() { return pktlen() << 10; } + unsigned hdrLen() { return hdrlen() << 6; } }; SRRCTL srrctl; @@ -851,4 +851,4 @@ struct Regs { UNSERIALIZE_SCALAR(sw_fw_sync); } }; -} // iGbReg namespace +} // namespace iGbReg