working towards making AtomBios compile under Haiku, almost there

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41089 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-03-22 23:00:27 +00:00
parent 9ae5efb10b
commit e940d6c348
5 changed files with 25 additions and 37 deletions
+3 -1
View File
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src add-ons accelerants radeon_hd ; SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ; UsePrivateHeaders graphics ;
@@ -11,7 +13,7 @@ Addon radeon_hd.accelerant :
engine.cpp engine.cpp
hooks.cpp hooks.cpp
mode.cpp mode.cpp
: be libaccelerantscommon.a : be libaccelerantscommon.a atombios.a
; ;
Package haiku-radeon_hd-cvs : Package haiku-radeon_hd-cvs :
@@ -40,6 +40,9 @@ Revision History:
#include "CD_binding.h" #include "CD_binding.h"
#include "CD_Common_Types.h" #include "CD_Common_Types.h"
#define DISABLE_EASF
#ifndef DISABLE_EASF #ifndef DISABLE_EASF
#include "easf.h" #include "easf.h"
#endif #endif
@@ -0,0 +1,12 @@
SubDir HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
UseHeaders [ FDirName $(SUBDIR) includes ] ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics radeon_hd ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
StaticLibrary atombios.a :
Decoder.c
CD_Operations.c
;
@@ -37,34 +37,11 @@ Revision History:
#ifndef _COMMON_TYPES_H_ #ifndef _COMMON_TYPES_H_
#define _COMMON_TYPES_H_ #define _COMMON_TYPES_H_
#ifndef LINUX #if defined (__HAIKU__)
#if _MSC_EXTENSIONS // It's how we roll
#include <stdint.h>
//
// 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 #endif
typedef unsigned short uint16_t;
typedef signed short int16_t;
#endif
#ifndef UEFI_BUILD #ifndef UEFI_BUILD
typedef signed int intn_t; typedef signed int intn_t;
typedef unsigned int uintn_t; typedef unsigned int uintn_t;
@@ -74,9 +51,6 @@ Revision History:
typedef unsigned int uintn_t; typedef unsigned int uintn_t;
#endif #endif
#endif #endif
#ifndef FGL_LINUX
#pragma warning ( disable : 4142 )
#endif
#ifndef VOID #ifndef VOID
@@ -148,9 +122,6 @@ typedef unsigned long ULONG_PTR;
//typedef UINTN CD_STATUS; //typedef UINTN CD_STATUS;
#ifndef FGL_LINUX
#pragma warning ( default : 4142 )
#endif
#endif // _COMMON_TYPES_H_ #endif // _COMMON_TYPES_H_
// EOF // EOF
@@ -47,13 +47,13 @@ typedef UINT16* PTABLE_UNIT_TYPE;
typedef UINT16 TABLE_UNIT_TYPE; typedef UINT16 TABLE_UNIT_TYPE;
#endif #endif
#include <regsdef.h> //This important file is dynamically generated based on the ASIC!!!! #include "regsdef.h" //This important file is dynamically generated based on the ASIC!!!!
#define PARSER_MAJOR_REVISION 5 #define PARSER_MAJOR_REVISION 5
#define PARSER_MINOR_REVISION 0 #define PARSER_MINOR_REVISION 0
//#include "atombios.h" //#include "atombios.h"
#if (PARSER_TYPE==DRIVER_TYPE_PARSER) #if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
#ifdef FGL_LINUX #ifdef FGL_LINUX
#pragma pack(push,1) #pragma pack(push,1)
#else #else
@@ -457,7 +457,7 @@ typedef struct _INDIRECT_IO_PARSER_COMMANDS
UINT8 csize; UINT8 csize;
} INDIRECT_IO_PARSER_COMMANDS; } INDIRECT_IO_PARSER_COMMANDS;
#if (PARSER_TYPE==DRIVER_TYPE_PARSER) #if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
#pragma pack(pop) #pragma pack(pop)
#endif #endif