i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* style fixes, no functional change...

Browse Source 
frev / crev to tableMajor / tableMinor
  size to tableSize
  offset to tableOffset


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42834 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-10-12 21:21:45 +00:00
parent 20f094cc38
commit 6b49ba8931
4 changed files with 98 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/display.cpp
+48 -47
View File
@@ -235,13 +235,13 @@ status_t
detect_connectors_legacy()
{
int index = GetIndexIntoMasterTable(DATA, SupportedDevicesInfo);
uint8 frev;
uint8 crev;
uint16 size;
uint16 data_offset;
uint8 tableMajor;
uint8 tableMinor;
uint16 tableSize;
uint16 tableOffset;
if (atom_parse_data_header(gAtomContext, index, &size, &frev, &crev,
&data_offset) != B_OK) {
if (atom_parse_data_header(gAtomContext, index, &tableSize,
&tableMajor, &tableMinor, &tableOffset) != B_OK) {
ERROR("%s: unable to parse data header!\n", __func__);
return B_ERROR;
}
@@ -249,7 +249,7 @@ detect_connectors_legacy()
union atom_supported_devices *supported_devices;
supported_devices
= (union atom_supported_devices *)
(gAtomContext->bios + data_offset);
(gAtomContext->bios + tableOffset);
uint16 device_support
= B_LENDIAN_TO_HOST_INT16(supported_devices->info.usDeviceSupport);
@@ -327,19 +327,20 @@ status_t
detect_connectors()
{
int index = GetIndexIntoMasterTable(DATA, Object_Header);
uint8 frev;
uint8 crev;
uint16 size;
uint16 data_offset;
uint8 tableMajor;
uint8 tableMinor;
uint16 tableSize;
uint16 tableOffset;
if (atom_parse_data_header(gAtomContext, index, &size, &frev, &crev,
&data_offset) != B_OK) {
if (atom_parse_data_header(gAtomContext, index, &tableSize,
&tableMajor, &tableMinor, &tableOffset) != B_OK) {
ERROR("%s: ERROR: parsing data header failed!\n", __func__);
return B_ERROR;
}
if (crev < 2) {
ERROR("%s: ERROR: data header version unknown!\n", __func__);
if (tableMinor < 2) {
ERROR("%s: ERROR: table minor version unknown! "
"(%" B_PRIu8 ".%" B_PRIu8 ")\n", __func__, tableMajor, tableMinor);
return B_ERROR;
}
@@ -349,22 +350,22 @@ detect_connectors()
ATOM_DISPLAY_OBJECT_PATH_TABLE *path_obj;
ATOM_OBJECT_HEADER *obj_header;
obj_header = (ATOM_OBJECT_HEADER *)(gAtomContext->bios + data_offset);
obj_header = (ATOM_OBJECT_HEADER *)(gAtomContext->bios + tableOffset);
path_obj = (ATOM_DISPLAY_OBJECT_PATH_TABLE *)
(gAtomContext->bios + data_offset
(gAtomContext->bios + tableOffset
+ B_LENDIAN_TO_HOST_INT16(obj_header->usDisplayPathTableOffset));
con_obj = (ATOM_CONNECTOR_OBJECT_TABLE *)
(gAtomContext->bios + data_offset
(gAtomContext->bios + tableOffset
+ B_LENDIAN_TO_HOST_INT16(obj_header->usConnectorObjectTableOffset));
enc_obj = (ATOM_ENCODER_OBJECT_TABLE *)
(gAtomContext->bios + data_offset
(gAtomContext->bios + tableOffset
+ B_LENDIAN_TO_HOST_INT16(obj_header->usEncoderObjectTableOffset));
router_obj = (ATOM_OBJECT_TABLE *)
(gAtomContext->bios + data_offset
(gAtomContext->bios + tableOffset
+ B_LENDIAN_TO_HOST_INT16(obj_header->usRouterObjectTableOffset));
int device_support = B_LENDIAN_TO_HOST_INT16(obj_header->usDeviceSupport);
int deviceSupport = B_LENDIAN_TO_HOST_INT16(obj_header->usDeviceSupport);
int path_size = 0;
int pathSize = 0;
int32 i = 0;
TRACE("%s: found %" B_PRIu8 " potential display paths.\n", __func__,
@@ -378,15 +379,15 @@ detect_connectors()
uint8 *addr = (uint8*)path_obj->asDispPath;
ATOM_DISPLAY_OBJECT_PATH *path;
addr += path_size;
addr += pathSize;
path = (ATOM_DISPLAY_OBJECT_PATH *)addr;
path_size += B_LENDIAN_TO_HOST_INT16(path->usSize);
pathSize += B_LENDIAN_TO_HOST_INT16(path->usSize);
uint32 connector_type;
uint16 connector_object_id;
uint16 connector_flags = B_LENDIAN_TO_HOST_INT16(path->usDeviceTag);
uint32 connectorType;
uint16 connectorObjectID;
uint16 connectorFlags = B_LENDIAN_TO_HOST_INT16(path->usDeviceTag);
if ((device_support & connector_flags) != 0) {
if ((deviceSupport & connectorFlags) != 0) {
uint8 con_obj_id = (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
& OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
@@ -397,7 +398,7 @@ detect_connectors()
// = (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
// & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
if (connector_flags == ATOM_DEVICE_CV_SUPPORT) {
if (connectorFlags == ATOM_DEVICE_CV_SUPPORT) {
TRACE("%s: Path #%" B_PRId32 ": skipping component video.\n",
__func__, i);
continue;
@@ -408,11 +409,11 @@ detect_connectors()
ERROR("%s: TODO : IGP chip connector detection\n", __func__);
else {
igp_lane_info = 0;
connector_type = connector_convert[con_obj_id];
connector_object_id = con_obj_id;
connectorType = connector_convert[con_obj_id];
connectorObjectID = con_obj_id;
}
if (connector_type == VIDEO_CONNECTOR_UNKNOWN) {
if (connectorType == VIDEO_CONNECTOR_UNKNOWN) {
ERROR("%s: Path #%" B_PRId32 ": skipping unknown connector.\n",
__func__, i);
continue;
@@ -443,7 +444,7 @@ detect_connectors()
== encoder_obj) {
ATOM_COMMON_RECORD_HEADER *record
= (ATOM_COMMON_RECORD_HEADER *)
((uint16 *)gAtomContext->bios + data_offset
((uint16 *)gAtomContext->bios + tableOffset
+ B_LENDIAN_TO_HOST_INT16(
enc_obj->asObjects[k].usRecordOffset));
ATOM_ENCODER_CAP_RECORD *cap_record;
@@ -472,7 +473,7 @@ detect_connectors()
case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
if ((connector_flags
if ((connectorFlags
& ATOM_DEVICE_LCD_SUPPORT) != 0) {
encoder_type = VIDEO_ENCODER_LVDS;
// radeon_atombios_get_lvds_info
@@ -496,10 +497,10 @@ detect_connectors()
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
if ((connector_flags
if ((connectorFlags
& ATOM_DEVICE_LCD_SUPPORT) != 0) {
encoder_type = VIDEO_ENCODER_LVDS;
} else if ((connector_flags
} else if ((connectorFlags
& ATOM_DEVICE_CRT_SUPPORT) != 0) {
encoder_type = VIDEO_ENCODER_DAC;
} else {
@@ -516,10 +517,10 @@ detect_connectors()
case ENCODER_OBJECT_ID_HDMI_SI1930:
case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG:
if ((connector_flags
if ((connectorFlags
& ATOM_DEVICE_LCD_SUPPORT) != 0) {
encoder_type = VIDEO_ENCODER_LVDS;
} else if ((connector_flags
} else if ((connectorFlags
& ATOM_DEVICE_CRT_SUPPORT) != 0) {
encoder_type = VIDEO_ENCODER_DAC;
} else {
@@ -542,7 +543,7 @@ detect_connectors()
get_encoder_name(encoder_type));
gConnector[connectorIndex]->encoder.flags
= connector_flags;
= connectorFlags;
gConnector[connectorIndex]->encoder.valid
= true;
gConnector[connectorIndex]->encoder.object_id
@@ -558,7 +559,7 @@ detect_connectors()
}
// Set up information buses such as ddc
if ((connector_flags
if ((connectorFlags
& (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT)) == 0) {
for (j = 0; j < con_obj->ucNumberOfObjects; j++) {
if (B_LENDIAN_TO_HOST_INT16(path->usConnObjectId)
@@ -566,7 +567,7 @@ detect_connectors()
con_obj->asObjects[j].usObjectID)) {
ATOM_COMMON_RECORD_HEADER *record
= (ATOM_COMMON_RECORD_HEADER*)(gAtomContext->bios
+ data_offset + B_LENDIAN_TO_HOST_INT16(
+ tableOffset + B_LENDIAN_TO_HOST_INT16(
con_obj->asObjects[j].usRecordOffset));
while (record->ucRecordSize > 0
&& record->ucRecordType > 0
@@ -604,19 +605,19 @@ detect_connectors()
// record connector information
TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n",
__func__, i, get_connector_name(connector_type),
connector_type);
__func__, i, get_connector_name(connectorType),
connectorType);
gConnector[connectorIndex]->valid = true;
gConnector[connectorIndex]->flags = connector_flags;
gConnector[connectorIndex]->type = connector_type;
gConnector[connectorIndex]->flags = connectorFlags;
gConnector[connectorIndex]->type = connectorType;
gConnector[connectorIndex]->object_id
= connector_object_id;
= connectorObjectID;
gConnector[connectorIndex]->encoder.is_tv = false;
gConnector[connectorIndex]->encoder.is_hdmi = false;
switch(connector_type) {
switch(connectorType) {
case VIDEO_CONNECTOR_COMPOSITE:
case VIDEO_CONNECTOR_SVIDEO:
case VIDEO_CONNECTOR_9DIN:
src/add-ons/accelerants/radeon_hd/encoder.cpp
+23 -16
View File
@@ -41,21 +41,23 @@ encoder_assign_crtc(uint8 crtcID)
{
int index = GetIndexIntoMasterTable(COMMAND, SelectCRTC_Source);
union crtc_source_param args;
uint8 frev;
uint8 crev;
// Table version
uint8 tableMajor;
uint8 tableMinor;
memset(&args, 0, sizeof(args));
if (atom_parse_cmd_header(gAtomContext, index, &frev, &crev)
if (atom_parse_cmd_header(gAtomContext, index, &tableMajor, &tableMinor)
!= B_OK)
return;
uint16 connectorIndex = gDisplay[crtcID]->connectorIndex;
uint16 encoderID = gConnector[connectorIndex]->encoder.object_id;
switch (frev) {
switch (tableMajor) {
case 1:
switch (crev) {
switch (tableMinor) {
case 1:
default:
args.v1.ucCRTC = crtcID;
@@ -162,7 +164,8 @@ encoder_assign_crtc(uint8 crtcID)
}
break;
default:
ERROR("%s: Unknown table version: %d, %d\n", __func__, frev, crev);
ERROR("%s: Unknown table version: %" B_PRIu8 ".%" B_PRIu8 "\n",
__func__, tableMajor, tableMinor);
return;
}
@@ -244,15 +247,18 @@ encoder_digital_setup(uint8 id, uint32 pixelClock, int command)
break;
}
uint8 frev;
uint8 crev;
if (atom_parse_cmd_header(gAtomContext, index, &frev, &crev) != B_OK)
// Table verson
uint8 tableMajor;
uint8 tableMinor;
if (atom_parse_cmd_header(gAtomContext, index, &tableMajor, &tableMinor)
!= B_OK)
return B_ERROR;
switch (frev) {
switch (tableMajor) {
case 1:
case 2:
switch (crev) {
switch (tableMinor) {
case 1:
args.v1.ucMisc = 0;
args.v1.ucAction = command;
@@ -279,7 +285,7 @@ encoder_digital_setup(uint8 id, uint32 pixelClock, int command)
case 3:
args.v2.ucMisc = 0;
args.v2.ucAction = command;
if (crev == 3) {
if (tableMinor == 3) {
//if (dig->coherent_mode)
// args.v2.ucMisc |= PANEL_ENCODER_MISC_COHERENT;
}
@@ -319,14 +325,15 @@ encoder_digital_setup(uint8 id, uint32 pixelClock, int command)
}
break;
default:
ERROR("%s: Unknown minor table version: %d.%d\n", __func__,
frev, crev);
ERROR("%s: Unknown minor table version: %"
B_PRIu8 ".%" B_PRIu8 "\n", __func__,
tableMajor, tableMinor);
return B_ERROR;
}
break;
default:
ERROR("%s: Unknown major table version: %d.%d\n", __func__,
frev, crev);
ERROR("%s: Unknown major table version: %" B_PRIu8 ".%" B_PRIu8 "\n",
__func__, tableMajor, tableMinor);
return B_ERROR;
}
return atom_execute_table(gAtomContext, index, (uint32*)&args);
src/add-ons/accelerants/radeon_hd/gpu.cpp
+12 -11
View File
@@ -417,32 +417,33 @@ status_t
radeon_gpu_gpio_setup()
{
int index = GetIndexIntoMasterTable(DATA, GPIO_I2C_Info);
uint8 frev;
uint8 crev;
uint16 offset;
uint16 size;
if (atom_parse_data_header(gAtomContext, index, &size, &frev, &crev,
&offset) != B_OK) {
uint8 tableMajor;
uint8 tableMinor;
uint16 tableOffset;
uint16 tableSize;
if (atom_parse_data_header(gAtomContext, index, &tableSize,
&tableMajor, &tableMinor, &tableOffset) != B_OK) {
ERROR("%s: could't read GPIO_I2C_Info table from AtomBIOS index %d!\n",
__func__, index);
return B_ERROR;
}
struct _ATOM_GPIO_I2C_INFO *i2c_info
= (struct _ATOM_GPIO_I2C_INFO *)(gAtomContext->bios + offset);
= (struct _ATOM_GPIO_I2C_INFO *)(gAtomContext->bios + tableOffset);
uint32 num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER))
uint32 numIndices = (tableSize - sizeof(ATOM_COMMON_TABLE_HEADER))
/ sizeof(ATOM_GPIO_I2C_ASSIGMENT);
if (num_indices > ATOM_MAX_SUPPORTED_DEVICE) {
if (numIndices > ATOM_MAX_SUPPORTED_DEVICE) {
ERROR("%s: ERROR: AtomBIOS contains more GPIO_Info items then I"
"was prepared for! (seen: %" B_PRIu32 "; max: %" B_PRIu32 ")\n",
__func__, num_indices, (uint32)ATOM_MAX_SUPPORTED_DEVICE);
__func__, numIndices, (uint32)ATOM_MAX_SUPPORTED_DEVICE);
return B_ERROR;
}
for (uint32 i = 0; i < num_indices; i++) {
for (uint32 i = 0; i < numIndices; i++) {
ATOM_GPIO_I2C_ASSIGMENT *gpio = &i2c_info->asGPIO_Info[i];
// TODO : if DCE 4 and i == 7 ... manual override for evergreen
src/add-ons/accelerants/radeon_hd/pll.cpp
+15 -11
View File
@@ -187,18 +187,21 @@ pll_adjust(pll_info *pll, uint8 crtcID)
if (info.device_chipset >= (RADEON_R600 | 0x20)) {
union adjust_pixel_clock args;
uint8 frev;
uint8 crev;
uint8 tableMajor;
uint8 tableMinor;
int index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll);
if (atom_parse_cmd_header(gAtomContext, index, &frev, &crev) != B_OK)
if (atom_parse_cmd_header(gAtomContext, index, &tableMajor, &tableMinor)
!= B_OK) {
return adjustedClock;
}
memset(&args, 0, sizeof(args));
switch (frev) {
switch (tableMajor) {
case 1:
switch (crev) {
switch (tableMinor) {
case 1:
case 2:
args.v1.usPixelClock
@@ -281,15 +284,16 @@ pll_set(uint8 pllID, uint32 pixelClock, uint8 crtcID)
union set_pixel_clock args;
memset(&args, 0, sizeof(args));
uint8 frev;
uint8 crev;
atom_parse_cmd_header(gAtomContext, index, &frev, &crev);
uint8 tableMajor;
uint8 tableMinor;
atom_parse_cmd_header(gAtomContext, index, &tableMajor, &tableMinor);
uint32 bpc = 8;
// TODO : BPC == Digital Depth, EDID 1.4+ on digital displays
// isn't in Haiku edid common code?
switch (crev) {
switch (tableMinor) {
case 1:
args.v1.usPixelClock = B_HOST_TO_LENDIAN_INT16(adjustedClock / 10);
args.v1.usRefDiv = B_HOST_TO_LENDIAN_INT16(pll->reference_div);
@@ -382,8 +386,8 @@ pll_set(uint8 pllID, uint32 pixelClock, uint8 crtcID)
args.v6.ucPpll = pllID;
break;
default:
TRACE("%s: ERROR: table version %d.%d TODO\n", __func__,
frev, crev);
TRACE("%s: ERROR: table version %" B_PRIu8 ".%" B_PRIu8 " TODO\n",
__func__, tableMajor, tableMinor);
return B_ERROR;
}