directfb: headers diff between 1.2.6 and 1.2.7 versions

	core_parts.h	core_parts.h

	skipping to change at line 48	skipping to change at line 48
	#include <core/coredefs.h>	#include <core/coredefs.h>

	typedef DFBResult (CoreInitialize)( CoreDFB core,	typedef DFBResult (CoreInitialize)( CoreDFB core,
	void *data_local,	void *data_local,
	void *data_shared );	void *data_shared );

	typedef DFBResult (CoreJoin) ( CoreDFB core,	typedef DFBResult (CoreJoin) ( CoreDFB core,
	void *data_local,	void *data_local,
	void *data_shared );	void *data_shared );


	typedef DFBResult (CoreShutdown) ( CoreDFB core,	typedef DFBResult (CoreShutdown) ( void data_local,
	bool emergency );	bool emergency );


	typedef DFBResult (CoreLeave) ( CoreDFB core,	typedef DFBResult (CoreLeave) ( void data_local,
	bool emergency );	bool emergency );


	typedef DFBResult (CoreSuspend) ( CoreDFB core );	typedef DFBResult (CoreSuspend) ( void data_local );


	typedef DFBResult (CoreResume) ( CoreDFB core );	typedef DFBResult (CoreResume) ( void data_local );

	typedef struct {	typedef struct {
	const char *name;	const char *name;

	int size_local;	int size_local;
	int size_shared;	int size_shared;

	CoreInitialize Initialize;	CoreInitialize Initialize;
	CoreJoin Join;	CoreJoin Join;
	CoreShutdown Shutdown;	CoreShutdown Shutdown;

	skipping to change at line 94	skipping to change at line 94
	CorePart *core_part,	CorePart *core_part,
	bool emergency );	bool emergency );

	DFBResult dfb_core_part_leave ( CoreDFB *core,	DFBResult dfb_core_part_leave ( CoreDFB *core,
	CorePart *core_part,	CorePart *core_part,
	bool emergency );	bool emergency );

	#define DFB_CORE_PART(part,Type) \	#define DFB_CORE_PART(part,Type) \
	\	\
	static DFBResult dfb_##part##_initialize( CoreDFB *core, \	static DFBResult dfb_##part##_initialize( CoreDFB *core, \

	DFB##Type *data, \	DFB##Type *local, \
	DFB##Type##Shared *shared ); \	DFB##Type##Shared *shared ); \
	\	\
	static DFBResult dfb_##part##_join ( CoreDFB *core, \	static DFBResult dfb_##part##_join ( CoreDFB *core, \

	DFB##Type *data, \	DFB##Type *local, \
	DFB##Type##Shared *shared ); \	DFB##Type##Shared *shared ); \
	\	\

	static DFBResult dfb_##part##_shutdown ( DFB##Type *data, \	static DFBResult dfb_##part##_shutdown ( DFB##Type *local, \
	bool emergency ); \	bool emergency ); \
	\	\
	static DFBResult dfb_##part##_leave ( DFB##Type *local, \	static DFBResult dfb_##part##_leave ( DFB##Type *local, \
	bool emergency ); \	bool emergency ); \
	\	\
	static DFBResult dfb_##part##_suspend ( DFB##Type *local ); \	static DFBResult dfb_##part##_suspend ( DFB##Type *local ); \
	\	\
	static DFBResult dfb_##part##_resume ( DFB##Type *local ); \	static DFBResult dfb_##part##_resume ( DFB##Type *local ); \
	\	\
	CorePart dfb_##part = { \	CorePart dfb_##part = { \

	#part, \	.name = #part, \
	\	\

	sizeof(DFB##Type),	.size_local = sizeof(DFB##Type),
	\	\
	sizeof(DFB##Type##Shared),	.size_shared = sizeof(DFB##Type##Shared),
	\	\
	\	\

	(void*)dfb_##part##_initialize,	.Initialize = (void*)dfb_##part##_initialize,
	\	\
	(void*)dfb_##part##_join,	.Join = (void*)dfb_##part##_join,
	\	\
	(void*)dfb_##part##_shutdown,	.Shutdown = (void*)dfb_##part##_shutdown,
	\	\
	(void*)dfb_##part##_leave,	.Leave = (void*)dfb_##part##_leave,
	\	\
	(void*)dfb_##part##_suspend,	.Suspend = (void*)dfb_##part##_suspend,
	\	\
	(void*)dfb_##part##_resume	.Resume = (void*)dfb_##part##_resume,
	\	\
	}	}

	#endif	#endif

End of changes. 10 change blocks.
	24 lines changed or deleted	24 lines changed or added

	core_system.h	core_system.h

	skipping to change at line 50	skipping to change at line 50
	static DFBResult	static DFBResult
	system_join( CoreDFB core, void *data );	system_join( CoreDFB core, void *data );

	static DFBResult	static DFBResult
	system_shutdown( bool emergency );	system_shutdown( bool emergency );

	static DFBResult	static DFBResult
	system_leave( bool emergency );	system_leave( bool emergency );

	static DFBResult	static DFBResult

	system_suspend();	system_suspend( void );

	static DFBResult	static DFBResult

	system_resume();	system_resume( void );

	static VideoMode*	static VideoMode*

	system_get_modes();	system_get_modes( void );

	static VideoMode*	static VideoMode*

	system_get_current_mode();	system_get_current_mode( void );

	static DFBResult	static DFBResult

	system_thread_init();	system_thread_init( void );

	static bool	static bool
	system_input_filter( CoreInputDevice *device,	system_input_filter( CoreInputDevice *device,
	DFBInputEvent *event );	DFBInputEvent *event );

	static volatile void*	static volatile void*
	system_map_mmio( unsigned int offset,	system_map_mmio( unsigned int offset,
	int length );	int length );

	static void	static void
	system_unmap_mmio( volatile void *addr,	system_unmap_mmio( volatile void *addr,
	int length );	int length );

	static int	static int

	system_get_accelerator();	system_get_accelerator( void );

	static unsigned long	static unsigned long
	system_video_memory_physical( unsigned int offset );	system_video_memory_physical( unsigned int offset );

	static void*	static void*
	system_video_memory_virtual( unsigned int offset );	system_video_memory_virtual( unsigned int offset );

	static unsigned int	static unsigned int

	system_videoram_length();	system_videoram_length( void );

	static unsigned long	static unsigned long
	system_aux_memory_physical( unsigned int offset );	system_aux_memory_physical( unsigned int offset );

	static void*	static void*
	system_aux_memory_virtual( unsigned int offset );	system_aux_memory_virtual( unsigned int offset );

	static unsigned int	static unsigned int

	system_auxram_length();	system_auxram_length( void );

	static void	static void

	system_get_busid();	system_get_busid( int ret_bus, int ret_dev, int *ret_func );

	static void	static void

	system_get_deviceid();	system_get_deviceid( unsigned int ret_vendor_id, unsigned int ret_device_ id );

	static CoreSystemFuncs system_funcs = {	static CoreSystemFuncs system_funcs = {
	.GetSystemInfo = system_get_info,	.GetSystemInfo = system_get_info,
	.Initialize = system_initialize,	.Initialize = system_initialize,
	.Join = system_join,	.Join = system_join,
	.Shutdown = system_shutdown,	.Shutdown = system_shutdown,
	.Leave = system_leave,	.Leave = system_leave,
	.Suspend = system_suspend,	.Suspend = system_suspend,
	.Resume = system_resume,	.Resume = system_resume,
	.GetModes = system_get_modes,	.GetModes = system_get_modes,

	skipping to change at line 128	skipping to change at line 128
	.VideoMemoryPhysical = system_video_memory_physical,	.VideoMemoryPhysical = system_video_memory_physical,
	.VideoMemoryVirtual = system_video_memory_virtual,	.VideoMemoryVirtual = system_video_memory_virtual,
	.VideoRamLength = system_videoram_length,	.VideoRamLength = system_videoram_length,
	.AuxMemoryPhysical = system_aux_memory_physical,	.AuxMemoryPhysical = system_aux_memory_physical,
	.AuxMemoryVirtual = system_aux_memory_virtual,	.AuxMemoryVirtual = system_aux_memory_virtual,
	.AuxRamLength = system_auxram_length,	.AuxRamLength = system_auxram_length,
	.GetBusID = system_get_busid,	.GetBusID = system_get_busid,
	.GetDeviceID = system_get_deviceid	.GetDeviceID = system_get_deviceid
	};	};


	#define DFB_CORE_SYSTEM(shortname) \	#define DFB_CORE_SYSTEM(shortname) \
	__attribute__((constructor)) void directfb_##shortname(); \	__attribute__((constructor)) void directfb_##shortname( void ); \
	\	\
	void \	void \
	directfb_##shortname() \	directfb_##shortname( void ) \
	{ \	{ \
	direct_modules_register( &dfb_core_systems, \	direct_modules_register( &dfb_core_systems, \
	DFB_CORE_SYSTEM_ABI_VERSION, \	DFB_CORE_SYSTEM_ABI_VERSION, \
	#shortname, &system_funcs ); \	#shortname, &system_funcs ); \
	}	}

	#endif	#endif

End of changes. 11 change blocks.
	19 lines changed or deleted	19 lines changed or added

	directfb.h	directfb.h

	skipping to change at line 3083	skipping to change at line 3083
	DSPD_SRC_ATOP = 9, /* fs: da fd: 1.0-sa */	DSPD_SRC_ATOP = 9, /* fs: da fd: 1.0-sa */
	DSPD_DST_ATOP = 10, /* fs: 1.0-da fd: sa */	DSPD_DST_ATOP = 10, /* fs: 1.0-da fd: sa */
	DSPD_ADD = 11, /* fs: 1.0 fd: 1.0 */	DSPD_ADD = 11, /* fs: 1.0 fd: 1.0 */
	DSPD_XOR = 12, /* fs: 1.0-da fd: 1.0-sa */	DSPD_XOR = 12, /* fs: 1.0-da fd: 1.0-sa */
	} DFBSurfacePorterDuffRule;	} DFBSurfacePorterDuffRule;

	/*	/*
	* Blend functions to use for source and destination blending	* Blend functions to use for source and destination blending
	*/	*/
	typedef enum {	typedef enum {

	DSBF_UNKNOWN = 0, /* */	/*
	DSBF_ZERO = 1, /* */	* pixel color = sc * cf[sf] + dc * cf[df]
	DSBF_ONE = 2, /* */	* pixel alpha = sa * af[sf] + da * af[df]
	DSBF_SRCCOLOR = 3, /* */	* sc = source color
	DSBF_INVSRCCOLOR = 4, /* */	* sa = source alpha
	DSBF_SRCALPHA = 5, /* */	* dc = destination color
	DSBF_INVSRCALPHA = 6, /* */	* da = destination alpha
	DSBF_DESTALPHA = 7, /* */	* sf = source blend function
	DSBF_INVDESTALPHA = 8, /* */	* df = destination blend function
	DSBF_DESTCOLOR = 9, /* */	* cf[x] = color factor for blend function x
	DSBF_INVDESTCOLOR = 10, /* */	* af[x] = alpha factor for blend function x
	DSBF_SRCALPHASAT = 11 /* */	*/
		DSBF_UNKNOWN = 0, /* */
		DSBF_ZERO = 1, /* cf: 0 af: 0 */
		DSBF_ONE = 2, /* cf: 1 af: 1 */
		DSBF_SRCCOLOR = 3, /* cf: sc af: sa */
		DSBF_INVSRCCOLOR = 4, /* cf: 1-sc af: 1-sa */
		DSBF_SRCALPHA = 5, /* cf: sa af: sa */
		DSBF_INVSRCALPHA = 6, /* cf: 1-sa af: 1-sa */
		DSBF_DESTALPHA = 7, /* cf: da af: da */
		DSBF_INVDESTALPHA = 8, /* cf: 1-da af: 1-da */
		DSBF_DESTCOLOR = 9, /* cf: dc af: da */
		DSBF_INVDESTCOLOR = 10, /* cf: 1-dc af: 1-da */
		DSBF_SRCALPHASAT = 11, /* cf: min(sa, 1-da) af: 1 */
	} DFBSurfaceBlendFunction;	} DFBSurfaceBlendFunction;

	/*	/*
	* Transformed vertex of a textured triangle.	* Transformed vertex of a textured triangle.
	*/	*/
	typedef struct {	typedef struct {
	float x; /* Destination X coordinate (in pixels) */	float x; /* Destination X coordinate (in pixels) */
	float y; /* Destination Y coordinate (in pixels) */	float y; /* Destination Y coordinate (in pixels) */
	float z; /* Z coordinate */	float z; /* Z coordinate */
	float w; /* W coordinate */	float w; /* W coordinate */

End of changes. 1 change blocks.
	12 lines changed or deleted	24 lines changed or added

	directfb_version.h	directfb_version.h

	skipping to change at line 34	skipping to change at line 34
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __DIRECTFB_VERSION_H__	#ifndef __DIRECTFB_VERSION_H__
	#define __DIRECTFB_VERSION_H__	#define __DIRECTFB_VERSION_H__

	#define DIRECTFB_MAJOR_VERSION (1)	#define DIRECTFB_MAJOR_VERSION (1)
	#define DIRECTFB_MINOR_VERSION (2)	#define DIRECTFB_MINOR_VERSION (2)

	#define DIRECTFB_MICRO_VERSION (6)	#define DIRECTFB_MICRO_VERSION (7)
	#define DIRECTFB_BINARY_AGE (6)	#define DIRECTFB_BINARY_AGE (7)
	#define DIRECTFB_INTERFACE_AGE (0)	#define DIRECTFB_INTERFACE_AGE (0)

	#endif /* __DIRECTFB_VERSION_H__ */	#endif /* __DIRECTFB_VERSION_H__ */

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	fbdev.h	fbdev.h

	skipping to change at line 121	skipping to change at line 121

	VirtualTerminal *vt;	VirtualTerminal *vt;

	AGPDevice *agp;	AGPDevice *agp;
	} FBDev;	} FBDev;

	/*	/*
	* core init function, opens /dev/fb, get fbdev screeninfo	* core init function, opens /dev/fb, get fbdev screeninfo
	* disables font acceleration, reads mode list	* disables font acceleration, reads mode list
	*/	*/

	DFBResult dfb_fbdev_initialize();	DFBResult dfb_fbdev_initialize( void );
	DFBResult dfb_fbdev_join();	DFBResult dfb_fbdev_join( void );

	/*	/*
	* deinitializes DirectFB fbdev stuff and restores fbdev settings	* deinitializes DirectFB fbdev stuff and restores fbdev settings
	*/	*/
	DFBResult dfb_fbdev_shutdown( bool emergency );	DFBResult dfb_fbdev_shutdown( bool emergency );
	DFBResult dfb_fbdev_leave ( bool emergency );	DFBResult dfb_fbdev_leave ( bool emergency );


		const VideoMode *dfb_fbdev_find_mode( int width,
		int height )
		;
	DFBResult dfb_fbdev_test_mode ( const VideoMode *mode,	DFBResult dfb_fbdev_test_mode ( const VideoMode *mode,
	const CoreLayerRegionConfig *config ) ;	const CoreLayerRegionConfig *config ) ;
	DFBResult dfb_fbdev_test_mode_simple( const VideoMode *mode );	DFBResult dfb_fbdev_test_mode_simple( const VideoMode *mode );

	DFBResult dfb_fbdev_set_mode ( const VideoMode *mode,	DFBResult dfb_fbdev_set_mode ( const VideoMode *mode,

	const CoreSurfaceConfig *config )	CoreSurface *surface,
	;	unsigned int xoffset,
		unsigned int yoffset
		);

	#endif	#endif

End of changes. 3 change blocks.
	4 lines changed or deleted	9 lines changed or added

	input_driver.h	input_driver.h

	skipping to change at line 35	skipping to change at line 35
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __INPUT_DRIVER_H__	#ifndef __INPUT_DRIVER_H__
	#define __INPUT_DRIVER_H__	#define __INPUT_DRIVER_H__

	#include <core/input.h>	#include <core/input.h>

	static int	static int

	driver_get_available();	driver_get_available( void );

	static void	static void
	driver_get_info( InputDriverInfo *info );	driver_get_info( InputDriverInfo *info );

	static DFBResult	static DFBResult
	driver_open_device( CoreInputDevice *device,	driver_open_device( CoreInputDevice *device,
	unsigned int number,	unsigned int number,
	InputDeviceInfo *info,	InputDeviceInfo *info,
	void **driver_data );	void **driver_data );


	skipping to change at line 75	skipping to change at line 75
	.OpenDevice = driver_open_device,	.OpenDevice = driver_open_device,
	.GetKeymapEntry = driver_get_keymap_entry,	.GetKeymapEntry = driver_get_keymap_entry,
	.CloseDevice = driver_close_device,	.CloseDevice = driver_close_device,

	#ifdef DFB_INPUTDRIVER_HAS_AXIS_INFO	#ifdef DFB_INPUTDRIVER_HAS_AXIS_INFO
	.GetAxisInfo = driver_get_axis_info	.GetAxisInfo = driver_get_axis_info
	#endif	#endif
	};	};

	#define DFB_INPUT_DRIVER(shortname) \	#define DFB_INPUT_DRIVER(shortname) \

	__attribute__((constructor)) void directfb_##shortname();	__attribute__((constructor)) void directfb_##shortname##_ctor( void );
	\	\
		__attribute__((destructor)) void directfb_##shortname##_dtor( void );
		\
	\	\
	void \	void \

	directfb_##shortname() \	directfb_##shortname##_ctor( void ) \
	{ \	{ \
	direct_modules_register( &dfb_input_modules, DFB_INPUT_DRIVER_ABI_VERS ION, \	direct_modules_register( &dfb_input_modules, DFB_INPUT_DRIVER_ABI_VERS ION, \
	#shortname, &driver_funcs ); \	#shortname, &driver_funcs ); \

		}
		\

		\
		void
		\
		directfb_##shortname##_dtor( void )
		\
		{
		\
		direct_modules_unregister( &dfb_input_modules, #shortname );
		\
	}	}

	#endif	#endif

End of changes. 4 change blocks.
	4 lines changed or deleted	18 lines changed or added

	interface.h	interface.h

	skipping to change at line 122	skipping to change at line 122
	/*	/*
	* Called by implementation modules during 'dlopen'ing or at startup if lin ked	* Called by implementation modules during 'dlopen'ing or at startup if lin ked
	* into the executable.	* into the executable.
	*/	*/
	void DirectRegisterInterface( DirectInterfaceFuncs *funcs );	void DirectRegisterInterface( DirectInterfaceFuncs *funcs );

	void DirectUnregisterInterface( DirectInterfaceFuncs *funcs );	void DirectUnregisterInterface( DirectInterfaceFuncs *funcs );

	void direct_print_interface_leaks(void);	void direct_print_interface_leaks(void);


	#if DIRECT_BUILD_DEBUG \|\| defined(DIRECT_ENABLE_DEBUG) \|\| defined(DIRECT_FO	#if DIRECT_BUILD_DEBUGS
	RCE_DEBUG)

	#if !DIRECT_BUILD_DEBUGS
	#error Building with debug, but library headers suggest that debug is not s
	upported.
	#endif

	void direct_dbg_interface_add ( const char *func,	void direct_dbg_interface_add ( const char *func,
	const char *file,	const char *file,
	int line,	int line,
	const char *what,	const char *what,
	const void *interface,	const void *interface,
	const char *name );	const char *name );

	void direct_dbg_interface_remove( const char *func,	void direct_dbg_interface_remove( const char *func,
	const char *file,	const char *file,
	int line,	int line,
	const char *what,	const char *what,
	const void *interface );	const void *interface );

		#endif

		#if DIRECT_BUILD_DEBUG \|\| defined(DIRECT_ENABLE_DEBUG) \|\| defined(DIRECT_FO
		RCE_DEBUG)

		#if !DIRECT_BUILD_DEBUGS
		#error Building with debug, but library headers suggest that debug is not s
		upported.
		#endif

	#define DIRECT_DBG_INTERFACE_ADD direct_dbg_interface_add	#define DIRECT_DBG_INTERFACE_ADD direct_dbg_interface_add
	#define DIRECT_DBG_INTERFACE_REMOVE direct_dbg_interface_remove	#define DIRECT_DBG_INTERFACE_REMOVE direct_dbg_interface_remove

	#else	#else

	#define DIRECT_DBG_INTERFACE_ADD(func,file,line,what,interface,name) do {} while (0)	#define DIRECT_DBG_INTERFACE_ADD(func,file,line,what,interface,name) do {} while (0)
	#define DIRECT_DBG_INTERFACE_REMOVE(func,file,line,what,interface) do {} while (0)	#define DIRECT_DBG_INTERFACE_REMOVE(func,file,line,what,interface) do {} while (0)

	#endif	#endif

End of changes. 2 change blocks.
	8 lines changed or deleted	10 lines changed or added

	interface_implementation.h	interface_implementation.h

	skipping to change at line 69	skipping to change at line 69
	\	\
	static DirectResult \	static DirectResult \
	Allocate( void **interface ) \	Allocate( void **interface ) \
	{ \	{ \
	DIRECT_ALLOCATE_INTERFACE( *interface, type ); \	DIRECT_ALLOCATE_INTERFACE( *interface, type ); \
	return DR_OK; \	return DR_OK; \
	} \	} \
	\	\
	__attribute__((constructor)) \	__attribute__((constructor)) \
	void \	void \

		type##_##impl##_ctor(void); \
		\
		__attribute__((constructor)) \
		void \
	type##_##impl##_ctor(void) \	type##_##impl##_ctor(void) \
	{ \	{ \
	DirectRegisterInterface( &interface_funcs ); \	DirectRegisterInterface( &interface_funcs ); \
	} \	} \
	\	\
	__attribute__((destructor)) \	__attribute__((destructor)) \
	void \	void \

		type##_##impl##_dtor(void); \
		\
		__attribute__((destructor)) \
		void \
	type##_##impl##_dtor(void) \	type##_##impl##_dtor(void) \
	{ \	{ \
	DirectUnregisterInterface( &interface_funcs ); \	DirectUnregisterInterface( &interface_funcs ); \
	}	}

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	8 lines changed or added

	layers.h	layers.h

	skipping to change at line 127	skipping to change at line 127

	CLRCF_ALL = 0xB013377F	CLRCF_ALL = 0xB013377F
	} CoreLayerRegionConfigFlags;	} CoreLayerRegionConfigFlags;

	typedef struct {	typedef struct {
	/ Driver Control /	/ Driver Control /

	/*	/*
	* Return size of layer data (shared memory).	* Return size of layer data (shared memory).
	*/	*/

	int (*LayerDataSize) ();	int (*LayerDataSize) ( void );

	/*	/*
	* Return size of region data (shared memory).	* Return size of region data (shared memory).
	*/	*/

	int (*RegionDataSize)();	int (*RegionDataSize)( void );

	/*	/*
	* Called once by the master to initialize layer data and reset hardwa re.	* Called once by the master to initialize layer data and reset hardwa re.
	* Return layer description, default configuration and color adjustmen t.	* Return layer description, default configuration and color adjustmen t.
	*/	*/
	DFBResult (InitLayer) ( CoreLayer layer,	DFBResult (InitLayer) ( CoreLayer layer,
	void *driver_data,	void *driver_data,
	void *layer_data,	void *layer_data,
	DFBDisplayLayerDescription *description,	DFBDisplayLayerDescription *description,
	DFBDisplayLayerConfig *config,	DFBDisplayLayerConfig *config,

	skipping to change at line 332	skipping to change at line 332
	CoreLayer dfb_layers_replace_primary( CoreGraphicsDevice device,	CoreLayer dfb_layers_replace_primary( CoreGraphicsDevice device,
	void *driver_data,	void *driver_data,
	DisplayLayerFuncs *funcs );	DisplayLayerFuncs *funcs );

	typedef DFBEnumerationResult (DisplayLayerCallback) (CoreLayer layer,	typedef DFBEnumerationResult (DisplayLayerCallback) (CoreLayer layer,
	void *ctx);	void *ctx);

	void dfb_layers_enumerate( DisplayLayerCallback callback,	void dfb_layers_enumerate( DisplayLayerCallback callback,
	void *ctx );	void *ctx );


	int dfb_layer_num();	int dfb_layer_num( void );

	CoreLayer *dfb_layer_at( DFBDisplayLayerID id );	CoreLayer *dfb_layer_at( DFBDisplayLayerID id );

	CoreLayer *dfb_layer_at_translated( DFBDisplayLayerID id );	CoreLayer *dfb_layer_at_translated( DFBDisplayLayerID id );

	void dfb_layer_get_description( const CoreLayer *layer,	void dfb_layer_get_description( const CoreLayer *layer,
	DFBDisplayLayerDescription *desc );	DFBDisplayLayerDescription *desc );

	CoreScreen dfb_layer_screen( const CoreLayer layer );	CoreScreen dfb_layer_screen( const CoreLayer layer );

	CardState dfb_layer_state( CoreLayer layer );	CardState dfb_layer_state( CoreLayer layer );

	DFBDisplayLayerID dfb_layer_id( const CoreLayer *layer );	DFBDisplayLayerID dfb_layer_id( const CoreLayer *layer );

	DFBDisplayLayerID dfb_layer_id_translated( const CoreLayer *layer );	DFBDisplayLayerID dfb_layer_id_translated( const CoreLayer *layer );


	DFBSurfacePixelFormat dfb_primary_layer_pixelformat();	DFBSurfacePixelFormat dfb_primary_layer_pixelformat( void );

	#endif	#endif

End of changes. 4 change blocks.
	4 lines changed or deleted	4 lines changed or added

	memcpy.h	memcpy.h

	skipping to change at line 42	skipping to change at line 42
	#include <stdlib.h>	#include <stdlib.h>
	#include <string.h>	#include <string.h>

	void direct_find_best_memcpy( void );	void direct_find_best_memcpy( void );
	void direct_print_memcpy_routines( void );	void direct_print_memcpy_routines( void );

	extern void (direct_memcpy)( void to, const void from, size_t len );	extern void (direct_memcpy)( void to, const void from, size_t len );

	static __inline__ void direct_memmove( void to, const void *from, size_t len )	static __inline__ void direct_memmove( void to, const void *from, size_t len )
	{	{

	if ((from < to && ((char) from + len) < ((char) to)) \|\|	if ((from < to && ((const char) from + len) < ((char) to)) \|\|
	(((char) to + len) < ((char) from)))	(((char) to + len) < ((const char) from)))
	return direct_memcpy( to, from, len );	return direct_memcpy( to, from, len );
	else	else
	return memmove( to, from, len );	return memmove( to, from, len );
	}	}

	#endif	#endif

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	modules.h	modules.h

	skipping to change at line 73	skipping to change at line 73
	DirectLink *entries;	DirectLink *entries;

	DirectModuleEntry *loading;	DirectModuleEntry *loading;
	};	};

	#define DECLARE_MODULE_DIRECTORY(d) \	#define DECLARE_MODULE_DIRECTORY(d) \
	extern DirectModuleDir d	extern DirectModuleDir d

	#define DEFINE_MODULE_DIRECTORY(d,p,n) \	#define DEFINE_MODULE_DIRECTORY(d,p,n) \
	DirectModuleDir d = { \	DirectModuleDir d = { \

	lock: PTHREAD_MUTEX_INITIALIZER, \	.lock = PTHREAD_MUTEX_INITIALIZER, \
	path: MODULEDIR"/"p, \	.path = p, \
	abi_version: n, \	.abi_version = n, \
	entries: NULL, \	.entries = NULL, \
	loading: NULL \	.loading = NULL, \
	}	}

	int direct_modules_explore_directory( DirectModuleDir *directory );	int direct_modules_explore_directory( DirectModuleDir *directory );

	void direct_modules_register( DirectModuleDir *directory,	void direct_modules_register( DirectModuleDir *directory,
	unsigned int abi_version,	unsigned int abi_version,
	const char *name,	const char *name,
	const void *funcs );	const void *funcs );


		void direct_modules_unregister( DirectModuleDir *directory,
		const char *name );

	const void direct_module_ref ( DirectModuleEntry module );	const void direct_module_ref ( DirectModuleEntry module );
	void direct_module_unref( DirectModuleEntry *module );	void direct_module_unref( DirectModuleEntry *module );

	#endif	#endif

End of changes. 2 change blocks.
	5 lines changed or deleted	8 lines changed or added

	surface_pool.h	surface_pool.h

	skipping to change at line 68	skipping to change at line 68
	typedef struct {	typedef struct {
	CoreSurfacePoolCapabilities caps;	CoreSurfacePoolCapabilities caps;
	CoreSurfaceAccessFlags access;	CoreSurfaceAccessFlags access;
	CoreSurfaceTypeFlags types;	CoreSurfaceTypeFlags types;
	CoreSurfacePoolPriority priority;	CoreSurfacePoolPriority priority;
	char name[DFB_SURFACE_POOL_DESC_NAME_LENGTH];	char name[DFB_SURFACE_POOL_DESC_NAME_LENGTH];
	unsigned long size;	unsigned long size;
	} CoreSurfacePoolDescription;	} CoreSurfacePoolDescription;

	typedef struct {	typedef struct {

	int (*PoolDataSize)();	int (*PoolDataSize)( void );
	int (*PoolLocalDataSize)();	int (*PoolLocalDataSize)( void );
	int (*AllocationDataSize)();	int (*AllocationDataSize)( void );

	/*	/*
	* Pool init/destroy	* Pool init/destroy
	*/	*/
	DFBResult (InitPool) ( CoreDFB core,	DFBResult (InitPool) ( CoreDFB core,
	CoreSurfacePool *pool,	CoreSurfacePool *pool,
	void *pool_data,	void *pool_data,
	void *pool_local,	void *pool_local,
	void *system_data,	void *system_data,
	CoreSurfacePoolDescription *ret_desc );	CoreSurfacePoolDescription *ret_desc );

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	vt.h	vt.h

	skipping to change at line 64	skipping to change at line 64
	DirectThread *thread;	DirectThread *thread;
	pthread_mutex_t lock;	pthread_mutex_t lock;
	pthread_cond_t wait;	pthread_cond_t wait;

	int vt_sig;	int vt_sig;
	} VirtualTerminal;	} VirtualTerminal;

	/*	/*
	* allocates and switches to a new virtual terminal	* allocates and switches to a new virtual terminal
	*/	*/

	DFBResult dfb_vt_initialize();	DFBResult dfb_vt_initialize( void );
	DFBResult dfb_vt_join();	DFBResult dfb_vt_join( void );

	/*	/*
	* deallocates virtual terminal	* deallocates virtual terminal
	*/	*/
	DFBResult dfb_vt_shutdown( bool emergency );	DFBResult dfb_vt_shutdown( bool emergency );
	DFBResult dfb_vt_leave( bool emergency );	DFBResult dfb_vt_leave( bool emergency );

	DFBResult dfb_vt_detach( bool force );	DFBResult dfb_vt_detach( bool force );

	bool dfb_vt_switch( int num );	bool dfb_vt_switch( int num );

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	wm_module.h	wm_module.h

	skipping to change at line 245	skipping to change at line 245
	.RestackWindow = wm_restack_window,	.RestackWindow = wm_restack_window,
	.Grab = wm_grab,	.Grab = wm_grab,
	.Ungrab = wm_ungrab,	.Ungrab = wm_ungrab,
	.RequestFocus = wm_request_focus,	.RequestFocus = wm_request_focus,

	.UpdateStack = wm_update_stack,	.UpdateStack = wm_update_stack,
	.UpdateWindow = wm_update_window,	.UpdateWindow = wm_update_window,
	.UpdateCursor = wm_update_cursor	.UpdateCursor = wm_update_cursor
	};	};


	#define DFB_WINDOW_MANAGER(shortname) \	#define DFB_WINDOW_MANAGER(shortname) \
	__attribute__((constructor)) void directfbwm_##shortname(); \	__attribute__((constructor)) void directfbwm_##shortname( void ); \
	\	\
	void \	void \
	directfbwm_##shortname() \	directfbwm_##shortname( void ) \
	{ \	{ \
	direct_modules_register( &dfb_core_wm_modules, \	direct_modules_register( &dfb_core_wm_modules, \
	DFB_CORE_WM_ABI_VERSION, \	DFB_CORE_WM_ABI_VERSION, \
	#shortname, &wm_funcs ); \	#shortname, &wm_funcs ); \
	}	}

	#endif	#endif

End of changes. 1 change blocks.
	9 lines changed or deleted	9 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/

	graphics_driver.h	graphics_driver.h

	skipping to change at line 75	skipping to change at line 75
	static GraphicsDriverFuncs driver_funcs = {	static GraphicsDriverFuncs driver_funcs = {
	.Probe = driver_probe,	.Probe = driver_probe,
	.GetDriverInfo = driver_get_info,	.GetDriverInfo = driver_get_info,
	.InitDriver = driver_init_driver,	.InitDriver = driver_init_driver,
	.InitDevice = driver_init_device,	.InitDevice = driver_init_device,
	.CloseDevice = driver_close_device,	.CloseDevice = driver_close_device,
	.CloseDriver = driver_close_driver	.CloseDriver = driver_close_driver
	};	};

	#define DFB_GRAPHICS_DRIVER(shortname) \	#define DFB_GRAPHICS_DRIVER(shortname) \

	__attribute__((constructor)) void directfb_##shortname(); \	__attribute__((constructor)) void directfb_##shortname( void ); \
	\	\
	void \	void \

	directfb_##shortname() \	directfb_##shortname( void ) \
	{ \	{ \
	direct_modules_register( &dfb_graphics_drivers, \	direct_modules_register( &dfb_graphics_drivers, \
	DFB_GRAPHICS_DRIVER_ABI_VERSION, \	DFB_GRAPHICS_DRIVER_ABI_VERSION, \
	#shortname, &driver_funcs ); \	#shortname, &driver_funcs ); \
	}	}

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added