From 4faf6f22765f20244a8f0512693e911fc510f21c Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 9 Dec 2011 20:50:18 -0600 Subject: [PATCH] Style cleanup. Variable rename, fill out IGP TODO a little better --- src/add-ons/accelerants/radeon_hd/connector.cpp | 16 +++++++++++----- src/add-ons/accelerants/radeon_hd/connector.h | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/connector.cpp b/src/add-ons/accelerants/radeon_hd/connector.cpp index a45ca05d26..0578579bd1 100644 --- a/src/add-ons/accelerants/radeon_hd/connector.cpp +++ b/src/add-ons/accelerants/radeon_hd/connector.cpp @@ -676,7 +676,7 @@ connector_probe_legacy() ATOM_CONNECTOR_INFO_I2C ci = supportedDevices->info.asConnInfo[i]; - gConnector[connectorIndex]->type = connector_convert_legacy[ + gConnector[connectorIndex]->type = kConnectorConvertLegacy[ ci.sucConnectorInfo.sbfAccess.bfConnectorType]; if (gConnector[connectorIndex]->type == VIDEO_CONNECTOR_UNKNOWN) { @@ -813,12 +813,18 @@ connector_probe() continue; } - uint16 igp_lane_info; - if (0) + radeon_shared_info &info = *gInfo->shared_info; + + uint16 igpLaneInfo; + if ((info.chipsetFlags & CHIP_IGP) != 0) ERROR("%s: TODO: IGP chip connector detection\n", __func__); + // try non-IGP method for now + igpLaneInfo = 0; + connectorType = kConnectorConvert[con_obj_id]; + connectorObjectID = con_obj_id; else { - igp_lane_info = 0; - connectorType = connector_convert[con_obj_id]; + igpLaneInfo = 0; + connectorType = kConnectorConvert[con_obj_id]; connectorObjectID = con_obj_id; } diff --git a/src/add-ons/accelerants/radeon_hd/connector.h b/src/add-ons/accelerants/radeon_hd/connector.h index 9ae4ede09a..123cbd5f5a 100644 --- a/src/add-ons/accelerants/radeon_hd/connector.h +++ b/src/add-ons/accelerants/radeon_hd/connector.h @@ -35,7 +35,7 @@ // convert radeon connector to common connector type -const int connector_convert_legacy[] = { +const int kConnectorConvertLegacy[] = { VIDEO_CONNECTOR_UNKNOWN, VIDEO_CONNECTOR_VGA, VIDEO_CONNECTOR_DVII, @@ -54,7 +54,7 @@ const int connector_convert_legacy[] = { VIDEO_CONNECTOR_DP }; -const int connector_convert[] = { +const int kConnectorConvert[] = { VIDEO_CONNECTOR_UNKNOWN, VIDEO_CONNECTOR_DVII, VIDEO_CONNECTOR_DVII,