Skip to content

show design pattern for removing OFFSET defines - not ready for merge! #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LaVillaStargato wants to merge 1 commit into
base: main
Choose a base branch
from
Open

show design pattern for removing OFFSET defines - not ready for merge! #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions src/drvMch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,12 +1199,13 @@ mchSdrSensDuplicate(MchSys mchSys, uint8_t *raw)
int i;
SdrFullRec tmp;
SensorRec sens;
sdr_fru_marshall_t *sdr_fru = (sdr_fru_marshall_t *) raw;

tmp.owner = raw[SDR_OWNER_OFFSET];
tmp.lun = raw[SDR_LUN_OFFSET];
tmp.number = raw[SDR_NUMBER_OFFSET];
tmp.entityId = raw[SDR_ENTITY_ID_OFFSET];
tmp.entityInst = raw[SDR_ENTITY_INST_OFFSET];
tmp.owner = sdr_fru->owner;
tmp.lun = sdr_fru->lun;
tmp.number = sdr_fru->number;
tmp.entityId = sdr_fru->entityId;
tmp.entityInst = sdr_fru->entityInst;

for ( i = 0; i < mchSys->sensCount; i++ ) {

Expand Down Expand Up @@ -1261,22 +1262,23 @@ int m = 0, b = 0;

/* Full Sensor fields */
if ( type == SDR_TYPE_FULL_SENSOR ) {

sdr->units1 = raw[SDR_UNITS1_OFFSET];
sdr->units2 = raw[SDR_UNITS2_OFFSET];
sdr->units3 = raw[SDR_UNITS3_OFFSET];
sdr->linear = raw[SDR_LINEAR_OFFSET];
sdr->M = raw[SDR_M_OFFSET];
sdr->MTol = raw[SDR_M_TOL_OFFSET];
sdr->B = raw[SDR_B_OFFSET];
sdr->BAcc = raw[SDR_B_ACC_OFFSET];
sdr->acc = raw[SDR_ACC_OFFSET];
sdr->RexpBexp = raw[SDR_EXP_OFFSET];
sdr->anlgChar = raw[SDR_ANLG_CHAR_OFFSET];
sdr->nominal = raw[SDR_NOMINAL_OFFSET];
sdr->normMax = raw[SDR_NORM_MAX_OFFSET];
sdr->normMin = raw[SDR_NORM_MIN_OFFSET];
sdr->strLength = raw[SDR_STR_LENGTH_OFFSET];
sdr_fru_marshall_t *sdr_fru = (sdr_fru_marshall_t *) raw;

sdr->units1 = sdr_fru->units1;
sdr->units2 = sdr_fru->units2;
sdr->units3 = sdr_fru->units3;
sdr->linear = sdr_fru->linear;
sdr->M = sdr_fru->M;
sdr->MTol = sdr_fru->MTol;
sdr->B = sdr_fru->B;
sdr->BAcc = sdr_fru->BAcc;
sdr->acc = sdr_fru->acc;
sdr->RexpBexp = sdr_fru->RexpBexp;
sdr->anlgChar = sdr_fru->anlgChar;
sdr->nominal = sdr_fru->nominal;
sdr->normMax = sdr_fru->normMax;
sdr->normMin = sdr_fru->normMin;
sdr->strLength = sdr_fru->strLength;

m = SENSOR_CONV_M_B( sdr->M, sdr->MTol );
b = SENSOR_CONV_M_B( sdr->B, sdr->BAcc );
Expand All @@ -1290,7 +1292,7 @@ int m = 0, b = 0;
l = IPMI_DATA_LENGTH( sdr->strLength );
for ( i = 0; i < l; i++ )
sdr->str[i] = raw[SDR_STR_OFFSET + i];
sdr->str[i+1] = '\0';
sdr->str[i+1] = '\0';
}

#ifdef DEBUG
Expand Down
33 changes: 33 additions & 0 deletions src/ipmiDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,39 @@ extern size_t IPMI_MSG1_LENGTH;
#define SDR_REC_TYPE_OFFSET 3
#define SDR_LENGTH_OFFSET 4

typedef struct __attribute__ ((packed)) {
uint8_t unknown1[5];
uint8_t owner;
uint8_t lun;
uint8_t number;
uint8_t entityId;
uint8_t entityInst;
uint8_t init;
uint8_t capOffset;
uint8_t sensType;
uint8_t readType;
uint16_t assertMask;
uint16_t deassertMaxK;
uint16_t readMask;
uint8_t units1;
uint8_t units2;
uint8_t units3;
uint8_t linear;
uint8_t M;
uint8_t MTol;
uint8_t B;
uint8_t BAcc;
uint8_t acc;
uint8_t RexpBexp;
uint8_t anlgChar;
uint8_t nominal;
uint8_t normMax;
uint8_t normMin;
uint8_t strLength;
uint8_t str;
} sdr_fru_marshall_t;


/* SDR Full Sensor contents */
#define SDR_OWNER_OFFSET 5 /* SDR Key Fields */
#define SDR_LUN_OFFSET 6
Expand Down