Chameleon

Chameleon Commit Details

Date:2011-06-15 02:43:54 (8 years 8 months ago)
Author:Azimutz
Commit:1020
Parents: 1019
Message:Merge trunk (r1018/r1019).
Changes:
M/branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/spd.c
M/branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.h
M/branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c
M/branches/azimutz/trunkAutoResolution
M/branches/azimutz/trunkAutoResolution/i386/libsaio/spd.c
M/branches/azimutz/trunkAutoResolution/i386/libsaio/platform.h
M/branches/azimutz/trunkAutoResolution/i386/libsaio/smbios_getters.c
M/branches/azimutz/trunkGraphicsEnablerModules

File differences

branches/azimutz/trunkAutoResolution/i386/libsaio/spd.c
342342
343343
344344
345
345346
346
347
348
349
350
351347
352348
353349
354350
355
356
351
352
357353
354
355
358356
359357
360358
slot->Vendor,
slot->PartNo,
slot->SerialNo);
#if DEBUG_SPD
//Azi: this was gone with mem.c... remove??
dumpPhysAddr("spd content: ", slot->spd, spd_size);
getchar();
#endif
}
// laptops sometimes show slot 0 and 2 with slot 1 empty when only 2 slots are presents so:
Platform.DMI.DIMM[i]=
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.CntMemorySlots == 2 ?
mapping[i] : i; // for laptops case, mapping setup would need to be more generic than this
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.CntMemorySlots == 2 ?
mapping[i] : i; // for laptops case, mapping setup would need to be more generic than this
slot->spd = NULL;
} // for
branches/azimutz/trunkAutoResolution/i386/libsaio/platform.h
141141
142142
143143
144
144
145145
146146
147147
} RAM;
struct DMI {
intMaxMemorySlots;// number of memory slots polulated by SMBIOS
intMaxMemorySlots;// number of memory slots populated by SMBIOS
intCntMemorySlots;// number of memory slots counted
intMemoryModules;// number of memory modules installed
intDIMM[MAX_RAM_SLOTS];// Information and SPD mapping for each slot
branches/azimutz/trunkAutoResolution/i386/libsaio/smbios_getters.c
258258
259259
260260
261
262
263
261264
262265
263266
intmap;
idx++;
DBG("getSMBMemoryDeviceSerialNumber index: %d, MAX_RAM_SLOTS: %d\n",idx,MAX_RAM_SLOTS);
if (idx < MAX_RAM_SLOTS)
{
map = Platform.DMI.DIMM[idx];
branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/spd.c
342342
343343
344344
345
345346
346
347
348
349
350
351347
352348
353349
354350
355
356
351
352
357353
354
355
358356
359357
360358
slot->Vendor,
slot->PartNo,
slot->SerialNo);
#if DEBUG_SPD
//Azi: this was gone with mem.c... remove??
dumpPhysAddr("spd content: ", slot->spd, spd_size);
getchar();
#endif
}
// laptops sometimes show slot 0 and 2 with slot 1 empty when only 2 slots are presents so:
Platform.DMI.DIMM[i]=
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.CntMemorySlots == 2 ?
mapping[i] : i; // for laptops case, mapping setup would need to be more generic than this
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.CntMemorySlots == 2 ?
mapping[i] : i; // for laptops case, mapping setup would need to be more generic than this
slot->spd = NULL;
} // for
branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.h
141141
142142
143143
144
144
145145
146146
147147
} RAM;
struct DMI {
intMaxMemorySlots;// number of memory slots polulated by SMBIOS
intMaxMemorySlots;// number of memory slots populated by SMBIOS
intCntMemorySlots;// number of memory slots counted
intMemoryModules;// number of memory modules installed
intDIMM[MAX_RAM_SLOTS];// Information and SPD mapping for each slot
branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c
258258
259259
260260
261
262
263
261264
262265
263266
intmap;
idx++;
DBG("getSMBMemoryDeviceSerialNumber index: %d, MAX_RAM_SLOTS: %d\n",idx,MAX_RAM_SLOTS);
if (idx < MAX_RAM_SLOTS)
{
map = Platform.DMI.DIMM[idx];

Archive Download the corresponding diff file

Revision: 1020