PhysicalDisk: rename firmwareRev to revision

This commit is contained in:
李通洲
2023-12-25 18:21:23 +08:00
parent 3134a04b5c
commit 060082885b
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ typedef struct FFPhysicalDiskResult
FFstrbuf interconnect;
FFstrbuf serial;
FFstrbuf devPath;
FFstrbuf firmwareRev;
FFstrbuf revision;
FFPhysicalDiskType type;
uint64_t size;
} FFPhysicalDiskResult;
@@ -43,7 +43,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
FFPhysicalDiskResult* device = (FFPhysicalDiskResult*) ffListAdd(result);
ffStrbufInit(&device->serial);
ffStrbufInit(&device->firmwareRev);
ffStrbufInit(&device->revision);
ffStrbufInitS(&device->name, deviceName);
ffStrbufInit(&device->devPath);
ffStrbufInit(&device->interconnect);
@@ -80,7 +80,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
if (deviceCharacteristics)
{
ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductSerialNumberKey), &device->serial);
ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductRevisionLevelKey), &device->firmwareRev);
ffCfDictGetString(deviceCharacteristics, CFSTR(kIOPropertyProductRevisionLevelKey), &device->revision);
CFStringRef mediumType = (CFStringRef) CFDictionaryGetValue(deviceCharacteristics, CFSTR(kIOPropertyMediumTypeKey));
if (mediumType)
@@ -124,10 +124,10 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
}
{
ffStrbufInit(&device->firmwareRev);
ffStrbufInit(&device->revision);
snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/firmware_rev", devName);
if (ffReadFileBuffer(pathSysBlock, &device->firmwareRev))
ffStrbufTrimRightSpace(&device->firmwareRev);
if (ffReadFileBuffer(pathSysBlock, &device->revision))
ffStrbufTrimRightSpace(&device->revision);
}
}