Bios: rename biosRelease to release

This commit is contained in:
李通洲
2023-06-29 10:46:41 +08:00
parent 13f58f5f1b
commit 0f8ebd2269
6 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
typedef struct FFBiosResult
{
FFstrbuf date;
FFstrbuf biosRelease;
FFstrbuf release;
FFstrbuf vendor;
FFstrbuf version;
} FFBiosResult;
+4 -4
View File
@@ -24,8 +24,8 @@ const char* ffDetectBios(FFBiosResult* bios)
ffCfDictGetString(properties, CFSTR("version"), &bios->version);
ffCfDictGetString(properties, CFSTR("release-date"), &bios->date);
if(!ffStrbufContainC(&bios->date, '-'))
ffStrbufAppendS(&bios->biosRelease, "Efi-");
ffStrbufAppend(&bios->biosRelease, &bios->version);
ffStrbufAppendS(&bios->release, "Efi-");
ffStrbufAppend(&bios->release, &bios->version);
CFRelease(properties);
IOObjectRelease(registryEntry);
@@ -52,8 +52,8 @@ const char* ffDetectBios(FFBiosResult* bios)
CFMutableDictionaryRef properties;
if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) == kIOReturnSuccess)
{
ffCfDictGetString(properties, CFSTR("system-firmware-version"), &bios->biosRelease);
ffStrbufAppend(&bios->version, &bios->biosRelease);
ffCfDictGetString(properties, CFSTR("system-firmware-version"), &bios->release);
ffStrbufAppend(&bios->version, &bios->release);
ffStrbufSubstrAfterFirstC(&bios->version, '-');
CFRelease(properties);
}
+2 -2
View File
@@ -7,8 +7,8 @@ const char* ffDetectBios(FFBiosResult* result)
{
ffSettingsGetFreeBSDKenv("smbios.bios.reldate", &result->date);
ffCleanUpSmbiosValue(&result->date);
ffSettingsGetFreeBSDKenv("smbios.bios.revision", &result->biosRelease);
ffCleanUpSmbiosValue(&result->biosRelease);
ffSettingsGetFreeBSDKenv("smbios.bios.revision", &result->release);
ffCleanUpSmbiosValue(&result->release);
ffSettingsGetFreeBSDKenv("smbios.bios.vendor", &result->vendor);
ffCleanUpSmbiosValue(&result->vendor);
ffSettingsGetFreeBSDKenv("smbios.bios.version", &result->version);
+1 -1
View File
@@ -20,7 +20,7 @@ static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstr
const char* ffDetectBios(FFBiosResult* bios)
{
getSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date);
getSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->biosRelease);
getSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);
getSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor);
getSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version);
return NULL;
+1 -1
View File
@@ -18,7 +18,7 @@ const char* ffDetectBios(FFBiosResult* bios)
ffRegReadUint(hKey, L"BiosMajorRelease", &major, NULL) &&
ffRegReadUint(hKey, L"BiosMinorRelease", &minor, NULL)
)
ffStrbufAppendF(&bios->biosRelease, "%u.%u", (unsigned)major, (unsigned)minor);
ffStrbufAppendF(&bios->release, "%u.%u", (unsigned)major, (unsigned)minor);
return NULL;
}