24a25 > #define DEBUG 100c101,102 < --- > //if ( mchSess == 0 ) > //cantProceed("empty mchsess?\n"); 103a106,110 > //printf("getchanauth response:\n"); > //for ( i = 0; i < 100; i++ ) > //printf("0x%02x ", response[i]); > //printf("\n"); > 107a115,118 > //printf("getsesschall response:\n"); > //for ( i = 0; i < 100; i++ ) > //printf("0x%02x ", response[i]); > //printf("\n"); 108a120 > //printf("temporary session id, offset %i:\n", IPMI_RPLY_IMSG2_GET_SESS_TEMP_ID_OFFSET); 110c122 < for ( i = 0; i < IPMI_RPLY_IMSG2_SESSION_ID_LENGTH ; i++) --- > for ( i = 0; i < IPMI_RPLY_IMSG2_SESSION_ID_LENGTH ; i++) { 112c124,126 < --- > //printf("0x%02x ", ipmiSess->id[i]); > } > //printf("\n"); 119a134,135 > //printf("made it past act sess; session id:\n"); > 121c137 < for ( i = 0; i < IPMI_RPLY_IMSG2_SESSION_ID_LENGTH ; i++) --- > for ( i = 0; i < IPMI_RPLY_IMSG2_SESSION_ID_LENGTH ; i++) { 123a140,141 > } > //printf("\n"); 128c146 < /* Need a non-hard-coded way to determine privelige level */ --- > /* Need a non-hard-coded way to determine privelige level */ 131a150 > //printf("made it past set priv\n"); 135,136c154,155 < mchMsgCloseSess( mchSess, ipmiSess, response ); < return -1; --- > mchMsgCloseSess( mchSess, ipmiSess, response ); > return -1; 446c465 < if ( MCH_DBG( mchStat[inst] ) ) --- > // if ( MCH_DBG( mchStat[inst] ) ) 884c903 < printf("%s mchGetSensorReadingStat: sensor %i reading/state unavailable or scanning disabled. Bits: %02x\n", mchData->mchSess->name, number, bits); --- > printf("sensor %i reading/state unavailable or scanning disabled. Bits: %02x\n", number, bits); 1296,1298c1315,1316 < < if ( mchMsgBroadcastGetDeviceId( mchData, response, 0, 0 ) ) { < printf("mchIdentify: Error from Broadcast Get Device ID command\n"); --- > if ( mchMsgBroadcastGetDeviceId( mchData, response, 0, 0 ) ) { > printf("mchIdentify: Error from Broadcast Get Device ID command\n"); 1300,1301c1318,1319 < return -1; < } --- > return -1; > } 1337c1355 < mchSess->type = MCH_TYPE_SUPERMICRO; // Was previously DELL; need to figure this out --- > mchSess->type = MCH_TYPE_SUPERMICRO; 1341,1346c1359,1364 < case MCH_MANUF_ID_ATCA: < mchSess->type = MCH_TYPE_SUPERMICRO; < printf("Identified %s to be ATCA. IPMI version %i.%i\n", mchSess->name, IPMI_VER_MSD( vers \ < ), IPMI_VER_LSD( vers )); < printf("******Figure out actual vendor\n"); < break; --- > case MCH_MANUF_ID_ATCA: > mchSess->type = MCH_TYPE_SUPERMICRO; > printf("Identified %s to be ATCA. IPMI version %i.%i\n", mchSess->name, IPMI_VER_MSD( vers ), IPMI_VER_LSD( vers )); > printf("******Figure out actual vendor\n"); > break; > 1358c1376 < int j, id, mgmtId; --- > int i, j, id, mgmtId; 1414,1415c1432 < #ifdef DEBUG < int i; --- > //#ifdef DEBUG 1434a1452,1544 > //#endif > } > > static void > mchSensorFruGetInstanceOld(int type, MchSys mchSys) > { > int s = mchSys->sensCount; > uint8_t sensTypeInst[MAX_FRU_MGMT][MAX_SENSOR_TYPE] = { { 0 } }; /* Counts of sensor type per ID instance */ > int i, j, id, mgmtId; > Fru fru = 0; > Mgmt mgmt = 0; > Sensor sens; > uint8_t mgmtEntId, mgmtEntInst; > > /* Find FRU or management controller associated with this sensor, assign sensor an instance based on type */ > for ( j = 0; j < s; j++ ) { > > sens = &mchSys->sens[j]; > > /* Start at 1 for MicroTCA because FRU 0 is reserved logical entity with same entityId and entityInst as MCH 1 */ > for ( i = 0; i < MAX_FRU_MGMT; i++ ) { > > if ( (i == 0) && MCH_IS_MICROTCA( type ) ) { > } > else { > if ( i < MAX_FRU ) { > fru = &mchSys->fru[i]; > id = fru->sdr.fruId; > > if ( mchSys->fru[sens->fruId].sdr.fruId == id ) { > > /* If a real entity */ > if ( fru->sdr.recType ) { > sens->instance = ++sensTypeInst[id][sens->sdr.sensType]; > if ( sens->instance > MAX_SENS_INST ) { > printf("WARNING: FRU %i sensor type 0x%02x instance %i exceeds allowed instance %i\n", i, sens->sdr.sensType, sens->instance, MAX_SENS_INST); > break; > } > mchSys->sensLkup[id][sens->sdr.sensType][sens->instance] = j; > break; > } > } > else > printf("id %i does not match %i\n", id, mchSys->fru[sens->fruId].sdr.fruId); > } > else { > id = i; > mgmtId = i - MAX_FRU; > mgmt = &mchSys->mgmt[mgmtId]; > mgmtEntId = mgmt->sdr.entityId; > mgmtEntInst = mgmt->sdr.entityInst; > > if ( mchSys->sens->mgmtIndex == mgmtId ) { > > /* If a real entity */ > if ( mgmt->sdr.recType ) { > sens->instance = ++sensTypeInst[id][sens->sdr.sensType]; > if ( sens->instance > MAX_SENS_INST ) { > printf("WARNING: FRU %i sensor type 0x%02x instance %i exceeds allowed instance %i\n", i, sens->sdr.sensType, sens->instance, MAX_SENS_INST); > break; > } > mchSys->sensLkup[id][sens->sdr.sensType][sens->instance] = j; > break; > } > } > else > printf("mgmt id %i does not match %i %i\n", mgmtId, mchSys->sens->mgmtIndex, mgmtId); > > } > } > } > } > > #ifdef DEBUG > printf("mchSensorFruGetInstance:\n"); > for ( i = 0; i < mchSys->sensCount; i++ ) { > sens = &mchSys->sens[i]; > if ( sens->fruId!= -1 ) { > fru = &mchSys->fru[sens->fruId]; > printf("FRU sensor %s %i, type 0x%02x, inst %i, FRU entId 0x%02x, entInst 0x%02x, sens entId 0x%02x entInst 0x%02x recType %i\n", > sens->sdr.str, sens->sdr.number, sens->sdr.sensType, sens->instance, fru->sdr.entityId, fru->sdr.entityInst, > sens->sdr.entityId, sens->sdr.entityInst, sens->sdr.recType); > } > else if ( sens->mgmtIndex != -1 ) { > mgmt = &mchSys->mgmt[sens->mgmtIndex]; > printf("Mgmt sensor %s %i, type 0x%02x, inst %i, MGMT entId 0x%02x, entInst 0x%02x, sens entId 0x%02x entInst 0x%02x recType %i\n", > sens->sdr.str, sens->sdr.number, sens->sdr.sensType, sens->instance, mgmt->sdr.entityId, mgmt->sdr.entityInst, > sens->sdr.entityId, sens->sdr.entityInst, sens->sdr.recType); > } > else > printf("Sensor %s %i, type 0x%02x, inst %i, entId 0x%02x entInst 0x%02x recType %i, no corresponding FRU or MGTM\n", > sens->sdr.str, sens->sdr.number, sens->sdr.sensType, sens->instance, sens->sdr.entityId, sens->sdr.entityInst, sens->sdr.recType); > } 1454,1456d1563 < /* Turn on debug messages during initial messages with device */ < mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_HIGH) );//temporary high < 1469,1471d1575 < /* Turn off debug messages after initial messages with device */ < mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_OFF) ); < 1492a1597,1599 > // remove after testing > mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_OFF) ); > 1496a1604,1606 > // remove after testing > mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_OFF) ); > 1565a1676,1679 > /* Turn on debug messages during initial messages with device */ > // mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_LOW) ); > mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_MED) ); > 1579a1694,1696 > > // uncomment after testing > // mchStatSet( inst, MCH_MASK_DBG, MCH_DBG_SET(MCH_DBG_OFF) );