From 97584f7d11feee5440e7860058350b6300f19d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 20 Dec 2006 21:13:59 +0000 Subject: [PATCH] * Made header C++ safe. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19576 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/common/edid.h | 36 ++++++++++++-------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/headers/private/graphics/common/edid.h b/headers/private/graphics/common/edid.h index 3b0d038158..391246abfb 100644 --- a/headers/private/graphics/common/edid.h +++ b/headers/private/graphics/common/edid.h @@ -1,17 +1,15 @@ /* - Copyright (c) 2003, Thomas Kurschel - - - Part of DDC driver - - EDID handling, including decoded EDID data block definitin. -*/ - + * Copyright 2003, Thomas Kurschel. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _EDID_H #define _EDID_H +//! EDID handling, including decoded EDID data block definition. + #include "edid_raw.h" + // vendor info typedef struct { char manufacturer[4]; @@ -21,14 +19,12 @@ typedef struct { uint16 year; } edid1_vendor; - // version info typedef struct { uint8 version; uint8 revision; } edid1_version; - // display info typedef struct { BBITFIELD8_7 ( @@ -64,7 +60,6 @@ typedef struct { uint16 white_y; } edid1_display; - // standard timing data typedef struct { uint16 h_size; @@ -74,7 +69,6 @@ typedef struct { uint8 refresh; } edid1_std_timing; - // additional whitepoint typedef struct { uint8 index; @@ -83,7 +77,6 @@ typedef struct { uint8 gamma; // (x+100)/100 } edid1_whitepoint; - // detailed timing description typedef struct { uint16 pixel_clock; // in 10 kHz @@ -108,7 +101,6 @@ typedef struct { ); } edid1_detailed_timing; - // detailed monitor description typedef struct { uint8 monitor_desc_type; @@ -123,7 +115,6 @@ typedef struct { } data; } edid1_detailed_monitor; - // EDID data block typedef struct{ edid1_vendor vendor; @@ -138,9 +129,16 @@ typedef struct{ uint8 num_sections; } 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 + +void edid_decode(edid1_info *edid, const edid1_raw *raw); +void edid_dump(edid1_info *edid); + +#ifdef __cplusplus +} +#endif + +#endif // _EDID_H