Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce changes on vendor sources, reverted and reworked; put Decoder.c back to stock moving define into Jamfile; put single ifdef wraper around un-needed typedefs; Move SubInclude to bottom of Jamfile;

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41095 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV 2011-03-24 02:02:02 +00:00
parent 8066fbc766
commit 682f910a4c
4 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/accelerants/radeon_hd/Jamfile
View File

@ -1,7 +1,5 @@
SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
@ -16,7 +14,4 @@ Addon radeon_hd.accelerant :
: be libaccelerantscommon.a atombios.a
;
Package haiku-radeon_hd-cvs :
radeon_hd.accelerant :
boot home config add-ons accelerants ;
SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;

3
src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
View File

@ -40,9 +40,6 @@ Revision History:
#include "CD_binding.h"
#include "CD_Common_Types.h"
#define DISABLE_EASF
#ifndef DISABLE_EASF
#include "easf.h"
#endif

3
src/add-ons/accelerants/radeon_hd/atombios/Jamfile
View File

@ -5,8 +5,9 @@ UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics radeon_hd ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
DEFINES += DISABLE_EASF ;
StaticLibrary atombios.a :
Decoder.c
CD_Operations.c
;

43
src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
View File

@ -37,10 +37,41 @@ Revision History:
#ifndef _COMMON_TYPES_H_
#define _COMMON_TYPES_H_
#if defined (__HAIKU__)
// It's how we roll
#include <stdint.h>
// HAIKU_ADDITION START IF
#if defined(__HAIKU__)
#include <stdint.h>
#else
#ifndef LINUX
#if _MSC_EXTENSIONS
//
// use Microsoft* C complier dependent interger width types
//
// typedef unsigned __int64 uint64_t;
// typedef __int64 int64_t;
typedef unsigned __int32 uint32_t;
typedef __int32 int32_t;
#elif defined (__linux__) || defined (__NetBSD__) \
|| defined(__sun) || defined(__OpenBSD__) \
|| defined (__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__)
typedef unsigned int uint32_t;
typedef int int32_t;
#else
typedef unsigned long uint32_t;
typedef signed long int32_t;
#endif
typedef unsigned char uint8_t;
#if (defined(__sun) && defined(_CHAR_IS_SIGNED))
typedef char int8_t;
#else
typedef signed char int8_t;
#endif
typedef unsigned short uint16_t;
typedef signed short int16_t;
#endif
#endif
// HAIKU_ADDITION ENDIF
#ifndef UEFI_BUILD
typedef signed int intn_t;
@ -51,6 +82,9 @@ Revision History:
typedef unsigned int uintn_t;
#endif
#endif
#ifndef FGL_LINUX
#pragma warning ( disable : 4142 )
#endif
#ifndef VOID
@ -122,6 +156,9 @@ typedef unsigned long ULONG_PTR;
//typedef UINTN CD_STATUS;
#ifndef FGL_LINUX
#pragma warning ( default : 4142 )
#endif
#endif // _COMMON_TYPES_H_
// EOF