Skip to content

Commit

Permalink
Added in all recent Macs for identification
Browse files Browse the repository at this point in the history
  • Loading branch information
@apple4ever
apple4ever committed Jun 11, 2015
1 parent af4a1da commit 9aabbf1
Showing 1 changed file with 181 additions and 73 deletions.
254 changes: 181 additions & 73 deletions UKSystemInfo.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,80 +124,188 @@ unsigned UKCountCores(void)
static NSDictionary* translationDictionary = nil;
if( !translationDictionary )
translationDictionary = [[NSDictionary alloc] initWithObjectsAndKeys:
@"PowerMac 8500/8600",@"AAPL,8500",
@"PowerMac 9500/9600",@"AAPL,9500",
@"PowerMac 7200",@"AAPL,7200",
@"PowerMac 7200/7300",@"AAPL,7300",
@"PowerMac 7500",@"AAPL,7500",
@"Apple Network Server",@"AAPL,ShinerESB",
@"Alchemy(Performa 6400 logic-board design)",@"AAPL,e407",
@"Gazelle(5500)",@"AAPL,e411",
@"PowerBook 3400",@"AAPL,3400/2400",
@"PowerBook 3500",@"AAPL,3500",
@"PowerMac G3 (Gossamer)",@"AAPL,Gossamer",
@"PowerMac G3 (Silk)",@"AAPL,PowerMac G3",
@"PowerBook G3 (Wallstreet)",@"AAPL,PowerBook1998",
@"Yikes! Old machine",@"AAPL", // generic.

@"iMac (first generation)",@"iMac,1",
@"iMac",@"iMac", // generic.

@"PowerBook G3 (Lombard)",@"PowerBook1,1",
@"iBook (clamshell)",@"PowerBook2,1",
@"iBook FireWire (clamshell)",@"PowerBook2,2",
@"PowerBook G3 (Pismo)",@"PowerBook3,1",
@"PowerBook G4 (Titanium)",@"PowerBook3,2",
@"PowerBook G4 (Titanium w/ Gigabit Ethernet)",@"PowerBook3,3",
@"PowerBook G4 (Titanium w/ DVI)",@"PowerBook3,4",
@"PowerBook G4 (Titanium 1GHZ)",@"PowerBook3,5",
@"iBook (12in May 2001)",@"PowerBook4,1",
@"iBook (May 2002)",@"PowerBook4,2",
@"iBook 2 rev. 2 (w/ or w/o 14in LCD) (Nov 2002)",@"PowerBook4,3",
@"iBook 2 (w/ or w/o 14in LDC)",@"PowerBook4,4",
@"PowerBook G4 (Aluminum 17in)",@"PowerBook5,1",
@"PowerBook G4 (Aluminum 15in)",@"PowerBook5,2",
@"PowerBook G4 (Aluminum 17in rev. 2)",@"PowerBook5,3",
@"PowerBook G4 (Aluminum 12in)",@"PowerBook6,1",
@"PowerBook G4 (Aluminum 12in)",@"PowerBook6,2",
@"iBook G4",@"PowerBook6,3",
@"PowerBook or iBook",@"PowerBook", // generic.

@"Blue & White G3",@"PowerMac1,1",
@"PowerMac G4 PCI Graphics",@"PowerMac1,2",
@"iMac FireWire (CRT)",@"PowerMac2,1",
@"iMac FireWire (CRT)",@"PowerMac2,2",
@"PowerMac G4 AGP Graphics",@"PowerMac3,1",
@"PowerMac G4 AGP Graphics",@"PowerMac3,2",
@"PowerMac G4 AGP Graphics",@"PowerMac3,3",
@"PowerMac G4 (QuickSilver)",@"PowerMac3,4",
@"PowerMac G4 (QuickSilver)",@"PowerMac3,5",
@"PowerMac G4 (MDD/Windtunnel)",@"PowerMac3,6",
@"iMac (Flower Power)",@"PowerMac4,1",
@"iMac (Flat Panel 15in)",@"PowerMac4,2",
@"eMac",@"PowerMac4,4",
@"iMac (Flat Panel 17in)",@"PowerMac4,5",
@"PowerMac G4 Cube",@"PowerMac5,1",
@"PowerMac G4 Cube",@"PowerMac5,2",
@"iMac (Flat Panel 17in)",@"PowerMac6,1",
@"PowerMac G5",@"PowerMac7,2",
@"PowerMac G5",@"PowerMac7,3",
@"PowerMac",@"PowerMac", // generic.

@"XServe",@"RackMac1,1",
@"XServe rev. 2",@"RackMac1,2",
@"XServe G5",@"RackMac3,1",
@"XServe",@"RackMac",

@"Mac Mini Core",@"Macmini1,1", // Core Duo?
@"Mac Mini",@"Macmini", // generic
@"PowerMac 8500/8600",@"AAPL,8500",
@"PowerMac 9500/9600",@"AAPL,9500",
@"PowerMac 7200",@"AAPL,7200",
@"PowerMac 7200/7300",@"AAPL,7300",
@"PowerMac 7500",@"AAPL,7500",
@"Apple Network Server",@"AAPL,ShinerESB",
@"Alchemy(Performa 6400 logic-board design)",@"AAPL,e407",
@"Gazelle(5500)",@"AAPL,e411",
@"PowerBook 3400",@"AAPL,3400/2400",
@"PowerBook 3500",@"AAPL,3500",
@"PowerMac G3 (Gossamer)",@"AAPL,Gossamer",
@"PowerMac G3 (Silk)",@"AAPL,PowerMac G3",
@"PowerBook G3 (Wallstreet)",@"AAPL,PowerBook1998",
@"Yikes! Old machine",@"AAPL", // generic.

@"PowerBook G3 (Lombard)",@"PowerBook1,1",
@"iBook (clamshell)",@"PowerBook2,1",
@"iBook FireWire (clamshell)",@"PowerBook2,2",
@"PowerBook G3 (Pismo)",@"PowerBook3,1",
@"PowerBook G4 (Titanium)",@"PowerBook3,2",
@"PowerBook G4 (Titanium w/ Gigabit Ethernet)",@"PowerBook3,3",
@"PowerBook G4 (Titanium w/ DVI)",@"PowerBook3,4",
@"PowerBook G4 (Titanium 1GHZ)",@"PowerBook3,5",
@"iBook G3 (12in May 2001)",@"PowerBook4,1",
@"iBook G3 (May 2002)",@"PowerBook4,2",
@"iBook G3 rev. b (w/ or w/o 14in LCD) (Nov 2002)",@"PowerBook4,3",
@"iBook G4 rev. c (w/ or w/o 14in LCD)",@"PowerBook4,4",
@"PowerBook G4 (17-inch)",@"PowerBook5,1",
@"PowerBook G4 (15-inch FW800)",@"PowerBook5,2",
@"PowerBook G4 (17-inch 1.33 GHz)",@"PowerBook5,3",
@"PowerBook G4 (15-inch 1.5/1.33 GHz)",@"PowerBook5,4",
@"PowerBook G4 (17-inch 1.5 GHz)",@"PowerBook5,5",
@"PowerBook G4 (15-inch 1.67/1.5 GHz)",@"PowerBook5,6",
@"PowerBook G4 (17-inch 1.67 GHz)",@"PowerBook5,7",
@"PowerBook G4 (Double-Layer SD, 15-inch)",@"PowerBook5,8",
@"PowerBook G4 (Double-Layer SD, 17-inch)",@"PowerBook5,9",
@"PowerBook G4 (12-inch)",@"PowerBook6,1",
@"PowerBook G4 (12-inch DVI)",@"PowerBook6,2",
@"iBook G4",@"PowerBook6,3",
@"PowerBook G4 (12-inch 1.33 GHz)",@"PowerBook6,4",
@"iBook G4",@"PowerBook6,5",
@"iBook G4",@"PowerBook6,7",
@"PowerBook G4 (12-inch 1.5 GHz)",@"PowerBook6,8",
@"PowerBook or iBook",@"PowerBook", // generic.

@"Power Macintosh G3 (B&W)",@"PowerMac1,1",
@"PowerMac G4 (PCI Graphics)",@"PowerMac1,2",
@"iMac FireWire (Slot-Loading)",@"PowerMac2,1",
@"iMac FireWire (2000)",@"PowerMac2,2",
@"PowerMac G4 (AGP Graphics)",@"PowerMac3,1",
@"PowerMac G4 (AGP Graphics)",@"PowerMac3,2",
@"PowerMac G4 (Gigabit Ethernet)",@"PowerMac3,3",
@"PowerMac G4 (Digital Audio)",@"PowerMac3,4",
@"PowerMac G4 (QuickSilver)",@"PowerMac3,5",
@"PowerMac G4 (MDD/Windtunnel)",@"PowerMac3,6",
@"iMac (Flower Power)",@"PowerMac4,1",
@"iMac (Flat Panel 15in)",@"PowerMac4,2",
@"eMac",@"PowerMac4,4",
@"iMac (Flat Panel 17in)",@"PowerMac4,5",
@"PowerMac G4 Cube",@"PowerMac5,1",
@"PowerMac G4 Cube",@"PowerMac5,2",
@"iMac (USB 2.0)",@"PowerMac6,1",
@"iMac (20-inch Flat Panel)",@"PowerMac6,3",
@"eMac (USB 2.0)",@"PowerMac6,4",
@"PowerMac G5",@"PowerMac7,2",
@"PowerMac G5",@"PowerMac7,3",
@"iMac G5",@"PowerMac8,1",
@"iMac G5 (Ambient Light Sensor)",@"PowerMac8,2",
@"Power Macintosh G5 (Late 2004)",@"PowerMac9,1",
@"Mac mini",@"PowerMac10,1",
@"Mac mini",@"PowerMac10,2",
@"Power Macintosh G5 (PCIe)",@"PowerMac11,2",
@"iMac G5 (iSight)",@"PowerMac12,1",
@"PowerMac",@"PowerMac", // generic.

@"Xserve G4",@"RackMac1,1",
@"Xserve G4 (Slot-Loading)",@"RackMac1,2",
@"Xserve G5",@"RackMac3,1",
@"Xserve Xeon",@"Xserve1,1",
@"Xserve Xeon (Early 2008)",@"Xserve2,1",
@"Xserve Xeon (Early 2009)",@"Xserve3,1",
@"XServe",@"RackMac",

@"MacBook (Core Duo)",@"MacBook1,1",
@"MacBook (Core 2 Duo)",@"MacBook2,1",
@"MacBook (Core 2 Duo)",@"MacBook3,1",
@"MacBook (Early 2008)",@"MacBook4,1",
@"MacBook Alum (Early 2008)",@"MacBook5,1",
@"MacBook (Mid 2009)",@"MacBook5,2",
@"MacBook (Late 2009)",@"MacBook6,1",
@"MacBook (13-inch, Mid 2010)",@"MacBook7,1",
@"MacBook (12-inch, Early 2015)",@"MacBook8,1",
@"MacBook",@"MacBook", // generic.

@"MacBook Air (Original)",@"MacBookAir1,1",
@"MacBook Air (Late 2008)",@"MacBookAir2,1",
@"MacBook Air (11-inch, Late 2010)",@"MacBookAir3,1",
@"MacBook Air (13-inch, Late 2010)",@"MacBookAir3,2",
@"MacBook Air (11-inch, Mid 2011)",@"MacBookAir4,1",
@"MacBook Air (13-inch, Mid 2011)",@"MacBookAir4,2",
@"MacBook Air (11-inch, Mid 2012)",@"MacBookAir5,1",
@"MacBook Air (13-inch, Mid 2012)",@"MacBookAir5,2",
@"MacBook Air (11-inch, Mid 2013 or Early 2014)",@"MacBookAir6,1",
@"MacBook Air (13-inch, Mid 2013 or Early 2014)",@"MacBookAir6,2",
@"MacBook Air (11-inch, Early 2015)",@"MacBookAir5,1",
@"MacBook Air (13-inch, Early 2015)",@"MacBookAir5,2",
@"MacBook Air",@"MacBookAir", // generic.

@"MacBook Pro (15-inch Core Duo)",@"MacBookPro1,1",
@"MacBook Pro (17-inch Core Duo)",@"MacBookPro1,2",
@"MacBook Pro (17-inch Core 2 Duo)",@"MacBookPro2,1",
@"MacBook Pro (15-inch Core 2 Duo)",@"MacBookPro2,2",
@"MacBook Pro (15-inch or 17-inch LED, Core 2 Duo)",@"MacBookPro3,1",
@"MacBook Pro (15-inch or 17-inch LED, Early 2008)",@"MacBookPro4,1",
@"MacBook Pro (15-inch LED Unibody, Late 2008)",@"MacBookPro5,1",
@"MacBook Pro (17-inch LED Unibody, Mid 2009 or Mid 2010)",@"MacBookPro5,2",
@"MacBook Pro (15-inch LED Unibody, Mid 2009)",@"MacBookPro5,3",
@"MacBook Pro (15-inch LED Unibody, 2.53, Mid 2009)",@"MacBookPro5,4",
@"MacBook Pro (13-inch LED Unibody, Mid 2009)",@"MacBookPro5,5",
@"MacBook Pro (17-inch, Mid 2010)",@"MacBookPro6,1",
@"MacBook Pro (15-inch, Mid 2010)",@"MacBookPro6,2",
@"MacBook Pro (13-inch, Mid 2010)",@"MacBookPro7,1",
@"MacBook Pro (13-inch, Early 2011 or Late 2011)",@"MacBookPro8,1",
@"MacBook Pro (15-inch, Early 2011 or Late 2011)",@"MacBookPro8,2",
@"MacBook Pro (17-inch, Early 2011 or Late 2011)",@"MacBookPro8,3",
@"MacBook Pro (15-inch, Mid 2012)",@"MacBookPro9,1",
@"MacBook Pro (13-inch, Mid 2012)",@"MacBookPro9,2",
@"MacBook Pro (15-inch, Retina, Mid 2012 or Early 2013)",@"MacBookPro10,1",
@"MacBook Pro (13-inch, Retina, Late 2012 or Early 2013)",@"MacBookPro10,2",
@"MacBook Pro (13-inch, Retina, Late 2013 or Mid 2014)",@"MacBookPro11,1",
@"MacBook Pro (15-inch, Retina, Late 2013 or Mid 2014)",@"MacBookPro11,2",
@"MacBook Pro (15-inch, Retina, Late 2013 or Mid 2014)",@"MacBookPro11,3",
@"MacBook Pro (15-inch, Retina, Early 2015)",@"MacBookPro11,4",
@"MacBook Pro (15-inch, Retina, Early 2015)",@"MacBookPro11,5",
@"MacBook Pro (13-inch, Retina, Early 2015)",@"MacBookPro12,1",
@"MacBook Pro",@"MacBookPro", // generic.

@"iMac (first generation)",@"iMac,1",
@"iMac (Core Duo Edu)",@"iMac4,1",
@"iMac (Core Duo)",@"iMac4,2",
@"iMac (Core 2 Duo Edu)",@"iMac5,1",
@"iMac (Core 2 Duo)",@"iMac5,2",
@"iMac (24-inch Core 2 Duo)",@"iMac6,1",
@"iMac (Aluminum Core 2 Duo)",@"iMac7,1",
@"iMac (20-inch or 24-inch Penryn, Early 2008)",@"iMac8,1",
@"iMac (20-inch or 24-inch Penryn, Early 2009 or Mid 2009)",@"iMac9,1",
@"iMac (21.5-inch or 27-inch, Core 2 Duo, Late 2009)",@"iMac10,1",
@"iMac (27-inch, Core i5 or i7, Late 2009)",@"iMac11,1",
@"iMac (21.5-inch, Late 2009)",@"iMac11,2",
@"iMac (27-inch, Late 2009)",@"iMac11,3",
@"iMac (21.5-inch, Mid 2011)",@"iMac12,1",
@"iMac (27-inch, Mid 2011)",@"iMac12,2",
@"iMac (21.5-inch, Late 2012)",@"iMac13,1",
@"iMac (27-inch, Late 2012)",@"iMac13,2",
@"iMac (21.5-inch, Late 2013)",@"iMac14,1",
@"iMac (27-inch, Late 2013)",@"iMac14,2",
@"iMac (21.5-inch, Late 2013)",@"iMac14,3",
@"iMac (21.5-inch, Mid 2014)",@"iMac14,4",
@"iMac (27-inch, Retina, Late 2014 or Mid 2015)",@"iMac15,1",
@"iMac",@"iMac", // generic.

@"Mac Pro (Quad Xeon)",@"MacPro1,1",
@"Mac Pro (Octal Xeon)",@"MacPro2,1",
@"Mac Pro (Early 2008)",@"MacPro3,1",
@"Mac Pro (Early 2009)",@"MacPro4,1",
@"Mac Pro (Mid 2010 or Mid 2012)",@"MacPro5,1",
@"Mac Pro (Late 2013)",@"MacPro6,1",
@"Mac Pro",@"MacPro", // generic.

@"Mac Pro",@"MacPro", // generic

@"MacBook Pro Core 2",@"MacBookPro4,1",
@"MacBook Pro",@"MacBookPro", // generic

@"MacBook Air (Late 2010)",@"MacBookAir3,1",
@"MacBook Air",@"MacBookAir", // generic
@"Mac mini (Core Duo/Solo)",@"Macmini1,1",
@"Mac mini (Core Duo)",@"Macmini2,1",
@"Mac mini (Core 2 Duo)",@"Macmini3,1",
@"Mac mini (Mid 2010)",@"Macmini4,1",
@"Mac mini (Mid 2011)",@"Macmini5,1",
@"Mac mini (Server, Mid 2011)",@"Macmini5,3",
@"Mac mini (2.5 GHz, Late 2012)",@"Macmini6,1",
@"Mac mini (2.3 or 2.6 GHz, Late 2012)",@"Macmini6,2",
@"Mac mini (Late 2014)",@"Macmini7,1",
@"Mac Mini",@"Macmini", // generic

@"Developer Transition Kit",@"ADP2,1",
@"Development Mac Pro",@"M43ADP1,1 ",
nil];

NSRange r;
Expand Down

0 comments on commit 9aabbf1

Please sign in to comment.