diff options
author | Nick Bofferding <bofferdn@us.ibm.com> | 2017-07-05 11:35:21 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-07-14 15:39:21 -0400 |
commit | 3fbd50ab46e402867da8a5ae6b041aa9330fd6ea (patch) | |
tree | fefcd0aea6d086f91460649ed9b8582603d3a5fc /src/include/usr | |
parent | 34514fe03f1e41d838b3f60e06136444e028a0ef (diff) | |
download | talos-hostboot-3fbd50ab46e402867da8a5ae6b041aa9330fd6ea.tar.gz talos-hostboot-3fbd50ab46e402867da8a5ae6b041aa9330fd6ea.zip |
Support new i2c device link ID format
Change-Id: Ie79caad8ec9fe0be5421185360c5ea9b2d5dee3d
RTC: 173541
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42681
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: NAGENDRA K. GURRAM <nagendra.g@in.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/include/usr')
-rwxr-xr-x | src/include/usr/hdat/hdat.H | 11 | ||||
-rw-r--r-- | src/include/usr/i2c/i2cif.H | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/include/usr/hdat/hdat.H b/src/include/usr/hdat/hdat.H index 3f151609e..98c9b813d 100755 --- a/src/include/usr/hdat/hdat.H +++ b/src/include/usr/hdat/hdat.H @@ -93,6 +93,17 @@ struct hdatHDIFDataArray_t // (<= hdatAllocSize) } __attribute__ ((packed)); +/** @brief Type definition for a versioned data array header. Used when internal + * data is an array and the array data must be versioned + */ +struct hdatHDIFVersionedDataArray_t +{ + uint32_t hdatOffset; // 0x0000 Offset to array from this structure + uint32_t hdatArrayCnt; // 0x0004 Number of array entries + uint32_t hdatAllocSize; // 0x0008 Size of allocated space for array entry + uint32_t hdatActSize; // 0x000C Actual size of an array entry + uint32_t hdatVersion; // 0x0010 Version of the array instance format +} __attribute__ ((packed)); /** @brief Type definition for the 5-tuples that the SPIRA uses to address other * data structures. diff --git a/src/include/usr/i2c/i2cif.H b/src/include/usr/i2c/i2cif.H index 9c498d7bc..c0bee8be2 100644 --- a/src/include/usr/i2c/i2cif.H +++ b/src/include/usr/i2c/i2cif.H @@ -230,13 +230,15 @@ struct DeviceInfo_t uint8_t slavePort; //< I2C Slave Port. 0xFF if N/A uint16_t busFreqKhz; //< Bus speed in KHz uint8_t devicePurpose; //< Slave device purpose (from enum) + TARGETING::ATTR_ORDINAL_ID_type assocNode; //< Upstream node's ordinal ID + TARGETING::ATTR_POSITION_type assocProc; //< Upstream proc's position }; /** * Retrieve some information about I2C devices that the Host * needs to know about. * - * @param[in] i_i2cMaster I2C master to query, pass in NULL + * @param[in] i_i2cMaster I2C master to query, pass in nullptr * to get a system-wide list * @param[out] o_deviceInfo list of I2C device structures * |