Add PCI BDF property for dscpi sorting

MuntashirAkon · Jan 9, 2014 · 39af22d · 39af22d
1 parent 7a5612f
commit 39af22d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/DPCIManager/PCI.h b/DPCIManager/PCI.h
@@ -28,6 +28,7 @@
 @property (readonly) NSString *lspciString;
 @property (readonly) long fullID;
 @property (readonly) long fullSubID;
+@property (readonly) short bdf;
 
 +(long)nameToLong:(NSString *)name;
 +(bool)isPCI:(io_service_t)service;

diff --git a/DPCIManager/PCI.m b/DPCIManager/PCI.m
@@ -115,6 +115,11 @@ -(long)fullID{
 -(long)fullSubID{
     return subDevice.integerValue<<16 | subVendor.integerValue;
 }
+-(short)bdf {
+    if (self.bus.count > 2)
+        return [[self.bus objectAtIndex:0] unsignedCharValue] << 8 | [[self.bus objectAtIndex:1] unsignedCharValue] << 3 | [[self.bus objectAtIndex:2] unsignedCharValue];
+    return -1;
+}
 +(NSArray *)readIDs{
     FILE *handle = fopen([[NSBundle.mainBundle pathForResource:@"pci" ofType:@"ids"] fileSystemRepresentation], "rb");
     NSMutableDictionary *classes = [NSMutableDictionary dictionary];

diff --git a/dspci/main.m b/dspci/main.m
@@ -71,12 +71,17 @@ int main(int argc, const char * argv[])
         io_iterator_t itThis;
         if (IOServiceGetMatchingServices(kIOMasterPortDefault, IOServiceMatching("IOPCIDevice"), &itThis) == KERN_SUCCESS) {
             io_service_t service;
+            NSMutableArray *devices = [NSMutableArray array];
             while((service = IOIteratorNext(itThis))){
-                pciDevice *pci = [pciDevice create:service classes:classes vendors:vendors];
-                if (pci.fullID+pci.fullSubID > 0) printf("%s\n", pci.lspciString.UTF8String);
+                pciDevice *device = [pciDevice create:service classes:classes vendors:vendors];
+                if (device.fullID + device.fullSubID > 0) [devices addObject:device];
                 IOObjectRelease(service);
             }
             IOObjectRelease(itThis);
+            for (pciDevice *device in [devices sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
+                return [obj1 bdf] - [obj2 bdf];
+            }])
+                printf("%s\n", device.lspciString.UTF8String);
         }
 
     }