diff options
author | Jani Nikula <jani.nikula@intel.com> | 2017-09-27 17:53:02 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-10-20 16:15:19 +0300 |
commit | d1f8db5654c5e85f46491f7cfefabb0a3ade2456 (patch) | |
tree | 67f68f1b33301ef07d86da559df30011176d2842 /tools | |
parent | 1b4478c2523281dadcb7b20104fac6f97e311dc5 (diff) |
tools/intel_vbt_decode: unify legacy child device block dumping
It's the same stuff as in the new child devices.
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/intel_bios.h | 30 | ||||
-rw-r--r-- | tools/intel_vbt_decode.c | 37 |
2 files changed, 24 insertions, 43 deletions
diff --git a/tools/intel_bios.h b/tools/intel_bios.h index f0475b5cf..78a96d977 100644 --- a/tools/intel_bios.h +++ b/tools/intel_bios.h @@ -42,33 +42,9 @@ #define DEVICE_TYPE_DVI 0x68d2 #define DEVICE_TYPE_MIPI 0x7cc2 -struct legacy_child_device_config { - uint16_t handle; - uint16_t device_type; /* See DEVICE_TYPE_* above */ - uint8_t device_id[10]; - uint16_t addin_offset; - uint8_t dvo_port; /* See DEVICE_PORT_* above */ - uint8_t i2c_pin; - uint8_t slave_addr; - uint8_t ddc_pin; - uint16_t edid_ptr; - uint8_t dvo_cfg; /* See DEVICE_CFG_* above */ - uint8_t dvo2_port; - uint8_t i2c2_pin; - uint8_t slave2_addr; - uint8_t ddc2_pin; - uint8_t capabilities; - uint8_t dvo_wiring; /* See DEVICE_WIRE_* above */ - uint8_t dvo2_wiring; - uint16_t extended_type; - uint8_t dvo_function; -} __attribute__ ((packed)); - -#define DEVICE_CHILD_SIZE 7 - -struct bdb_child_devices { - uint8_t child_structure_size; - struct legacy_child_device_config children[DEVICE_CHILD_SIZE]; +struct bdb_legacy_child_devices { + uint8_t child_dev_size; + uint8_t devices[0]; /* presumably 7 * 33 */ } __attribute__ ((packed)); #define BDB_DRIVER_NO_LVDS 0 diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c index e9d0b1bba..d40163830 100644 --- a/tools/intel_vbt_decode.c +++ b/tools/intel_vbt_decode.c @@ -526,25 +526,30 @@ static void dump_general_definitions(struct context *context, static void dump_legacy_child_devices(struct context *context, const struct bdb_block *block) { - const struct bdb_child_devices *child_devs = block->data; - const struct legacy_child_device_config *child; + const struct bdb_legacy_child_devices *defs = block->data; + struct child_device_config *child; int i; + int child_device_num; - for (i = 0; i < DEVICE_CHILD_SIZE; i++) { - child = &child_devs->children[i]; - /* Skip nonexistent children */ - if (!child->device_type) - continue; - printf("\tChild device %d\n", i); - printf("\t\tType: 0x%04x (%s)\n", child->device_type, - child_device_type(child->device_type)); - printf("\t\tDVO port: 0x%02x\n", child->dvo_port); - printf("\t\tI2C pin: 0x%02x\n", child->i2c_pin); - printf("\t\tSlave addr: 0x%02x\n", child->slave_addr); - printf("\t\tDDC pin: 0x%02x\n", child->ddc_pin); - printf("\t\tDVO config: 0x%02x\n", child->dvo_cfg); - printf("\t\tDVO wiring: 0x%02x\n", child->dvo_wiring); + printf("\tChild device size: %d\n", defs->child_dev_size); + child_device_num = (block->size - sizeof(*defs)) / + defs->child_dev_size; + + /* + * Use a temp buffer so dump_child_device() doesn't have to worry about + * accessing the struct beyond child_dev_size. The tail, if any, remains + * initialized to zero. + */ + child = calloc(1, sizeof(*child)); + + for (i = 0; i < child_device_num; i++) { + memcpy(child, &defs->devices[i * defs->child_dev_size], + min(sizeof(*child), defs->child_dev_size)); + + dump_child_device(context, child); } + + free(child); } static void dump_lvds_options(struct context *context, |