Index: trunk/i386/libsaio/spd.c
===================================================================
--- trunk/i386/libsaio/spd.c	(revision 860)
+++ trunk/i386/libsaio/spd.c	(revision 861)
@@ -361,18 +361,19 @@
 
 static struct smbus_controllers_t smbus_controllers[] = {
 
-	{0x8086, 0x269B, "ESB2",    read_smb_intel },
-	{0x8086, 0x25A4, "6300ESB", read_smb_intel },
-	{0x8086, 0x24C3, "ICH4",    read_smb_intel },
-	{0x8086, 0x24D3, "ICH5",    read_smb_intel },
-	{0x8086, 0x266A, "ICH6",    read_smb_intel },
-	{0x8086, 0x27DA, "ICH7",    read_smb_intel },
-	{0x8086, 0x283E, "ICH8",    read_smb_intel },
-	{0x8086, 0x2930, "ICH9",    read_smb_intel },	
-	{0x8086, 0x3A30, "ICH10R",  read_smb_intel },
-	{0x8086, 0x3A60, "ICH10B",  read_smb_intel },
-	{0x8086, 0x3B30, "P55",     read_smb_intel },
-	{0x8086, 0x5032, "EP80579", read_smb_intel }
+	{0x8086, 0x269B, "ESB2",		read_smb_intel },
+	{0x8086, 0x25A4, "6300ESB",		read_smb_intel },
+	{0x8086, 0x24C3, "ICH4",		read_smb_intel },
+	{0x8086, 0x24D3, "ICH5",		read_smb_intel },
+	{0x8086, 0x266A, "ICH6",		read_smb_intel },
+	{0x8086, 0x27DA, "ICH7",		read_smb_intel },
+	{0x8086, 0x283E, "ICH8",		read_smb_intel },
+	{0x8086, 0x2930, "ICH9",		read_smb_intel },	
+	{0x8086, 0x3A30, "ICH10R",		read_smb_intel },
+	{0x8086, 0x3A60, "ICH10B",		read_smb_intel },
+	{0x8086, 0x3B30, "5 Series",	read_smb_intel },
+	{0x8086, 0x1C22, "6 Series",	read_smb_intel },
+	{0x8086, 0x5032, "EP80579",		read_smb_intel }
 
 };
 
Index: trunk/i386/libsaio/smbios.c
===================================================================
--- trunk/i386/libsaio/smbios.c	(revision 860)
+++ trunk/i386/libsaio/smbios.c	(revision 861)
@@ -540,6 +540,28 @@
 {
 	SMBOemProcessorBusSpeed *p = (SMBOemProcessorBusSpeed *)structPtr->new;
 
+	switch (Platform.CPU.Family) 
+	{
+		case 0x06:
+		{
+			switch (Platform.CPU.Model)
+			{
+				case 0x19:					// Intel Core i5 650 @3.20 Ghz
+				case CPU_MODEL_FIELDS:		// Intel Core i5, i7 LGA1156 (45nm)
+				case CPU_MODEL_DALES:		// Intel Core i5, i7 LGA1156 (45nm) ???
+				case CPU_MODEL_DALES_32NM:	// Intel Core i3, i5, i7 LGA1156 (32nm)
+				case CPU_MODEL_NEHALEM:		// Intel Core i7 LGA1366 (45nm)
+				case CPU_MODEL_NEHALEM_EX:	// Intel Core i7 LGA1366 (45nm) 6 Core ???
+				case CPU_MODEL_WESTMERE:	// Intel Core i7 LGA1366 (32nm) 6 Core
+				case CPU_MODEL_WESTMERE_EX:	// Intel Core i7 LGA1366 (45nm) 6 Core ???
+					break;
+
+				default:
+					return;
+			}
+		}
+	}
+
 	p->header.type		= kSMBTypeOemProcessorBusSpeed;
 	p->header.length	= sizeof(SMBOemProcessorBusSpeed);
 	p->header.handle	= handle++;
Index: trunk/i386/libsaio/smbios_getters.c
===================================================================
--- trunk/i386/libsaio/smbios_getters.c	(revision 860)
+++ trunk/i386/libsaio/smbios_getters.c	(revision 861)
@@ -48,8 +48,6 @@
 						return false;
 
 					case 0x19:					// Intel Core i5 650 @3.20 Ghz
-					case CPU_MODEL_SANDY:		// Intel Core i5, i7 LGA1155 sandy bridge
-                    case CPU_MODEL_SANDY_XEON:    
 					case CPU_MODEL_NEHALEM:		// Intel Core i7 LGA1366 (45nm)
 					case CPU_MODEL_FIELDS:		// Intel Core i5, i7 LGA1156 (45nm)
 					case CPU_MODEL_DALES:		// Intel Core i5, i7 LGA1156 (45nm) ???
@@ -247,9 +245,9 @@
 		}
 	}
 
-//	return false;
-	value->string = NOT_AVAILABLE;
-	return true;
+	return false;
+//	value->string = NOT_AVAILABLE;
+//	return true;
 }
 	
 bool getSMBMemoryDeviceSerialNumber(returnType *value)
@@ -269,9 +267,9 @@
 		}
 	}
 
-//	return false;
-	value->string = NOT_AVAILABLE;
-	return true;
+	return false;
+//	value->string = NOT_AVAILABLE;
+//	return true;
 }
 
 bool getSMBMemoryDevicePartNumber(returnType *value)
@@ -291,9 +289,9 @@
 		}
 	}
 
-//	return false;
-	value->string = NOT_AVAILABLE;
-	return true;
+	return false;
+//	value->string = NOT_AVAILABLE;
+//	return true;
 }