Attachment #157959 for bug #228815

View | Details | Raw Unified | Return to bug 228815
Collapse All | Expand All

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/assetTag.cpp (+1 lines)
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
25	#include <stdlib.h>	25	#include <stdlib.h>
		26	#include <cstring>
26		27
27	#include "smbios/IMemory.h" // only needed if you want to use fake input (memdump.dat)	28	#include "smbios/IMemory.h" // only needed if you want to use fake input (memdump.dat)
28	#include "smbios/ICmosRW.h" // only needed if you want to use fake input (cmos.dat)	29	#include "smbios/ICmosRW.h" // only needed if you want to use fake input (cmos.dat)

Lines 20-25 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/dellBiosUpdate.cpp (+1 lines)
20	#include "smbios/compat.h"	20	#include "smbios/compat.h"
21		21
22	#include <iostream>	22	#include <iostream>
		23	#include <cstring>
23		24
24	#include "smbios/DellRbu.h"	25	#include "smbios/DellRbu.h"
25	#include "smbios/SystemInfo.h"	26	#include "smbios/SystemInfo.h"

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/dellLcdBrightness.cpp (+1 lines)
22	#include <string>	22	#include <string>
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25	#include <stdlib.h>	26	#include <stdlib.h>
26		27
27	#include "smbios/ISmi.h"	28	#include "smbios/ISmi.h"

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/dellWirelessCtl.cpp (+1 lines)
22	#include <string>	22	#include <string>
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25	#include <stdlib.h>	26	#include <stdlib.h>
26		27
27	#include "smbios/ISmi.h"	28	#include "smbios/ISmi.h"

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/propertyTag.cpp (+1 lines)
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
25	#include <stdlib.h>	25	#include <stdlib.h>
		26	#include <cstring>
26		27
27	#include "smbios/ISmi.h" // only needed if you want to use fake input (memdump.dat)	28	#include "smbios/ISmi.h" // only needed if you want to use fake input (memdump.dat)
28	#include "smbios/SystemInfo.h" // this is the main header to include to use the C interface	29	#include "smbios/SystemInfo.h" // this is the main header to include to use the C interface

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/serviceTag.cpp (+1 lines)
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
25	#include <stdlib.h>	25	#include <stdlib.h>
		26	#include <cstring>
26		27
27	#include "smbios/IMemory.h" // only needed if you want to use fake input (memdump.dat)	28	#include "smbios/IMemory.h" // only needed if you want to use fake input (memdump.dat)
28	#include "smbios/ICmosRW.h" // only needed if you want to use fake input (cmos.dat)	29	#include "smbios/ICmosRW.h" // only needed if you want to use fake input (cmos.dat)

Lines 35-40 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/tokenCtl.cpp (+1 lines)
35	#include <string>	35	#include <string>
36	#include <iostream>	36	#include <iostream>
37	#include <iomanip>	37	#include <iomanip>
		38	#include <cstring>
38	#include <stdlib.h>	39	#include <stdlib.h>
39		40
40	#include "smbios/IToken.h"	41	#include "smbios/IToken.h"

Lines 20-25 Link Here

(-)libsmbios-0.13.6.orig/bin-supported/verifySmiPassword.cpp (+1 lines)
20	#include "smbios/compat.h"	20	#include "smbios/compat.h"
21		21
22	#include <iostream>	22	#include <iostream>
		23	#include <cstring>
23		24
24	#include "smbios/ISmi.h"	25	#include "smbios/ISmi.h"
25	#include "smbios/SystemInfo.h"	26	#include "smbios/SystemInfo.h"

Lines 20-25 Link Here

(-)libsmbios-0.13.6.orig/bin-unsupported/ascii2enUS_scancode.cpp (+1 lines)
20	#include "smbios/compat.h"	20	#include "smbios/compat.h"
21		21
22	#include <iostream>	22	#include <iostream>
		23	#include <cstring>
23		24
24	#include "smbios/ISmi.h"	25	#include "smbios/ISmi.h"
25	#include "smbios/version.h"	26	#include "smbios/version.h"

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/bin-unsupported/dellLEDCtl.cpp (+1 lines)
23	#include <string>	23	#include <string>
24	#include <iostream>	24	#include <iostream>
25	#include <iomanip>	25	#include <iomanip>
		26	#include <cstring>
26	#include <stdlib.h>	27	#include <stdlib.h>
27	#include <ctype.h>	28	#include <ctype.h>
28	//#define SHOW_STROBE_PERF	29	//#define SHOW_STROBE_PERF

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/bin-unsupported/smitest.cpp (+1 lines)
22	#include <string>	22	#include <string>
23	#include <iostream>	23	#include <iostream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25	#include <stdlib.h>	26	#include <stdlib.h>
26		27
27	#include "smbios/ISmi.h" // only needed if you want to use fake input (memdump.dat)	28	#include "smbios/ISmi.h" // only needed if you want to use fake input (memdump.dat)

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/include/smbios/ISmi.h (-1 / +2 lines)
23	#include "smbios/compat.h"	23	#include "smbios/compat.h"
24		24
25	#include <iostream>	25	#include <iostream>
		26	#include <memory>
26		27
27	// types.h should be first user-defined header.	28	// types.h should be first user-defined header.
28	#include "smbios/types.h"	29	#include "smbios/types.h"
Lines 55-61 Link Here
55	class SmiFactory : public virtual factory::IFactory	56	class SmiFactory : public virtual factory::IFactory
56	{	57	{
57	public:	58	public:
58	enum { RAW_SMI, DELL_CALLING_INTERFACE_SMI_RAW, DELL_CALLING_INTERFACE_SMI,};	59	enum { RAW_SMI, DELL_CALLING_INTERFACE_SMI_RAW, DELL_CALLING_INTERFACE_SMI };
59		60
60	static SmiFactory *getFactory();	61	static SmiFactory *getFactory();
61	virtual ~SmiFactory() throw();	62	virtual ~SmiFactory() throw();

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/libraries/common/SmbiosImpl.h (+1 lines)
23	#include "smbios/compat.h"	23	#include "smbios/compat.h"
24		24
25	#include <vector>	25	#include <vector>
		26	#include <memory>
26		27
27	#include "smbios/ISmbios.h"	28	#include "smbios/ISmbios.h"
28	#include "smbios/SmbiosLowLevel.h"	29	#include "smbios/SmbiosLowLevel.h"

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/common/TokenImpl.h (-1 / +2 lines)
22	#include "smbios/compat.h"	22	#include "smbios/compat.h"
23		23
24	#include <vector>	24	#include <vector>
		25	#include <memory>
25		26
26	// types.h should be first user-defined header.	27	// types.h should be first user-defined header.
27	#include "smbios/types.h"	28	#include "smbios/types.h"
Lines 246-252 Link Here
246	CHECK_TYPE_WORD_CHECKSUM = 0x00, //simple running sum in word	247	CHECK_TYPE_WORD_CHECKSUM = 0x00, //simple running sum in word
247	CHECK_TYPE_BYTE_CHECKSUM = 0x01, //simple running sum in byte	248	CHECK_TYPE_BYTE_CHECKSUM = 0x01, //simple running sum in byte
248	CHECK_TYPE_WORD_CRC = 0x02, // crc	249	CHECK_TYPE_WORD_CRC = 0x02, // crc
249	CHECK_TYPE_WORD_CHECKSUM_N = 0x03, //simple runnign sum in word, then (~result + 1)	250	CHECK_TYPE_WORD_CHECKSUM_N = 0x03 //simple runnign sum in word, then (~result + 1)
250	};	251	};
251		252
252		253




        DellIndexedIoTokenType = 0xD4,
        DellProtectedAreaType1 = 0xD5,
        DellProtectedAreaType2 = 0xD6,
        DellCallingInterface   = 0xDA
    };

    enum // Token types
    {
        TokenTypeEOT = 0xffff
    };

    struct indexed_io_token

        pvFmtAlphaNumericScanCode = 0,
        pvFmtAlphaNumericAscii    = 1,
        pvFmtAlphaNumericScanCodeNS = 2,
        pvFmtAlphaNumericAsciiNS   = 3
    };



Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/memory/Memory.cpp (+1 lines)
22		22
23	#include <errno.h>	23	#include <errno.h>
24	#include <stdio.h>	24	#include <stdio.h>
		25	#include <cstring>
25		26
26	#include "MemoryImpl.h"	27	#include "MemoryImpl.h"
27		28

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/libraries/memory/Memory_Linux.cpp (+1 lines)
23	#include <errno.h>	23	#include <errno.h>
24	#include <sys/mman.h> /* mmap */	24	#include <sys/mman.h> /* mmap */
25	#include <unistd.h> /* getpagesize */	25	#include <unistd.h> /* getpagesize */
		26	#include <cstring> /* strerror */
26		27
27	#include "MemoryImpl.h"	28	#include "MemoryImpl.h"
28		29

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smbios/SmbiosItem.cpp (+2 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <iomanip>	23	#include <iomanip>
		24	#include <memory>
		25	#include <cstring>
24		26
25	#include "SmbiosImpl.h"	27	#include "SmbiosImpl.h"
26	// message.h should be included last.	28	// message.h should be included last.

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy.cpp (+2 lines)
22		22
23	#include <sstream>	23	#include <sstream>
24		24
		25	#include <cstring>
		26
25	#include "smbios/IMemory.h"	27	#include "smbios/IMemory.h"
26	#include "SmbiosImpl.h"	28	#include "SmbiosImpl.h"
27		29

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy_Linux.cpp (+1 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
24		25
25	#include "smbios/IMemory.h"	26	#include "smbios/IMemory.h"
26	#include "SmbiosImpl.h"	27	#include "SmbiosImpl.h"

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smbios/SmbiosTable.cpp (+2 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <sstream>	23	#include <sstream>
		24	#include <memory>
		25	#include <cstring>
24		26
25	#include "SmbiosImpl.h"	27	#include "SmbiosImpl.h"
26		28

Lines 23-28 Link Here

(-)libsmbios-0.13.6.orig/libraries/smbios/SmbiosWorkaround.cpp (+2 lines)
23		23
24	#include "StdWorkarounds.h"	24	#include "StdWorkarounds.h"
25		25
		26	#include <cstring>
		27
26	// message.h should be included last.	28	// message.h should be included last.
27	#include "smbios/message.h"	29	#include "smbios/message.h"
28		30

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smi/Smi.cpp (+2 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	//#include <iostream>	23	//#include <iostream>
		24	#include <memory>
		25	#include <cstring>
24		26
25	#include "SmiImpl.h"	27	#include "SmiImpl.h"
26	#include "smbios/ISmbios.h"	28	#include "smbios/ISmbios.h"

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smi/SmiFactory.cpp (+2 lines)
21	#include "FactoryImpl2.h"	21	#include "FactoryImpl2.h"
22	#include "TokenImpl.h"	22	#include "TokenImpl.h"
23		23
		24	#include <memory>
		25
24	// message.h should be included last.	26	// message.h should be included last.
25	#include "smbios/message.h"	27	#include "smbios/message.h"
26		28

Lines 18-23 Link Here

(-)libsmbios-0.13.6.orig/libraries/smi/SmiImpl.h (+2 lines)
18	#ifndef SMIIMPL_H	18	#ifndef SMIIMPL_H
19	#define SMIIMPL_H	19	#define SMIIMPL_H
20		20
		21	#include <memory>
		22
21	#include "smbios/ISmi.h"	23	#include "smbios/ISmi.h"
22	#include "SmiLowLevel.h"	24	#include "SmiLowLevel.h"
23	#include "ExceptionImpl.h"	25	#include "ExceptionImpl.h"

Lines 81-87 Link Here

(-)libsmbios-0.13.6.orig/libraries/smi/SmiLowLevel.h (-1 / +1 lines)
81	enum	81	enum
82	{	82	{
83	class_user_password = 9,	83	class_user_password = 9,
84	class_admin_password = 10,	84	class_admin_password = 10
85	};	85	};
86		86
87		87

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/smi/Smi_Linux.cpp (+1 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <sys/file.h>	23	#include <sys/file.h>
		24	#include <cstring>
24		25
25	#include "SmiImpl.h"	26	#include "SmiImpl.h"
26		27

Lines 28-33 Link Here

(-)libsmbios-0.13.6.orig/libraries/systeminfo/IdByte.cpp (+2 lines)
28	#include "SystemDetect.h"	28	#include "SystemDetect.h"
29	#include "DellMagic.h"	29	#include "DellMagic.h"
30		30
		31	#include <cstring>
		32
31	// should always be included last.	33	// should always be included last.
32	#include "smbios/message.h"	34	#include "smbios/message.h"
33		35

Lines 31-36 Link Here

(-)libsmbios-0.13.6.orig/libraries/systeminfo/System.cpp (+2 lines)
31		31
32	#include "smbios/version.h"	32	#include "smbios/version.h"
33		33
		34	#include <cstring>
		35
34	// this always should be included last	36	// this always should be included last
35	#include "smbios/message.h"	37	#include "smbios/message.h"
36		38

Lines 30-35 Link Here

(-)libsmbios-0.13.6.orig/libraries/systeminfo/SystemDetect.cpp (+2 lines)
30	// all our magic numbers	30	// all our magic numbers
31	#include "DellMagic.h"	31	#include "DellMagic.h"
32		32
		33	#include <cstring>
		34
33	// include this last.	35	// include this last.
34	#include "smbios/message.h"	36	#include "smbios/message.h"
35		37

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/token/TokenD4.cpp (+1 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <iomanip>	23	#include <iomanip>
		24	#include <cstring>
24		25
25	#include "TokenImpl.h"	26	#include "TokenImpl.h"
26		27

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/token/TokenD5.cpp (+1 lines)
22		22
23	#include <sstream>	23	#include <sstream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25		26
26	#include "TokenImpl.h"	27	#include "TokenImpl.h"
27		28

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/token/TokenD6.cpp (+1 lines)
22		22
23	#include <sstream>	23	#include <sstream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25		26
26	#include "TokenImpl.h"	27	#include "TokenImpl.h"
27		28

Lines 21-26 Link Here

(-)libsmbios-0.13.6.orig/libraries/token/TokenDA.cpp (+2 lines)
21	#include "smbios/compat.h"	21	#include "smbios/compat.h"
22		22
23	#include <iomanip>	23	#include <iomanip>
		24	#include <memory>
		25	#include <cstring>
24		26
25	#include "TokenImpl.h"	27	#include "TokenImpl.h"
26		28

Lines 22-27 Link Here

(-)libsmbios-0.13.6.orig/libraries/xml_libxml2/SmbiosXml.cpp (+1 lines)
22		22
23	#include <sstream>	23	#include <sstream>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25		26
26	#include "SmbiosXmlImpl.h"	27	#include "SmbiosXmlImpl.h"
27	#include "StdSmbiosXml.h"	28	#include "StdSmbiosXml.h"

Return to bug 228815

Lines 37-48 Link Here

(-)libsmbios-0.13.6.orig/libraries/common/TokenLowLevel.h (-3 / +3 lines)
37	DellIndexedIoTokenType = 0xD4,	37	DellIndexedIoTokenType = 0xD4,
38	DellProtectedAreaType1 = 0xD5,	38	DellProtectedAreaType1 = 0xD5,
39	DellProtectedAreaType2 = 0xD6,	39	DellProtectedAreaType2 = 0xD6,
40	DellCallingInterface = 0xDA,	40	DellCallingInterface = 0xDA
41	};	41	};
42		42
43	enum // Token types	43	enum // Token types
44	{	44	{
45	TokenTypeEOT = 0xffff,	45	TokenTypeEOT = 0xffff
46	};	46	};
47		47
48	struct indexed_io_token	48	struct indexed_io_token
Lines 147-153 Link Here
147	pvFmtAlphaNumericScanCode = 0,	147	pvFmtAlphaNumericScanCode = 0,
148	pvFmtAlphaNumericAscii = 1,	148	pvFmtAlphaNumericAscii = 1,
149	pvFmtAlphaNumericScanCodeNS = 2,	149	pvFmtAlphaNumericScanCodeNS = 2,
150	pvFmtAlphaNumericAsciiNS = 3,	150	pvFmtAlphaNumericAsciiNS = 3
151	};	151	};
152		152
153		153