diff --git a/ipmitool/ipmitool-spdfix.patch b/ipmitool/ipmitool-spdfix.patch
index add17d0..d0ae089 100644
--- a/ipmitool/ipmitool-spdfix.patch
+++ b/ipmitool/ipmitool-spdfix.patch
@@ -1,6 +1,5 @@
-diff -urN ipmitool-1.8.11/lib/dimm_spd.c ipmitool-spdfix/lib/dimm_spd.c
 --- ipmitool-1.8.11/lib/dimm_spd.c	2009-02-25 15:38:52.000000000 -0500
-+++ ipmitool-spdfix/lib/dimm_spd.c	2009-03-11 14:32:31.000000000 -0400
++++ ipmitool-1.8.11-spdfix/lib/dimm_spd.c	2009-03-31 23:34:24.000000000 -0400
 @@ -60,6 +60,37 @@
  	{ 0x06, "DDR SGRAM" },
  	{ 0x07, "DDR SDRAM" },
@@ -13,13 +12,13 @@ diff -urN ipmitool-1.8.11/lib/dimm_spd.c ipmitool-spdfix/lib/dimm_spd.c
 +
 +const struct valstr ddr3_density_vals[] = 
 +{
-+	{ 0, "256 MB" },
-+	{ 1, "512 MB" },
-+	{ 2, "1 GB" },
-+	{ 3, "2 GB" },
-+	{ 4, "4 GB" },
-+	{ 5, "8 GB" },
-+	{ 6, "16 GB" },
++	{ 0, "256 Mb" },
++	{ 1, "512 Mb" },
++	{ 2, "1 Gb" },
++	{ 3, "2 Gb" },
++	{ 4, "4 Gb" },
++	{ 5, "8 Gb" },
++	{ 6, "16 Gb" },
 +	{ 0x00, NULL },
 +};
 +
@@ -39,7 +38,7 @@ diff -urN ipmitool-1.8.11/lib/dimm_spd.c ipmitool-spdfix/lib/dimm_spd.c
  	{ 0x00, NULL },
  };
  
-@@ -693,51 +724,111 @@
+@@ -693,51 +724,128 @@
  	if (len < 92)
  		return -1; /* we need first 91 bytes to do our thing */
  
@@ -64,12 +63,29 @@ diff -urN ipmitool-1.8.11/lib/dimm_spd.c ipmitool-spdfix/lib/dimm_spd.c
 +	{
 +		int iPN;
 +		char *pchPN = spd_data+128;
++		int sdram_cap = 0;
++		int pri_bus_width = 0;
++		int sdram_width = 0;
++		int ranks = 0;
++		int mem_size = 0;
 +
 +		if (len < 148)
 +			return -1; /* we need first 91 bytes to do our thing */
 +	
-+		printf(" Memory Density        : %s\n", val2str(spd_data[4]&15, ddr3_density_vals));
++
++		sdram_cap = ldexp(256,(spd_data[4]&15));
++		pri_bus_width = ldexp(8,(spd_data[8]&7));
++		sdram_width = ldexp(4,(spd_data[7]&7));
++		ranks = ldexp(1,((spd_data[7]&0x3F)>>3));
++		mem_size = (sdram_cap/8) * (pri_bus_width/sdram_width) * ranks;
++		printf(" SDRAM Capacity        : %d MB\n", sdram_cap );
 +		printf(" Memory Banks          : %s\n", val2str(spd_data[4]>>4, ddr3_banks_vals));
++		printf(" Primary Bus Width     : %d bits\n", pri_bus_width );
++		printf(" SDRAM Device Width    : %d bits\n", sdram_width );
++		printf(" Number of Ranks       : %d\n", ranks );
++		printf(" Memory size           : %d MB\n", mem_size );
++		
++		/* printf(" Memory Density        : %s\n", val2str(spd_data[4]&15, ddr3_density_vals)); */
 +		printf(" 1.5 V Nominal Op      : %s\n", (((spd_data[6]&1) != 0) ? "No":"Yes" ) );
 +		printf(" 1.35 V Nominal Op     : %s\n", (((spd_data[6]&2) != 0) ? "No":"Yes" ) );
 +		printf(" 1.2X V Nominal Op     : %s\n", (((spd_data[6]&4) != 0) ? "No":"Yes" ) );
@@ -184,834 +200,3 @@ diff -urN ipmitool-1.8.11/lib/dimm_spd.c ipmitool-spdfix/lib/dimm_spd.c
  	if (verbose) {
  		printf("\n");
  		printbuf(spd_data, len, "SPD DATA");
-diff -urN ipmitool-1.8.11/lib/dimm_spd.c.orig ipmitool-spdfix/lib/dimm_spd.c.orig
---- ipmitool-1.8.11/lib/dimm_spd.c.orig	1969-12-31 19:00:00.000000000 -0500
-+++ ipmitool-spdfix/lib/dimm_spd.c.orig	2009-02-25 15:38:52.000000000 -0500
-@@ -0,0 +1,827 @@
-+/*
-+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
-+ * 
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 
-+ * Redistribution of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 
-+ * Redistribution in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 
-+ * Neither the name of Sun Microsystems, Inc. or the names of
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ * 
-+ * This software is provided "AS IS," without a warranty of any kind.
-+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
-+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
-+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
-+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
-+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
-+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
-+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
-+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
-+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#include <ipmitool/ipmi.h>
-+#include <ipmitool/log.h>
-+#include <ipmitool/helper.h>
-+#include <ipmitool/ipmi_intf.h>
-+#include <ipmitool/ipmi_fru.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+extern int verbose;
-+
-+/*
-+ * Also, see ipmi_fru.c.
-+ *
-+ * Apparently some systems have problems with FRU access greater than 16 bytes
-+ * at a time, even when using byte (not word) access.	 In order to ensure we
-+ * work with the widest variety of hardware request size is capped at 16 bytes.
-+ * Since this may result in slowdowns on some systems with lots of FRU data you
-+ * can change this define to enable larger (up to 32 bytes at a time) access.
-+ */
-+#define FRU_DATA_RQST_SIZE 16;
-+
-+const struct valstr spd_memtype_vals[] = {
-+	{ 0x01, "STD FPM DRAM" },
-+	{ 0x02, "EDO" },
-+	{ 0x04, "SDRAM" },
-+	{ 0x05, "ROM" },
-+	{ 0x06, "DDR SGRAM" },
-+	{ 0x07, "DDR SDRAM" },
-+	{ 0x08, "DDR2 SDRAM" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr spd_config_vals[] = {
-+	{ 0x00, "None" },
-+	{ 0x01, "Parity" },
-+	{ 0x02, "ECC" },
-+	{ 0x04, "Addr Cmd Parity" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr spd_voltage_vals[] = {
-+	{ 0x00, "5.0V TTL" },
-+	{ 0x01, "LVTTL" },
-+	{ 0x02, "HSTL 1.5V" },
-+	{ 0x03, "SSTL 3.3V" },
-+	{ 0x04, "SSTL 2.5V" },
-+	{ 0x05, "SSTL 1.8V" },
-+	{ 0x00, NULL },
-+};
-+
-+/*
-+ * JEDEC Standard Manufacturers Identification Code
-+ * publication JEP106N, December 2003
-+ */
-+
-+const struct valstr jedec_id1_vals[] = {
-+	{ 0x01, "AMD" },
-+	{ 0x02, "AMI" },
-+	{ 0x83, "Fairchild" },
-+	{ 0x04, "Fujitsu" },
-+	{ 0x85, "GTE" },
-+	{ 0x86, "Harris" },
-+	{ 0x07, "Hitachi" },
-+	{ 0x08, "Inmos" },
-+	{ 0x89, "Intel" },
-+	{ 0x8a, "I.T.T." },
-+	{ 0x0b, "Intersil" },
-+	{ 0x8c, "Monolithic Memories" },
-+	{ 0x0d, "Mostek" },
-+	{ 0x0e, "Motorola" },
-+	{ 0x8f, "National" },
-+	{ 0x10, "NEC" },
-+	{ 0x91, "RCA" },
-+	{ 0x92, "Raytheon" },
-+	{ 0x13, "Conexant (Rockwell)" },
-+	{ 0x94, "Seeq" },
-+	{ 0x15, "Philips Semi. (Signetics)" },
-+	{ 0x16, "Synertek" },
-+	{ 0x97, "Texas Instruments" },
-+	{ 0x98, "Toshiba" },
-+	{ 0x19, "Xicor" },
-+	{ 0x1a, "Zilog" },
-+	{ 0x9b, "Eurotechnique" },
-+	{ 0x1c, "Mitsubishi" },
-+	{ 0x9d, "Lucent (AT&T)" },
-+	{ 0x9e, "Exel" },
-+	{ 0x1f, "Atmel" },
-+	{ 0x20, "SGS/Thomson" },
-+	{ 0xa1, "Lattice Semi." },
-+	{ 0xa2, "NCR" },
-+	{ 0x23, "Wafer Scale Integration" },
-+	{ 0xa4, "IBM" },
-+	{ 0x25, "Tristar" },
-+	{ 0x26, "Visic" },
-+	{ 0xa7, "Intl. CMOS Technology" },
-+	{ 0xa8, "SSSI" },
-+	{ 0x29, "Microchip Technology" },
-+	{ 0x2a, "Ricoh Ltd." },
-+	{ 0xab, "VLSI" },
-+	{ 0x2c, "Micron Technology" },
-+	{ 0xad, "Hyundai Electronics" },
-+	{ 0xae, "OKI Semiconductor" },
-+	{ 0x2f, "ACTEL" },
-+	{ 0xb0, "Sharp" },
-+	{ 0x31, "Catalyst" },
-+	{ 0x32, "Panasonic" },
-+	{ 0xb3, "IDT" },
-+	{ 0x34, "Cypress" },
-+	{ 0xb5, "DEC" },
-+	{ 0xb6, "LSI Logic" },
-+	{ 0x37, "Zarlink" },
-+	{ 0x38, "UTMC" },
-+	{ 0xb9, "Thinking Machine" },
-+	{ 0xba, "Thomson CSF" },
-+	{ 0x3b, "Integrated CMOS(Vertex)" },
-+	{ 0xbc, "Honeywell" },
-+	{ 0x3d, "Tektronix" },
-+	{ 0x3e, "Sun Microsystems" },
-+	{ 0xbf, "SST" },
-+	{ 0x40, "MOSEL" },
-+	{ 0xc1, "Infineon" },
-+	{ 0xc2, "Macronix" },
-+	{ 0x43, "Xerox" },
-+	{ 0xc4, "Plus Logic" },
-+	{ 0x45, "SunDisk" },
-+	{ 0x46, "Elan Circuit Tech." },
-+	{ 0xc7, "European Silicon Str." },
-+	{ 0xc8, "Apple Computer" },
-+	{ 0xc9, "Xilinx" },
-+	{ 0x4a, "Compaq" },
-+	{ 0xcb, "Protocol Engines" },
-+	{ 0x4c, "SCI" },
-+	{ 0xcd, "Seiko Instruments" },
-+	{ 0xce, "Samsung" },
-+	{ 0x4f, "I3 Design System" },
-+	{ 0xd0, "Klic" },
-+	{ 0x51, "Crosspoint Solutions" },
-+	{ 0x52, "Alliance Semiconductor" },
-+	{ 0xd3, "Tandem" },
-+	{ 0x54, "Hewlett-Packard" },
-+	{ 0xd5, "Intg. Silicon Solutions" },
-+	{ 0xd6, "Brooktree" },
-+	{ 0x57, "New Media" },
-+	{ 0x58, "MHS Electronic" },
-+	{ 0xd9, "Performance Semi." },
-+	{ 0xda, "Winbond Electronic" },
-+	{ 0x5b, "Kawasaki Steel" },
-+	{ 0xdc, "Bright Micro" },
-+	{ 0x5d, "TECMAR" },
-+	{ 0x5e, "Exar" },
-+	{ 0xdf, "PCMCIA" },
-+	{ 0xe0, "LG Semiconductor" },
-+	{ 0x61, "Northern Telecom" },
-+	{ 0x62, "Sanyo" },
-+	{ 0xe3, "Array Microsystems" },
-+	{ 0x64, "Crystal Semiconductor" },
-+	{ 0xe5, "Analog Devices" },
-+	{ 0xe6, "PMC-Sierra" },
-+	{ 0x67, "Asparix" },
-+	{ 0x68, "Convex Computer" },
-+	{ 0xe9, "Quality Semiconductor" },
-+	{ 0xea, "Nimbus Technology" },
-+	{ 0x6b, "Transwitch" },
-+	{ 0xec, "Micronas (ITT Intermetall)" },
-+	{ 0x6d, "Cannon" },
-+	{ 0x6e, "Altera" },
-+	{ 0xef, "NEXCOM" },
-+	{ 0x70, "QUALCOMM" },
-+	{ 0xf1, "Sony" },
-+	{ 0xf2, "Cray Research" },
-+	{ 0x73, "AMS (Austria Micro)" },
-+	{ 0xf4, "Vitesse" },
-+	{ 0x75, "Aster Electronics" },
-+	{ 0x76, "Bay Networks (Synoptic)" },
-+	{ 0xf7, "Zentrum" },
-+	{ 0xf8, "TRW" },
-+	{ 0x79, "Thesys" },
-+	{ 0x7a, "Solbourne Computer" },
-+	{ 0xfb, "Allied-Signal" },
-+	{ 0x7c, "Dialog" },
-+	{ 0xfd, "Media Vision" },
-+	{ 0xfe, "Level One Communication" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr jedec_id2_vals[] = {
-+	{ 0x01, "Cirrus Logic" },
-+	{ 0x02, "National Instruments" },
-+	{ 0x83, "ILC Data Device" },
-+	{ 0x04, "Alcatel Mietec" },
-+	{ 0x85, "Micro Linear" },
-+	{ 0x86, "Univ. of NC" },
-+	{ 0x07, "JTAG Technologies" },
-+	{ 0x08, "Loral" },
-+	{ 0x89, "Nchip" },
-+	{ 0x8A, "Galileo Tech" },
-+	{ 0x0B, "Bestlink Systems" },
-+	{ 0x8C, "Graychip" },
-+	{ 0x0D, "GENNUM" },
-+	{ 0x0E, "VideoLogic" },
-+	{ 0x8F, "Robert Bosch" },
-+	{ 0x10, "Chip Express" },
-+	{ 0x91, "DATARAM" },
-+	{ 0x92, "United Microelec Corp." },
-+	{ 0x13, "TCSI" },
-+	{ 0x94, "Smart Modular" },
-+	{ 0x15, "Hughes Aircraft" },
-+	{ 0x16, "Lanstar Semiconductor" },
-+	{ 0x97, "Qlogic" },
-+	{ 0x98, "Kingston" },
-+	{ 0x19, "Music Semi" },
-+	{ 0x1A, "Ericsson Components" },
-+	{ 0x9B, "SpaSE" },
-+	{ 0x1C, "Eon Silicon Devices" },
-+	{ 0x9D, "Programmable Micro Corp" },
-+	{ 0x9E, "DoD" },
-+	{ 0x1F, "Integ. Memories Tech." },
-+	{ 0x20, "Corollary Inc." },
-+	{ 0xA1, "Dallas Semiconductor" },
-+	{ 0xA2, "Omnivision" },
-+	{ 0x23, "EIV(Switzerland)" },
-+	{ 0xA4, "Novatel Wireless" },
-+	{ 0x25, "Zarlink (formerly Mitel)" },
-+	{ 0x26, "Clearpoint" },
-+	{ 0xA7, "Cabletron" },
-+	{ 0xA8, "Silicon Technology" },
-+	{ 0x29, "Vanguard" },
-+	{ 0x2A, "Hagiwara Sys-Com" },
-+	{ 0xAB, "Vantis" },
-+	{ 0x2C, "Celestica" },
-+	{ 0xAD, "Century" },
-+	{ 0xAE, "Hal Computers" },
-+	{ 0x2F, "Rohm Company Ltd." },
-+	{ 0xB0, "Juniper Networks" },
-+	{ 0x31, "Libit Signal Processing" },
-+	{ 0x32, "Enhanced Memories Inc." },
-+	{ 0xB3, "Tundra Semiconductor" },
-+	{ 0x34, "Adaptec Inc." },
-+	{ 0xB5, "LightSpeed Semi." },
-+	{ 0xB6, "ZSP Corp." },
-+	{ 0x37, "AMIC Technology" },
-+	{ 0x38, "Adobe Systems" },
-+	{ 0xB9, "Dynachip" },
-+	{ 0xBA, "PNY Electronics" },
-+	{ 0x3B, "Newport Digital" },
-+	{ 0xBC, "MMC Networks" },
-+	{ 0x3D, "T Square" },
-+	{ 0x3E, "Seiko Epson" },
-+	{ 0xBF, "Broadcom" },
-+	{ 0x40, "Viking Components" },
-+	{ 0xC1, "V3 Semiconductor" },
-+	{ 0xC2, "Flextronics (formerly Orbit)" },
-+	{ 0x43, "Suwa Electronics" },
-+	{ 0xC4, "Transmeta" },
-+	{ 0x45, "Micron CMS" },
-+	{ 0x46, "American Computer & Digital Components Inc" },
-+	{ 0xC7, "Enhance 3000 Inc" },
-+	{ 0xC8, "Tower Semiconductor" },
-+	{ 0x49, "CPU Design" },
-+	{ 0x4A, "Price Point" },
-+	{ 0xCB, "Maxim Integrated Product" },
-+	{ 0x4C, "Tellabs" },
-+	{ 0xCD, "Centaur Technology" },
-+	{ 0xCE, "Unigen Corporation" },
-+	{ 0x4F, "Transcend Information" },
-+	{ 0xD0, "Memory Card Technology" },
-+	{ 0x51, "CKD Corporation Ltd." },
-+	{ 0x52, "Capital Instruments, Inc." },
-+	{ 0xD3, "Aica Kogyo, Ltd." },
-+	{ 0x54, "Linvex Technology" },
-+	{ 0xD5, "MSC Vertriebs GmbH" },
-+	{ 0xD6, "AKM Company, Ltd." },
-+	{ 0x57, "Dynamem, Inc." },
-+	{ 0x58, "NERA ASA" },
-+	{ 0xD9, "GSI Technology" },
-+	{ 0xDA, "Dane-Elec (C Memory)" },
-+	{ 0x5B, "Acorn Computers" },
-+	{ 0xDC, "Lara Technology" },
-+	{ 0x5D, "Oak Technology, Inc." },
-+	{ 0x5E, "Itec Memory" },
-+	{ 0xDF, "Tanisys Technology" },
-+	{ 0xE0, "Truevision" },
-+	{ 0x61, "Wintec Industries" },
-+	{ 0x62, "Super PC Memory" },
-+	{ 0xE3, "MGV Memory" },
-+	{ 0x64, "Galvantech" },
-+	{ 0xE5, "Gadzoox Nteworks" },
-+	{ 0xE6, "Multi Dimensional Cons." },
-+	{ 0x67, "GateField" },
-+	{ 0x68, "Integrated Memory System" },
-+	{ 0xE9, "Triscend" },
-+	{ 0xEA, "XaQti" },
-+	{ 0x6B, "Goldenram" },
-+	{ 0xEC, "Clear Logic" },
-+	{ 0x6D, "Cimaron Communications" },
-+	{ 0x6E, "Nippon Steel Semi. Corp." },
-+	{ 0xEF, "Advantage Memory" },
-+	{ 0x70, "AMCC" },
-+	{ 0xF1, "LeCroy" },
-+	{ 0xF2, "Yamaha Corporation" },
-+	{ 0x73, "Digital Microwave" },
-+	{ 0xF4, "NetLogic Microsystems" },
-+	{ 0x75, "MIMOS Semiconductor" },
-+	{ 0x76, "Advanced Fibre" },
-+	{ 0xF7, "BF Goodrich Data." },
-+	{ 0xF8, "Epigram" },
-+	{ 0x79, "Acbel Polytech Inc." },
-+	{ 0x7A, "Apacer Technology" },
-+	{ 0xFB, "Admor Memory" },
-+	{ 0x7C, "FOXCONN" },
-+	{ 0xFD, "Quadratics Superconductor" },
-+	{ 0xFE, "3COM" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr jedec_id3_vals[] = {
-+	{ 0x01, "Camintonn Corporation" },
-+	{ 0x02, "ISOA Incorporated" },
-+	{ 0x83, "Agate Semiconductor" },
-+	{ 0x04, "ADMtek Incorporated" },
-+	{ 0x85, "HYPERTEC" },
-+	{ 0x86, "Adhoc Technologies" },
-+	{ 0x07, "MOSAID Technologies" },
-+	{ 0x08, "Ardent Technologies" },
-+	{ 0x89, "Switchcore" },
-+	{ 0x8A, "Cisco Systems, Inc." },
-+	{ 0x0B, "Allayer Technologies" },
-+	{ 0x8C, "WorkX AG" },
-+	{ 0x0D, "Oasis Semiconductor" },
-+	{ 0x0E, "Novanet Semiconductor" },
-+	{ 0x8F, "E-M Solutions" },
-+	{ 0x10, "Power General" },
-+	{ 0x91, "Advanced Hardware Arch." },
-+	{ 0x92, "Inova Semiconductors GmbH" },
-+	{ 0x13, "Telocity" },
-+	{ 0x94, "Delkin Devices" },
-+	{ 0x15, "Symagery Microsystems" },
-+	{ 0x16, "C-Port Corporation" },
-+	{ 0x97, "SiberCore Technologies" },
-+	{ 0x98, "Southland Microsystems" },
-+	{ 0x19, "Malleable Technologies" },
-+	{ 0x1A, "Kendin Communications" },
-+	{ 0x9B, "Great Technology Microcomputer" },
-+	{ 0x1C, "Sanmina Corporation" },
-+	{ 0x9D, "HADCO Corporation" },
-+	{ 0x9E, "Corsair" },
-+	{ 0x1F, "Actrans System Inc." },
-+	{ 0x20, "ALPHA Technologies" },
-+	{ 0xA1, "Cygnal Integrated Products Incorporated" },
-+	{ 0xA2, "Artesyn Technologies" },
-+	{ 0x23, "Align Manufacturing" },
-+	{ 0xA4, "Peregrine Semiconductor" },
-+	{ 0x25, "Chameleon Systems" },
-+	{ 0x26, "Aplus Flash Technology" },
-+	{ 0xA7, "MIPS Technologies" },
-+	{ 0xA8, "Chrysalis ITS" },
-+	{ 0x29, "ADTEC Corporation" },
-+	{ 0x2A, "Kentron Technologies" },
-+	{ 0xAB, "Win Technologies" },
-+	{ 0x2C, "ASIC Designs Inc" },
-+	{ 0xAD, "Extreme Packet Devices" },
-+	{ 0xAE, "RF Micro Devices" },
-+	{ 0x2F, "Siemens AG" },
-+	{ 0xB0, "Sarnoff Corporation" },
-+	{ 0x31, "Itautec Philco SA" },
-+	{ 0x32, "Radiata Inc." },
-+	{ 0xB3, "Benchmark Elect. (AVEX)" },
-+	{ 0x34, "Legend" },
-+	{ 0xB5, "SpecTek Incorporated" },
-+	{ 0xB6, "Hi/fn" },
-+	{ 0x37, "Enikia Incorporated" },
-+	{ 0x38, "SwitchOn Networks" },
-+	{ 0xB9, "AANetcom Incorporated" },
-+	{ 0xBA, "Micro Memory Bank" },
-+	{ 0x3B, "ESS Technology" },
-+	{ 0xBC, "Virata Corporation" },
-+	{ 0x3D, "Excess Bandwidth" },
-+	{ 0x3E, "West Bay Semiconductor" },
-+	{ 0xBF, "DSP Group" },
-+	{ 0x40, "Newport Communications" },
-+	{ 0xC1, "Chip2Chip Incorporated" },
-+	{ 0xC2, "Phobos Corporation" },
-+	{ 0x43, "Intellitech Corporation" },
-+	{ 0xC4, "Nordic VLSI ASA" },
-+	{ 0x45, "Ishoni Networks" },
-+	{ 0x46, "Silicon Spice" },
-+	{ 0xC7, "Alchemy Semiconductor" },
-+	{ 0xC8, "Agilent Technologies" },
-+	{ 0x49, "Centillium Communications" },
-+	{ 0x4A, "W.L. Gore" },
-+	{ 0xCB, "HanBit Electronics" },
-+	{ 0x4C, "GlobeSpan" },
-+        { 0xCD, "Element 14" },
-+	{ 0xCE, "Pycon" },
-+	{ 0x4F, "Saifun Semiconductors" },
-+	{ 0xD0, "Sibyte, Incorporated" },
-+	{ 0x51, "MetaLink Technologies" },
-+	{ 0x52, "Feiya Technology" },
-+	{ 0xD3, "I & C Technology" },
-+	{ 0x54, "Shikatronics" },
-+	{ 0xD5, "Elektrobit" },
-+	{ 0xD6, "Megic" },
-+	{ 0x57, "Com-Tier" },
-+	{ 0x58, "Malaysia Micro Solutions" },
-+	{ 0xD9, "Hyperchip" },
-+	{ 0xDA, "Gemstone Communications" },
-+	{ 0x5B, "Anadyne Microelectronics" },
-+	{ 0xDC, "3ParData" },
-+	{ 0x5D, "Mellanox Technologies" },
-+	{ 0x5E, "Tenx Technologies" },
-+	{ 0xDF, "Helix AG" },
-+	{ 0xE0, "Domosys" },
-+	{ 0x61, "Skyup Technology" },
-+	{ 0x62, "HiNT Corporation" },
-+	{ 0xE3, "Chiaro" },
-+	{ 0x64, "MCI Computer GMBH" },
-+	{ 0xE5, "Exbit Technology A/S" },
-+	{ 0xE6, "Integrated Technology Express" },
-+	{ 0x67, "AVED Memory" },
-+	{ 0x68, "Legerity" },
-+	{ 0xE9, "Jasmine Networks" },
-+	{ 0xEA, "Caspian Networks" },
-+	{ 0x6B, "nCUBE" },
-+	{ 0xEC, "Silicon Access Networks" },
-+	{ 0x6D, "FDK Corporation" },
-+	{ 0x6E, "High Bandwidth Access" },
-+	{ 0xEF, "MultiLink Technology" },
-+	{ 0x70, "BRECIS" },
-+	{ 0xF1, "World Wide Packets" },
-+	{ 0xF2, "APW" },
-+	{ 0x73, "Chicory Systems" },
-+	{ 0xF4, "Xstream Logic" },
-+	{ 0x75, "Fast-Chip" },
-+	{ 0x76, "Zucotto Wireless" },
-+	{ 0xF7, "Realchip" },
-+	{ 0xF8, "Galaxy Power" },
-+	{ 0x79, "eSilicon" },
-+	{ 0x7A, "Morphics Technology" },
-+	{ 0xFB, "Accelerant Networks" },
-+	{ 0x7C, "Silicon Wave" },
-+	{ 0xFD, "SandCraft" },
-+	{ 0xFE, "Elpida" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr jedec_id4_vals[] = {
-+	{ 0x01, "Solectron" },
-+	{ 0x02, "Optosys Technologies" },
-+	{ 0x83, "Buffalo (Formerly Melco)" },
-+	{ 0x04, "TriMedia Technologies" },
-+	{ 0x85, "Cyan Technologies" },
-+	{ 0x86, "Global Locate" },
-+	{ 0x07, "Optillion" },
-+	{ 0x08, "Terago Communications" },
-+	{ 0x89, "Ikanos Communications" },
-+	{ 0x8A, "Princeton Technology" },
-+	{ 0x0B, "Nanya Technology" },
-+	{ 0x8C, "Elite Flash Storage" },
-+	{ 0x0D, "Mysticom" },
-+	{ 0x0E, "LightSand Communications" },
-+	{ 0x8F, "ATI Technologies" },
-+	{ 0x10, "Agere Systems" },
-+	{ 0x91, "NeoMagic" },
-+	{ 0x92, "AuroraNetics" },
-+	{ 0x13, "Golden Empire" },
-+	{ 0x94, "Muskin" },
-+	{ 0x15, "Tioga Technologies" },
-+	{ 0x16, "Netlist" },
-+	{ 0x97, "TeraLogic" },
-+	{ 0x98, "Cicada Semiconductor" },
-+	{ 0x19, "Centon Electronics" },
-+	{ 0x1A, "Tyco Electronics" },
-+	{ 0x9B, "Magis Works" },
-+	{ 0x1C, "Zettacom" },
-+	{ 0x9D, "Cogency Semiconductor" },
-+	{ 0x9E, "Chipcon AS" },
-+	{ 0x1F, "Aspex Technology" },
-+	{ 0x20, "F5 Networks" },
-+	{ 0xA1, "Programmable Silicon Solutions" },
-+	{ 0xA2, "ChipWrights" },
-+	{ 0x23, "Acorn Networks" },
-+	{ 0xA4, "Quicklogic" },
-+	{ 0x25, "Kingmax Semiconductor" },
-+	{ 0x26, "BOPS" },
-+	{ 0xA7, "Flasys" },
-+	{ 0xA8, "BitBlitz Communications" },
-+	{ 0x29, "eMemory Technology" },
-+	{ 0x2A, "Procket Networks" },
-+	{ 0xAB, "Purple Ray" },
-+	{ 0x2C, "Trebia Networks" },
-+	{ 0xAD, "Delta Electronics" },
-+	{ 0xAE, "Onex Communications" },
-+	{ 0x2F, "Ample Communications" },
-+	{ 0xB0, "Memory Experts Intl" },
-+	{ 0x31, "Astute Networks" },
-+	{ 0x32, "Azanda Network Devices" },
-+	{ 0xB3, "Dibcom" },
-+	{ 0x34, "Tekmos" },
-+	{ 0xB5, "API NetWorks" },
-+	{ 0xB6, "Bay Microsystems" },
-+	{ 0x37, "Firecron Ltd" },
-+	{ 0x38, "Resonext Communications" },
-+	{ 0xB9, "Tachys Technologies" },
-+	{ 0xBA, "Equator Technology" },
-+	{ 0x3B, "Concept Computer" },
-+	{ 0xBC, "SILCOM" },
-+	{ 0x3D, "3Dlabs" },
-+	{ 0x3E, "ct Magazine" },
-+	{ 0xBF, "Sanera Systems" },
-+	{ 0x40, "Silicon Packets" },
-+	{ 0xC1, "Viasystems Group" },
-+	{ 0xC2, "Simtek" },
-+	{ 0x43, "Semicon Devices Singapore" },
-+	{ 0xC4, "Satron Handelsges" },
-+	{ 0x45, "Improv Systems" },
-+	{ 0x46, "INDUSYS GmbH" },
-+	{ 0xC7, "Corrent" },
-+	{ 0xC8, "Infrant Technologies" },
-+	{ 0x49, "Ritek Corp" },
-+	{ 0x4A, "empowerTel Networks" },
-+	{ 0xCB, "Hypertec" },
-+	{ 0x4C, "Cavium Networks" },
-+	{ 0xCD, "PLX Technology" },
-+	{ 0xCE, "Massana Design" },
-+	{ 0x4F, "Intrinsity" },
-+	{ 0xD0, "Valence Semiconductor" },
-+	{ 0x51, "Terawave Communications" },
-+	{ 0x52, "IceFyre Semiconductor" },
-+	{ 0xD3, "Primarion" },
-+	{ 0x54, "Picochip Designs Ltd" },
-+	{ 0xD5, "Silverback Systems" },
-+	{ 0xD6, "Jade Star Technologies" },
-+	{ 0x57, "Pijnenburg Securealink" },
-+	{ 0x58, "MemorySolutioN" },
-+	{ 0xD9, "Cambridge Silicon Radio" },
-+	{ 0xDA, "Swissbit" },
-+	{ 0x5B, "Nazomi Communications" },
-+	{ 0xDC, "eWave System" },
-+	{ 0x5D, "Rockwell Collins" },
-+	{ 0x5E, "PAION" },
-+	{ 0xDF, "Alphamosaic Ltd" },
-+	{ 0xE0, "Sandburst" },
-+	{ 0x61, "SiCon Video" },
-+	{ 0x62, "NanoAmp Solutions" },
-+	{ 0xE3, "Ericsson Technology" },
-+	{ 0x64, "PrairieComm" },
-+	{ 0xE5, "Mitac International" },
-+	{ 0xE6, "Layer N Networks" },
-+	{ 0x67, "Atsana Semiconductor" },
-+	{ 0x68, "Allegro Networks" },
-+	{ 0xE9, "Marvell Semiconductors" },
-+	{ 0xEA, "Netergy Microelectronic" },
-+	{ 0x6B, "NVIDIA" },
-+	{ 0xEC, "Internet Machines" },
-+	{ 0x6D, "Peak Electronics" },
-+	{ 0xEF, "Accton Technology" },
-+	{ 0x70, "Teradiant Networks" },
-+	{ 0xF1, "Europe Technologies" },
-+	{ 0xF2, "Cortina Systems" },
-+	{ 0x73, "RAM Components" },
-+	{ 0xF4, "Raqia Networks" },
-+	{ 0x75, "ClearSpeed" },
-+	{ 0x76, "Matsushita Battery" },
-+	{ 0xF7, "Xelerated" },
-+	{ 0xF8, "SimpleTech" },
-+	{ 0x79, "Utron Technology" },
-+	{ 0x7A, "Astec International" },
-+	{ 0xFB, "AVM gmbH" },
-+	{ 0x7C, "Redux Communications" },
-+	{ 0xFD, "Dot Hill Systems" },
-+	{ 0xFE, "TeraChip" },
-+	{ 0x00, NULL },
-+};
-+
-+const struct valstr jedec_id5_vals[] = {
-+	{ 0x01, "T-RAM Incorporated" },
-+	{ 0x02, "Innovics Wireless" },
-+	{ 0x83, "Teknovus" },
-+	{ 0x04, "KeyEye Communications" },
-+	{ 0x85, "Runcom Technologies" },
-+	{ 0x86, "RedSwitch" },
-+	{ 0x07, "Dotcast" },
-+	{ 0x08, "Silicon Mountain Memory" },
-+	{ 0x89, "Signia Technologies" },
-+	{ 0x8A, "Pixim" },
-+	{ 0x0B, "Galazar Networks" },
-+	{ 0x8C, "White Electronic Designs" },
-+	{ 0x0D, "Patriot Scientific" },
-+	{ 0x0E, "Neoaxiom Corporation" },
-+	{ 0x8F, "3Y Power Technology" },
-+	{ 0x10, "Europe Technologies" },
-+	{ 0x91, "Potentia Power Systems" },
-+	{ 0x92, "C-guys Incorporated" },
-+	{ 0x13, "Digital Communications Technology Incorporated" },
-+	{ 0x94, "Silicon-Based Technology" },
-+	{ 0x15, "Fulcrum Microsystems" },
-+	{ 0x16, "Positivo Informatica Ltd" },
-+	{ 0x97, "XIOtech Corporation" },
-+	{ 0x98, "PortalPlayer" },
-+	{ 0x19, "Zhiying Software" },
-+	{ 0x1A, "Direct2Data" },
-+	{ 0x9B, "Phonex Broadband" },
-+	{ 0x1C, "Skyworks Solutions" },
-+	{ 0x9D, "Entropic Communications" },
-+	{ 0x9E, "Pacific Force Technology" },
-+	{ 0x1F, "Zensys A/S" },
-+	{ 0x20, "Legend Silicon Corp." },
-+	{ 0xA1, "sci-worx GmbH" },
-+	{ 0xA2, "Oasis Silicon Systems" },
-+	{ 0x23, "Renesas Technology" },
-+	{ 0xA4, "Raza Microelectronics" },
-+	{ 0x25, "Phyworks" },
-+	{ 0x26, "MediaTek" },
-+	{ 0xA7, "Non-cents Productions" },
-+	{ 0xA8, "US Modular" },
-+	{ 0x29, "Wintegra Ltd" },
-+	{ 0x2A, "Mathstar" },
-+	{ 0xAB, "StarCore" },
-+	{ 0x2C, "Oplus Technologies" },
-+	{ 0xAD, "Mindspeed" },
-+	{ 0xAE, "Just Young Computer" },
-+	{ 0x2F, "Radia Communications" },
-+	{ 0xB0, "OCZ" },
-+	{ 0x31, "Emuzed" },
-+	{ 0x32, "LOGIC Devices" },
-+	{ 0xB3, "Inphi Corporation" },
-+	{ 0x34, "Quake Technologies" },
-+	{ 0xB5, "Vixel" },
-+	{ 0xB6, "SolusTek" },
-+	{ 0x37, "Kongsberg Maritime" },
-+	{ 0x38, "Faraday Technology" },
-+	{ 0xB9, "Altium Ltd." },
-+	{ 0xBA, "Insyte" },
-+	{ 0x3B, "ARM Ltd." },
-+	{ 0xBC, "DigiVision" },
-+	{ 0x3D, "Vativ Technologies" },
-+	{ 0x3E, "Endicott Interconnect Technologies" },
-+	{ 0xBF, "Pericom" },
-+	{ 0x40, "Bandspeed" },
-+	{ 0xC1, "LeWiz Communications" },
-+	{ 0xC2, "CPU Technology" },
-+	{ 0x43, "Ramaxel Technology" },
-+	{ 0xC4, "DSP Group" },
-+	{ 0x45, "Axis Communications" },
-+	{ 0x46, "Legacy Electronics" },
-+	{ 0xC7, "Chrontel" },
-+	{ 0xC8, "Powerchip Semiconductor" },
-+	{ 0x49, "MobilEye Technologies" },
-+	{ 0x4A, "Excel Semiconductor" },
-+	{ 0xCB, "A-DATA Technology" },
-+	{ 0x4C, "VirtualDigm" },
-+	{ 0x00, NULL },
-+};
-+
-+int
-+ipmi_spd_print(uint8_t *spd_data, int len)
-+{
-+	int size;
-+
-+	if (len < 92)
-+		return -1; /* we need first 91 bytes to do our thing */
-+
-+	size = spd_data[5] * (spd_data[31] << 2);
-+	printf(" Memory Size           : %d MB\n", size);
-+	printf(" Memory Type           : %s\n",
-+	       val2str(spd_data[2], spd_memtype_vals));
-+	printf(" Voltage Intf          : %s\n",
-+	       val2str(spd_data[8], spd_voltage_vals));
-+	printf(" Error Detect/Cor      : %s\n",
-+	       val2str(spd_data[11], spd_config_vals));
-+
-+	/* handle jedec table bank continuation values */
-+	printf(" Manufacturer          : ");
-+	if (spd_data[64] != 0x7f)
-+		printf("%s\n",
-+		       val2str(spd_data[64], jedec_id1_vals));
-+	else {
-+		if (spd_data[65] != 0x7f)
-+			printf("%s\n",
-+			       val2str(spd_data[65], jedec_id2_vals));
-+		else {
-+			if (spd_data[66] != 0x7f)
-+				printf("%s\n",
-+				       val2str(spd_data[66], jedec_id3_vals));
-+			else {
-+				if (spd_data[67] != 0x7f)
-+					printf("%s\n",
-+					       val2str(spd_data[67],
-+						       jedec_id4_vals));
-+				else
-+					printf("%s\n",
-+					       val2str(spd_data[68],
-+						       jedec_id5_vals));
-+			}
-+		}
-+	}
-+
-+	if (spd_data[73]) {
-+		char part[19];
-+		memcpy(part, spd_data+73, 18);
-+		part[18] = 0;
-+		printf(" Part Number           : %s\n", part);
-+	}
-+
-+	printf(" Serial Number         : %02x%02x%02x%02x\n",
-+	       spd_data[95], spd_data[96], spd_data[97], spd_data[98]);
-+
-+	if (verbose) {
-+		printf("\n");
-+		printbuf(spd_data, len, "SPD DATA");
-+	}
-+
-+	return 0;
-+}
-+
-+int
-+ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
-+{
-+	struct ipmi_rs * rsp;
-+	struct ipmi_rq req;
-+	struct fru_info fru;
-+	uint8_t spd_data[256], msg_data[4];
-+	int len, offset;
-+
-+	msg_data[0] = id;
-+
-+	memset(&req, 0, sizeof(req));
-+	req.msg.netfn = IPMI_NETFN_STORAGE;
-+	req.msg.cmd = GET_FRU_INFO;
-+	req.msg.data = msg_data;
-+	req.msg.data_len = 1;
-+
-+	rsp = intf->sendrecv(intf, &req);
-+	if (rsp == NULL) {
-+		printf(" Device not present (No Response)\n");
-+		return -1;
-+	}
-+	if (rsp->ccode > 0) {
-+		printf(" Device not present (%s)\n",
-+		       val2str(rsp->ccode, completion_code_vals));
-+		return -1;
-+	}
-+
-+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
-+	fru.access = rsp->data[2] & 0x1;
-+
-+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
-+		fru.size, fru.access ? "words" : "bytes");
-+
-+	if (fru.size < 1) {
-+		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
-+		return -1;
-+	}
-+
-+	memset(&req, 0, sizeof(req));
-+	req.msg.netfn = IPMI_NETFN_STORAGE;
-+	req.msg.cmd = GET_FRU_DATA;
-+	req.msg.data = msg_data;
-+	req.msg.data_len = 4;
-+
-+	offset = 0;
-+	memset(spd_data, 0, 256);
-+	do {
-+		msg_data[0] = id;
-+		msg_data[1] = offset;
-+		msg_data[2] = 0;
-+		msg_data[3] = FRU_DATA_RQST_SIZE;
-+
-+		rsp = intf->sendrecv(intf, &req);
-+		if (rsp == NULL) {
-+			printf(" Device not present (No Response)\n");
-+			return -1;
-+		}
-+		if (rsp->ccode > 0) {
-+			printf(" Device not present (%s)\n",
-+			       val2str(rsp->ccode, completion_code_vals));
-+
-+			/* Timeouts are acceptable. No DIMM in the socket */
-+			if (rsp->ccode == 0xc3)
-+				return 1;
-+
-+			return -1;
-+		}
-+
-+		len = rsp->data[0];
-+		memcpy(&spd_data[offset], rsp->data + 1, len);
-+		offset += len;
-+	} while (offset < fru.size);
-+
-+	/* now print spd info */
-+	ipmi_spd_print(spd_data, offset);
-+
-+	return 0;
-+}