Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixup cannot find memory type bug in alpha architecture, do not ignore multiple nodes. #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/core/dmi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1465,14 +1465,16 @@ int dmiversionrev)
description = _("Cache Memory");
memory_icon = true;
break;
case 0x08:
description = _("System memory");
memory_icon = true;
break;
default:
description = _("Generic Memory");
memory_icon = true;
}
if (id == "memory" && hardwarenode->getChild("memory"))
{
// we don't want multiple "System memory" nodes,
// so just ignore this one
break;
}
hwNode newnode(id, hw::memory);
Expand Down Expand Up @@ -1589,7 +1591,7 @@ int dmiversionrev)
char buffer[80];
u = data[0x16] << 8 | data[0x15];
// speed
clock = u * 1000000; // u is a frequency in MHz
clock = u * 1000000ULL; // u is a frequency in MHz
if (u == 0)
strcpy(buffer, "");
else
Expand Down