|
@@ -40,9 +40,9 @@ const MgmtCtrlrDevLocator_T bmc_sdr = {
|
|
|
|
|
|
const FullSensorRec_T full_sdr_tbl[] = {
|
|
|
/*
|
|
|
- * sensor number: 0
|
|
|
- * sensor name: LM73
|
|
|
- * brief: temporary
|
|
|
+ * sensor number: 1
|
|
|
+ * sensor name: +12V
|
|
|
+ * brief: ltc4280
|
|
|
*/
|
|
|
{
|
|
|
/* SDR Record Header */
|
|
@@ -61,46 +61,87 @@ const FullSensorRec_T full_sdr_tbl[] = {
|
|
|
0x1, //Entity Instance
|
|
|
0x7f, //Entity Initialization
|
|
|
0x68, //Sensor Capabilities
|
|
|
- 0x01, //Sensor Type
|
|
|
+ 0x02, //Sensor Type: 01-temperature, 02-voltage, 03-current, 04-fan
|
|
|
0x01, //Event / Reading Type
|
|
|
0x7a95, //Lower Threshold Reading Mask
|
|
|
0x7a95, //Upper Threshold Reading Mask
|
|
|
0x3f3f, //Settable / Readable Threshold Mask
|
|
|
- (0x2<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1
|
|
|
- 0x1, //Sensor Units 2 - Base Unit
|
|
|
+
|
|
|
+ /*
|
|
|
+ [7:6] - Analog (numeric) Data Format**
|
|
|
+ 00b = unsigned
|
|
|
+ 01b = 1's complement(singed)
|
|
|
+ 10b = 2's complement(singed)
|
|
|
+ 11b = Does not return analog (numeric) reading
|
|
|
+ [5:3] - Rate unit
|
|
|
+ 000b = none
|
|
|
+ 001b = per µS
|
|
|
+ 010b = per ms
|
|
|
+ 011b = per s
|
|
|
+ 100b = per minute
|
|
|
+ 101b = per hour
|
|
|
+ 110b = per day
|
|
|
+ 111b = reserved
|
|
|
+ [2:1] - Modifier unit
|
|
|
+ 00b = none
|
|
|
+ 01b = Basic Unit / Modifier Unit
|
|
|
+ 10b = Basic Unit * Modifier Unit
|
|
|
+ 11b = reserved
|
|
|
+ [0] - Percentage 0b = no, 1b = yes
|
|
|
+ */
|
|
|
+ (0x0<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1
|
|
|
+ /*
|
|
|
+ 0 unspecified
|
|
|
+ 1 degrees C
|
|
|
+ 2 degrees F
|
|
|
+ 3 degrees K
|
|
|
+ 4 Volts
|
|
|
+ 5 Amps
|
|
|
+ */
|
|
|
+ 0x4, //Sensor Units 2 - Base Unit
|
|
|
0x0, //Sensor Units 3 - Modifier Unit
|
|
|
0x0, //Linerization
|
|
|
- 0x2, //M
|
|
|
- ((0x2>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
- 0x0, //B
|
|
|
+ /* M = 0x12e x 10^-4 */
|
|
|
+ 0x3d, //M_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - M: MS 2 bits
|
|
|
+ [5:0] - Tolerance: 6 bits, unsigned (Tolerance in +/- ½ raw counts)
|
|
|
+ */
|
|
|
+ ((0x0>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
+ 0x0, //B_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - B: MS 2 bits
|
|
|
+ Unsigned, 10-bit Basic Sensor Accuracy in 1/100 percent scaled up by unsigned
|
|
|
+ Accuracy exponent:
|
|
|
+ [5:0] - Accuracy: LS 6 bits
|
|
|
+ */
|
|
|
((0x0>>2)&0xC0)+(0x0&0x3F), //B,Accuracy
|
|
|
((0x0>>2)&0xF0)+(0x0&0x0C)+0x0, //Accuracy,Accuracy exponent
|
|
|
- (0x0<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
|
+ (0xfd<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
|
0x0, //Analog Characteristics Flags
|
|
|
0x7f, //Nominal Reading
|
|
|
- 0x7f, //Normal Maximum
|
|
|
- 0x80, //Normal Minimum
|
|
|
- 0x7f, //Sensor Maximum Reading
|
|
|
- 0x80, //Sensor Minimum Reading
|
|
|
- 0x7f, //Upper Non-Recoverable Threshold
|
|
|
- 0x7f, //Upper Critical Threshold
|
|
|
- 0x7f, //Upper Non-Critical Threshold
|
|
|
- 0x80, //Lower Non-Recoverable Threshold
|
|
|
- 0x80, //Lower Critical Threshold
|
|
|
- 0x80, //Lower Non-Critical threshold
|
|
|
+ 0xff, //Normal Maximum
|
|
|
+ 0x00, //Normal Minimum
|
|
|
+ 0xff, //Sensor Maximum Reading
|
|
|
+ 0x00, //Sensor Minimum Reading
|
|
|
+ 0xff, //Upper Non-Recoverable Threshold
|
|
|
+ 0xff, //Upper Critical Threshold
|
|
|
+ 0xff, //Upper Non-Critical Threshold
|
|
|
+ 0x00, //Lower Non-Recoverable Threshold
|
|
|
+ 0x00, //Lower Critical Threshold
|
|
|
+ 0x00, //Lower Non-Critical threshold
|
|
|
0x0, //Positive - threshold Hysteresis value
|
|
|
0x0, //Negative - threshold Hysteresis value
|
|
|
0x0, //Reserved
|
|
|
0x0, //Reserved
|
|
|
0x0, //OEM
|
|
|
0xC0+MAX_ID_STR_LEN, //ID String Type / Length Code
|
|
|
- "temp_board"
|
|
|
+ "+12V"
|
|
|
},
|
|
|
-
|
|
|
/*
|
|
|
- * sensor number: 1
|
|
|
- * sensor name: LM73
|
|
|
- * brief: temporary
|
|
|
+ * sensor number: 2
|
|
|
+ * sensor name: +12V_Current
|
|
|
+ * brief: ltc4280
|
|
|
*/
|
|
|
{
|
|
|
/* SDR Record Header */
|
|
@@ -113,24 +154,165 @@ const FullSensorRec_T full_sdr_tbl[] = {
|
|
|
/* Record Key Bytes */
|
|
|
0x20, //Sensor Owner ID
|
|
|
0x0, //Sensor Owner LUN
|
|
|
- 0x06, //Sensor Number
|
|
|
+ 0x02, //Sensor Number
|
|
|
/* Record Body Bytes */
|
|
|
0x7, //Entity ID
|
|
|
- 0x2, //Entity Instance
|
|
|
+ 0x1, //Entity Instance
|
|
|
0x7f, //Entity Initialization
|
|
|
0x68, //Sensor Capabilities
|
|
|
- 0x01, //Sensor Type
|
|
|
+ 0x02, //Sensor Type: 01-temperature, 02-voltage, 03-current, 04-fan
|
|
|
0x01, //Event / Reading Type
|
|
|
0x7a95, //Lower Threshold Reading Mask
|
|
|
0x7a95, //Upper Threshold Reading Mask
|
|
|
0x3f3f, //Settable / Readable Threshold Mask
|
|
|
+
|
|
|
+ /*
|
|
|
+ [7:6] - Analog (numeric) Data Format**
|
|
|
+ 00b = unsigned
|
|
|
+ 01b = 1's complement(singed)
|
|
|
+ 10b = 2's complement(singed)
|
|
|
+ 11b = Does not return analog (numeric) reading
|
|
|
+ [5:3] - Rate unit
|
|
|
+ 000b = none
|
|
|
+ 001b = per µS
|
|
|
+ 010b = per ms
|
|
|
+ 011b = per s
|
|
|
+ 100b = per minute
|
|
|
+ 101b = per hour
|
|
|
+ 110b = per day
|
|
|
+ 111b = reserved
|
|
|
+ [2:1] - Modifier unit
|
|
|
+ 00b = none
|
|
|
+ 01b = Basic Unit / Modifier Unit
|
|
|
+ 10b = Basic Unit * Modifier Unit
|
|
|
+ 11b = reserved
|
|
|
+ [0] - Percentage 0b = no, 1b = yes
|
|
|
+ */
|
|
|
+ (0x0<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1
|
|
|
+ /*
|
|
|
+ 0 unspecified
|
|
|
+ 1 degrees C
|
|
|
+ 2 degrees F
|
|
|
+ 3 degrees K
|
|
|
+ 4 Volts
|
|
|
+ 5 Amps
|
|
|
+ */
|
|
|
+ 0x5, //Sensor Units 2 - Base Unit
|
|
|
+ 0x0, //Sensor Units 3 - Modifier Unit
|
|
|
+ 0x0, //Linerization
|
|
|
+ /* M = 0x12e x 10^-4 */
|
|
|
+ 0x2e, //M_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - M: MS 2 bits
|
|
|
+ [5:0] - Tolerance: 6 bits, unsigned (Tolerance in +/- ½ raw counts)
|
|
|
+ */
|
|
|
+ ((0x12e>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
+ 0x0, //B_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - B: MS 2 bits
|
|
|
+ Unsigned, 10-bit Basic Sensor Accuracy in 1/100 percent scaled up by unsigned
|
|
|
+ Accuracy exponent:
|
|
|
+ [5:0] - Accuracy: LS 6 bits
|
|
|
+ */
|
|
|
+ ((0x0>>2)&0xC0)+(0x0&0x3F), //B,Accuracy
|
|
|
+ ((0x0>>2)&0xF0)+(0x0&0x0C)+0x0, //Accuracy,Accuracy exponent
|
|
|
+ (0xfc<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
|
+ 0x0, //Analog Characteristics Flags
|
|
|
+ 0x7f, //Nominal Reading
|
|
|
+ 0xff, //Normal Maximum
|
|
|
+ 0x00, //Normal Minimum
|
|
|
+ 0xff, //Sensor Maximum Reading
|
|
|
+ 0x00, //Sensor Minimum Reading
|
|
|
+ 0xff, //Upper Non-Recoverable Threshold
|
|
|
+ 0xff, //Upper Critical Threshold
|
|
|
+ 0xff, //Upper Non-Critical Threshold
|
|
|
+ 0x00, //Lower Non-Recoverable Threshold
|
|
|
+ 0x00, //Lower Critical Threshold
|
|
|
+ 0x00, //Lower Non-Critical threshold
|
|
|
+ 0x0, //Positive - threshold Hysteresis value
|
|
|
+ 0x0, //Negative - threshold Hysteresis value
|
|
|
+ 0x0, //Reserved
|
|
|
+ 0x0, //Reserved
|
|
|
+ 0x0, //OEM
|
|
|
+ 0xC0+MAX_ID_STR_LEN, //ID String Type / Length Code
|
|
|
+ "+12V_Current"
|
|
|
+ },
|
|
|
+
|
|
|
+/*
|
|
|
+ * sensor number: 3
|
|
|
+ * sensor name: Temp_Board
|
|
|
+ * brief: G780 local
|
|
|
+ */
|
|
|
+ {
|
|
|
+ /* SDR Record Header */
|
|
|
+ {
|
|
|
+ 0x04, //Record ID
|
|
|
+ 0x51, //SDR Version
|
|
|
+ FULL_SDR_REC, //Record Type
|
|
|
+ 43+MAX_ID_STR_LEN, //Record Length = 43+string length
|
|
|
+ },
|
|
|
+ /* Record Key Bytes */
|
|
|
+ 0x20, //Sensor Owner ID
|
|
|
+ 0x0, //Sensor Owner LUN
|
|
|
+ 0x03, //Sensor Number
|
|
|
+ /* Record Body Bytes */
|
|
|
+ 0x7, //Entity ID
|
|
|
+ 0x1, //Entity Instance
|
|
|
+ 0x7f, //Entity Initialization
|
|
|
+ 0x68, //Sensor Capabilities
|
|
|
+ 0x01, //Sensor Type: 01-temperature, 02-voltage, 03-current, 04-fan
|
|
|
+ 0x01, //Event / Reading Type
|
|
|
+ 0x7a95, //Lower Threshold Reading Mask
|
|
|
+ 0x7a95, //Upper Threshold Reading Mask
|
|
|
+ 0x3f3f, //Settable / Readable Threshold Mask
|
|
|
+
|
|
|
+ /*
|
|
|
+ [7:6] - Analog (numeric) Data Format**
|
|
|
+ 00b = unsigned
|
|
|
+ 01b = 1's complement(singed)
|
|
|
+ 10b = 2's complement(singed)
|
|
|
+ 11b = Does not return analog (numeric) reading
|
|
|
+ [5:3] - Rate unit
|
|
|
+ 000b = none
|
|
|
+ 001b = per µS
|
|
|
+ 010b = per ms
|
|
|
+ 011b = per s
|
|
|
+ 100b = per minute
|
|
|
+ 101b = per hour
|
|
|
+ 110b = per day
|
|
|
+ 111b = reserved
|
|
|
+ [2:1] - Modifier unit
|
|
|
+ 00b = none
|
|
|
+ 01b = Basic Unit / Modifier Unit
|
|
|
+ 10b = Basic Unit * Modifier Unit
|
|
|
+ 11b = reserved
|
|
|
+ [0] - Percentage 0b = no, 1b = yes
|
|
|
+ */
|
|
|
(0x2<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1
|
|
|
+ /*
|
|
|
+ 0 unspecified
|
|
|
+ 1 degrees C
|
|
|
+ 2 degrees F
|
|
|
+ 3 degrees K
|
|
|
+ 4 Volts
|
|
|
+ 5 Amps
|
|
|
+ */
|
|
|
0x1, //Sensor Units 2 - Base Unit
|
|
|
0x0, //Sensor Units 3 - Modifier Unit
|
|
|
0x0, //Linerization
|
|
|
- 0x2, //M
|
|
|
- ((0x2>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
- 0x0, //B
|
|
|
+ 0x1, //M_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - M: MS 2 bits
|
|
|
+ [5:0] - Tolerance: 6 bits, unsigned (Tolerance in +/- ½ raw counts)
|
|
|
+ */
|
|
|
+ ((0x0>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
+ 0x0, //B_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - B: MS 2 bits
|
|
|
+ Unsigned, 10-bit Basic Sensor Accuracy in 1/100 percent scaled up by unsigned
|
|
|
+ Accuracy exponent:
|
|
|
+ [5:0] - Accuracy: LS 6 bits
|
|
|
+ */
|
|
|
((0x0>>2)&0xC0)+(0x0&0x3F), //B,Accuracy
|
|
|
((0x0>>2)&0xF0)+(0x0&0x0C)+0x0, //Accuracy,Accuracy exponent
|
|
|
(0x0<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
@@ -152,19 +334,18 @@ const FullSensorRec_T full_sdr_tbl[] = {
|
|
|
0x0, //Reserved
|
|
|
0x0, //OEM
|
|
|
0xC0+MAX_ID_STR_LEN, //ID String Type / Length Code
|
|
|
- "top_board"
|
|
|
+ "Temp_Board"
|
|
|
},
|
|
|
-
|
|
|
|
|
|
-/*
|
|
|
- * sensor number: 7
|
|
|
- * sensor name: ADC0_IN5
|
|
|
- * brief: voltage
|
|
|
+ /*
|
|
|
+ * sensor number: 4
|
|
|
+ * sensor name: Temp_FPGA
|
|
|
+ * brief: G780 remote
|
|
|
*/
|
|
|
{
|
|
|
/* SDR Record Header */
|
|
|
{
|
|
|
- 0x04, //Record ID
|
|
|
+ 0x05, //Record ID
|
|
|
0x51, //SDR Version
|
|
|
FULL_SDR_REC, //Record Type
|
|
|
43+MAX_ID_STR_LEN, //Record Length = 43+string length
|
|
@@ -172,46 +353,87 @@ const FullSensorRec_T full_sdr_tbl[] = {
|
|
|
/* Record Key Bytes */
|
|
|
0x20, //Sensor Owner ID
|
|
|
0x0, //Sensor Owner LUN
|
|
|
- 0x07, //Sensor Number
|
|
|
+ 0x04, //Sensor Number
|
|
|
/* Record Body Bytes */
|
|
|
0x7, //Entity ID
|
|
|
- 0x2, //Entity Instance
|
|
|
+ 0x1, //Entity Instance
|
|
|
0x7f, //Entity Initialization
|
|
|
0x68, //Sensor Capabilities
|
|
|
- 0x02, //Sensor Type, 01:Temperature; 02:Voltage; 03:Current; 04:Fan;
|
|
|
- 0x01, //Event / Reading Type, 01:Threshold;
|
|
|
+ 0x01, //Sensor Type: 01-temperature, 02-voltage, 03-current, 04-fan
|
|
|
+ 0x01, //Event / Reading Type
|
|
|
0x7a95, //Lower Threshold Reading Mask
|
|
|
0x7a95, //Upper Threshold Reading Mask
|
|
|
0x3f3f, //Settable / Readable Threshold Mask
|
|
|
- (0x0<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1, (analog(0:unsigned;2:2's complement)<<6)+(rate unit<<3)+(modify unit<<1)+percentage,
|
|
|
- 0x4, //Sensor Units 2 - Base Unit; 1:degree C; 4:Voltage; 5:Amps; 18:RPM
|
|
|
+
|
|
|
+ /*
|
|
|
+ [7:6] - Analog (numeric) Data Format**
|
|
|
+ 00b = unsigned
|
|
|
+ 01b = 1's complement(singed)
|
|
|
+ 10b = 2's complement(singed)
|
|
|
+ 11b = Does not return analog (numeric) reading
|
|
|
+ [5:3] - Rate unit
|
|
|
+ 000b = none
|
|
|
+ 001b = per µS
|
|
|
+ 010b = per ms
|
|
|
+ 011b = per s
|
|
|
+ 100b = per minute
|
|
|
+ 101b = per hour
|
|
|
+ 110b = per day
|
|
|
+ 111b = reserved
|
|
|
+ [2:1] - Modifier unit
|
|
|
+ 00b = none
|
|
|
+ 01b = Basic Unit / Modifier Unit
|
|
|
+ 10b = Basic Unit * Modifier Unit
|
|
|
+ 11b = reserved
|
|
|
+ [0] - Percentage 0b = no, 1b = yes
|
|
|
+ */
|
|
|
+ (0x2<<6)+(0x0<<3)+(0x0<<1)+0x0, //Sensor Units 1
|
|
|
+ /*
|
|
|
+ 0 unspecified
|
|
|
+ 1 degrees C
|
|
|
+ 2 degrees F
|
|
|
+ 3 degrees K
|
|
|
+ 4 Volts
|
|
|
+ 5 Amps
|
|
|
+ */
|
|
|
+ 0x1, //Sensor Units 2 - Base Unit
|
|
|
0x0, //Sensor Units 3 - Modifier Unit
|
|
|
0x0, //Linerization
|
|
|
- 0x81, //M
|
|
|
+ 0x1, //M_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - M: MS 2 bits
|
|
|
+ [5:0] - Tolerance: 6 bits, unsigned (Tolerance in +/- ½ raw counts)
|
|
|
+ */
|
|
|
((0x0>>2)&0xC0)+(0x0&0x3F), //M,Tolerance
|
|
|
- 0x0, //B
|
|
|
+ 0x0, //B_LSB
|
|
|
+ /*
|
|
|
+ [7:6] - B: MS 2 bits
|
|
|
+ Unsigned, 10-bit Basic Sensor Accuracy in 1/100 percent scaled up by unsigned
|
|
|
+ Accuracy exponent:
|
|
|
+ [5:0] - Accuracy: LS 6 bits
|
|
|
+ */
|
|
|
((0x0>>2)&0xC0)+(0x0&0x3F), //B,Accuracy
|
|
|
((0x0>>2)&0xF0)+(0x0&0x0C)+0x0, //Accuracy,Accuracy exponent
|
|
|
- (0xc<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
|
+ (0x0<<4)+(0x0&0x0F), //R exponent,B exponent
|
|
|
0x0, //Analog Characteristics Flags
|
|
|
0x7f, //Nominal Reading
|
|
|
- 0xff, //Normal Maximum
|
|
|
- 0x00, //Normal Minimum
|
|
|
- 0xff, //Sensor Maximum Reading
|
|
|
- 0x00, //Sensor Minimum Reading
|
|
|
- 0xff, //Upper Non-Recoverable Threshold
|
|
|
- 0xff, //Upper Critical Threshold
|
|
|
- 0xff, //Upper Non-Critical Threshold
|
|
|
- 0x00, //Lower Non-Recoverable Threshold
|
|
|
- 0x00, //Lower Critical Threshold
|
|
|
- 0x00, //Lower Non-Critical threshold
|
|
|
+ 0x7f, //Normal Maximum
|
|
|
+ 0x80, //Normal Minimum
|
|
|
+ 0x7f, //Sensor Maximum Reading
|
|
|
+ 0x80, //Sensor Minimum Reading
|
|
|
+ 0x7f, //Upper Non-Recoverable Threshold
|
|
|
+ 0x7f, //Upper Critical Threshold
|
|
|
+ 0x7f, //Upper Non-Critical Threshold
|
|
|
+ 0x80, //Lower Non-Recoverable Threshold
|
|
|
+ 0x80, //Lower Critical Threshold
|
|
|
+ 0x80, //Lower Non-Critical threshold
|
|
|
0x0, //Positive - threshold Hysteresis value
|
|
|
0x0, //Negative - threshold Hysteresis value
|
|
|
0x0, //Reserved
|
|
|
0x0, //Reserved
|
|
|
0x0, //OEM
|
|
|
0xC0+MAX_ID_STR_LEN, //ID String Type / Length Code
|
|
|
- "ADC0_IN5"
|
|
|
+ "Temp_FPGA"
|
|
|
},
|
|
|
};
|
|
|
|