* rename video_electronics to video_configuration as per Axel

* rename decode_* to get_*
* clean up get_* text when unknown connector/encoder


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42717 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-09-06 16:01:33 +00:00
parent 5414f4dceb
commit 440381c60f
5 changed files with 17 additions and 17 deletions
@@ -5,8 +5,8 @@
* Authors: * Authors:
* Alexander von Gluck, kallisti5@unixzen.com * Alexander von Gluck, kallisti5@unixzen.com
*/ */
#ifndef _VIDEO_ELECTRONICS_H #ifndef _VIDEO_CONFIGURATION_H
#define _VIDEO_ELECTRONICS_H #define _VIDEO_CONFIGURATION_H
// Video connector types // Video connector types
@@ -42,8 +42,8 @@ extern "C" {
// mostly for debugging detected monitors // mostly for debugging detected monitors
const char* decode_connector_name(uint32 connector); const char* get_connector_name(uint32 connector);
const char* decode_encoder_name(uint32 encoder); const char* get_encoder_name(uint32 encoder);
#ifdef __cplusplus #ifdef __cplusplus
@@ -51,4 +51,4 @@ const char* decode_encoder_name(uint32 encoder);
#endif #endif
#endif /* _VIDEO_ELECTRONICS_H */ #endif /* _VIDEO_CONFIGURATION_H */
+1 -1
View File
@@ -9,7 +9,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
StaticLibrary libaccelerantscommon.a : StaticLibrary libaccelerantscommon.a :
compute_display_timing.cpp compute_display_timing.cpp
create_display_modes.cpp create_display_modes.cpp
video_electronics.c video_configuration.cpp
ddc.c ddc.c
decode_edid.c decode_edid.c
dump_edid.c dump_edid.c
@@ -10,11 +10,11 @@
#include <KernelExport.h> #include <KernelExport.h>
#include <stdio.h> #include <stdio.h>
#include "video_electronics.h" #include "video_configuration.h"
const char* const char*
decode_connector_name(uint32 connector) get_connector_name(uint32 connector)
{ {
switch (connector) { switch (connector) {
case VIDEO_CONNECTOR_VGA: case VIDEO_CONNECTOR_VGA:
@@ -48,12 +48,12 @@ decode_connector_name(uint32 connector)
case VIDEO_CONNECTOR_UNKNOWN: case VIDEO_CONNECTOR_UNKNOWN:
return "Unknown"; return "Unknown";
} }
return "Connector Undefined"; return "Undefined";
} }
const char* const char*
decode_encoder_name(uint32 encoder) get_encoder_name(uint32 encoder)
{ {
switch (encoder) { switch (encoder) {
case VIDEO_ENCODER_NONE: case VIDEO_ENCODER_NONE:
@@ -67,5 +67,5 @@ decode_encoder_name(uint32 encoder)
case VIDEO_ENCODER_TVDAC: case VIDEO_ENCODER_TVDAC:
return "TV DAC"; return "TV DAC";
} }
return "Encoder Undefined"; return "Undefined";
} }
@@ -312,7 +312,7 @@ detect_connectors_legacy()
for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE_INFO; i++) { for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE_INFO; i++) {
if (gConnector[i]->valid == true) { if (gConnector[i]->valid == true) {
TRACE("%s: connector #%" B_PRId32 " is %s\n", __func__, i, TRACE("%s: connector #%" B_PRId32 " is %s\n", __func__, i,
decode_connector_name(gConnector[i]->connector_type)); get_connector_name(gConnector[i]->connector_type));
} }
} }
@@ -584,10 +584,10 @@ detect_connectors()
// TODO : aux chan transactions // TODO : aux chan transactions
TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n", TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n",
__func__, i, decode_connector_name(connector_type), __func__, i, get_connector_name(connector_type),
connector_type); connector_type);
TRACE("%s: Path #%" B_PRId32 ": Found encoder %s\n", __func__, TRACE("%s: Path #%" B_PRId32 ": Found encoder %s\n", __func__,
i, decode_encoder_name(encoder_type)); i, get_encoder_name(encoder_type));
gConnector[connector_index]->valid = true; gConnector[connector_index]->valid = true;
@@ -669,8 +669,8 @@ debug_displays()
if (gDisplay[id]->active) { if (gDisplay[id]->active) {
uint32 connector_type = gConnector[connector_index]->connector_type; uint32 connector_type = gConnector[connector_index]->connector_type;
uint32 encoder_type = gConnector[connector_index]->encoder_type; uint32 encoder_type = gConnector[connector_index]->encoder_type;
TRACE(" + connector: %s\n", decode_connector_name(connector_type)); TRACE(" + connector: %s\n", get_connector_name(connector_type));
TRACE(" + encoder: %s\n", decode_encoder_name(encoder_type)); TRACE(" + encoder: %s\n", get_encoder_name(encoder_type));
TRACE(" + limits: Vert Min/Max: %" B_PRIu32 "/%" B_PRIu32"\n", TRACE(" + limits: Vert Min/Max: %" B_PRIu32 "/%" B_PRIu32"\n",
gDisplay[id]->vfreq_min, gDisplay[id]->vfreq_max); gDisplay[id]->vfreq_min, gDisplay[id]->vfreq_max);
+1 -1
View File
@@ -9,7 +9,7 @@
#define RADEON_HD_DISPLAY_H #define RADEON_HD_DISPLAY_H
#include <video_electronics.h> #include <video_configuration.h>
// convert radeon connector to common connector type // convert radeon connector to common connector type