XcmDDC.h   XcmDDC.h 
skipping to change at line 20 skipping to change at line 20
* @author Kai-Uwe Behrmann <ku.b@gmx.de> * @author Kai-Uwe Behrmann <ku.b@gmx.de>
* @par License: * @par License:
* MIT <http://www.opensource.org/licenses/mit-license.php> * MIT <http://www.opensource.org/licenses/mit-license.php>
* @since 2010/12/28 * @since 2010/12/28
*/ */
#ifndef XCM_DDC_H #ifndef XCM_DDC_H
#define XCM_DDC_H #define XCM_DDC_H
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#if !defined(__APPLE__)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/** \addtogroup XcmDDC /** \addtogroup XcmDDC
* *
* @{ * @{
*/ */
/**
* @brief errors specific to XcmDDC
*
* @version libXcm: 0.4.0
* @since 2010/12/28 (libXcm: 0.4.0)
* @date 2010/12/28
*/
typedef enum { typedef enum {
XCM_DDC_OK, /**< @brief success */ XCM_DDC_OK, /**< @brief success */
XCM_DDC_NO_FILE, /**< @brief fopen failed, permission s? */ XCM_DDC_NO_FILE, /**< @brief fopen failed, permission s? */
XCM_DDC_PREPARE_FAIL, /**< @brief setting EEDID adress failed* / XCM_DDC_PREPARE_FAIL, /**< @brief setting EEDID adress failed* /
XCM_DDC_EDID_READ_FAIL, /**< @brief could not obtain EEDID * / XCM_DDC_EDID_READ_FAIL, /**< @brief could not obtain EEDID * /
XCM_DDC_WRONG_EDID /**< @brief wrong EDID header */ XCM_DDC_WRONG_EDID /**< @brief wrong EDID header */
} XCM_DDC_ERROR_e; } XCM_DDC_ERROR_e;
/* basic access functions */ /* basic access functions */
XCM_DDC_ERROR_e XcmDDClist ( char *** devices, XCM_DDC_ERROR_e XcmDDClist ( char *** devices,
skipping to change at line 52 skipping to change at line 61
size_t * size ); size_t * size );
const char * XcmDDCErrorToString ( XCM_DDC_ERROR_e error ); const char * XcmDDCErrorToString ( XCM_DDC_ERROR_e error );
/** } XcmDDC */ /** } XcmDDC */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* !__APPLE__ */
#endif /* XCM_DDC_H */ #endif /* XCM_DDC_H */
 End of changes. 3 change blocks. 
0 lines changed or deleted 11 lines changed or added


 XcmEdidParse.h   XcmEdidParse.h 
/** @file Xcm_edid_parse.h /** XcmEdidParse.h
* *
* Xcm Xorg Colour Management * Xcm Xorg Colour Management
* *
* @par Copyright: * @par Copyright:
* 2005-2010 (C) Kai-Uwe Behrmann * 2005-2010 (C) Kai-Uwe Behrmann
* *
* @brief EDID data block parsing * @brief EDID data block parsing
* @internal * @internal
* @author Kai-Uwe Behrmann <ku.b@gmx.de> * @author Kai-Uwe Behrmann <ku.b@gmx.de>
* @par License: * @par License:
skipping to change at line 24 skipping to change at line 24
*/ */
#ifndef XCM_EDID_PARSE_H #ifndef XCM_EDID_PARSE_H
#define XCM_EDID_PARSE_H #define XCM_EDID_PARSE_H
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @brief \internal DDC struct */ /** \addtogroup XcmEdidParse
*
* @{
*/
/* @internal
* DDC struct */
typedef struct { typedef struct {
unsigned char sig[8]; unsigned char sig[8];
unsigned char mnft_id[2]; /* [8] manufaturer ID */ unsigned char mnft_id[2]; /* [8] manufaturer ID */
unsigned char model_id[2]; /* [10] model ID */ unsigned char model_id[2]; /* [10] model ID */
unsigned char ser_id[2]; /* [12] serial ID */ unsigned char ser_id[2]; /* [12] serial ID */
unsigned char dummy_li[2]; unsigned char dummy_li[2];
unsigned char week; /* [16] Week */ unsigned char week; /* [16] Week */
unsigned char year; /* [17] + 1990 => Year */ unsigned char year; /* [17] + 1990 => Year */
unsigned char major_version; /* [18] */ unsigned char major_version; /* [18] */
unsigned char minor_version; /* [19] */ unsigned char minor_version; /* [19] */
skipping to change at line 96 skipping to change at line 102
XCM_EDID_ERROR_e XcmEdidParse ( void * edid, XCM_EDID_ERROR_e XcmEdidParse ( void * edid,
XcmEdidKeyValue_s** list, XcmEdidKeyValue_s** list,
int * count ); int * count );
XCM_EDID_ERROR_e XcmEdidFree ( XcmEdidKeyValue_s** list ); XCM_EDID_ERROR_e XcmEdidFree ( XcmEdidKeyValue_s** list );
const char * XcmEdidErrorToString(XCM_EDID_ERROR_e error ); const char * XcmEdidErrorToString(XCM_EDID_ERROR_e error );
/* convinience functions */ /* convinience functions */
XCM_EDID_ERROR_e XcmEdidPrintString ( void * edid, XCM_EDID_ERROR_e XcmEdidPrintString ( void * edid,
char ** text, char ** text,
void *(*alloc)(size_t sz ) ); void *(*alloc)(size_t sz ) );
/** \addtogroup XcmEdidParse
*
* @{
*/
/** full length vendor, string */ /** full length vendor, string */
#define XCM_EDID_KEY_VENDOR "vendor" #define XCM_EDID_KEY_VENDOR "vendor"
/** full length device model, string */ /** full length device model, string */
#define XCM_EDID_KEY_MODEL "model" #define XCM_EDID_KEY_MODEL "model"
/** full length device serial number, string */ /** full length device serial number, string */
#define XCM_EDID_KEY_SERIAL "serial" #define XCM_EDID_KEY_SERIAL "serial"
/** colorimetric primary red CIE*xyY x component, double */ /** colorimetric primary red CIE*xyY x component, double */
#define XCM_EDID_KEY_REDx "redx" #define XCM_EDID_KEY_REDx "redx"
/** colorimetric primary red CIE*xyY y component, double */ /** colorimetric primary red CIE*xyY y component, double */
#define XCM_EDID_KEY_REDy "redy" #define XCM_EDID_KEY_REDy "redy"
 End of changes. 3 change blocks. 
7 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/