* Made header C++ safe.

* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19576 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-12-20 21:13:59 +00:00
parent 047165ce77
commit 97584f7d11
+17 -19
View File
@@ -1,17 +1,15 @@
/* /*
Copyright (c) 2003, Thomas Kurschel * Copyright 2003, Thomas Kurschel. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
Part of DDC driver
EDID handling, including decoded EDID data block definitin.
*/
#ifndef _EDID_H #ifndef _EDID_H
#define _EDID_H #define _EDID_H
//! EDID handling, including decoded EDID data block definition.
#include "edid_raw.h" #include "edid_raw.h"
// vendor info // vendor info
typedef struct { typedef struct {
char manufacturer[4]; char manufacturer[4];
@@ -21,14 +19,12 @@ typedef struct {
uint16 year; uint16 year;
} edid1_vendor; } edid1_vendor;
// version info // version info
typedef struct { typedef struct {
uint8 version; uint8 version;
uint8 revision; uint8 revision;
} edid1_version; } edid1_version;
// display info // display info
typedef struct { typedef struct {
BBITFIELD8_7 ( BBITFIELD8_7 (
@@ -64,7 +60,6 @@ typedef struct {
uint16 white_y; uint16 white_y;
} edid1_display; } edid1_display;
// standard timing data // standard timing data
typedef struct { typedef struct {
uint16 h_size; uint16 h_size;
@@ -74,7 +69,6 @@ typedef struct {
uint8 refresh; uint8 refresh;
} edid1_std_timing; } edid1_std_timing;
// additional whitepoint // additional whitepoint
typedef struct { typedef struct {
uint8 index; uint8 index;
@@ -83,7 +77,6 @@ typedef struct {
uint8 gamma; // (x+100)/100 uint8 gamma; // (x+100)/100
} edid1_whitepoint; } edid1_whitepoint;
// detailed timing description // detailed timing description
typedef struct { typedef struct {
uint16 pixel_clock; // in 10 kHz uint16 pixel_clock; // in 10 kHz
@@ -108,7 +101,6 @@ typedef struct {
); );
} edid1_detailed_timing; } edid1_detailed_timing;
// detailed monitor description // detailed monitor description
typedef struct { typedef struct {
uint8 monitor_desc_type; uint8 monitor_desc_type;
@@ -123,7 +115,6 @@ typedef struct {
} data; } data;
} edid1_detailed_monitor; } edid1_detailed_monitor;
// EDID data block // EDID data block
typedef struct{ typedef struct{
edid1_vendor vendor; edid1_vendor vendor;
@@ -138,9 +129,16 @@ typedef struct{
uint8 num_sections; uint8 num_sections;
} edid1_info; } edid1_info;
// decode raw EDID info into usuable EDID info
void edid_decode( edid1_info *edid, const edid1_raw *raw );
// dump EDID info to syslog
void edid_dump( edid1_info *edid );
#ifdef __cplusplus
extern "C" {
#endif #endif
void edid_decode(edid1_info *edid, const edid1_raw *raw);
void edid_dump(edid1_info *edid);
#ifdef __cplusplus
}
#endif
#endif // _EDID_H