[haiku-commits] r41089 - in haiku/trunk/src/add-ons/accelerants/radeon_hd: . atombios atombios/includes
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 23 Mar 2011 00:00:28 +0100 (CET)
Author: kallisti5
Date: 2011-03-23 00:00:27 +0100 (Wed, 23 Mar 2011)
New Revision: 41089
Changeset: https://dev.haiku-os.org/changeset/41089
Added:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
Log:
working towards making AtomBios compile under Haiku, almost there
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile 2011-03-22
22:58:26 UTC (rev 41088)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile 2011-03-22
23:00:27 UTC (rev 41089)
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
+SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
+
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
@@ -11,7 +13,7 @@
engine.cpp
hooks.cpp
mode.cpp
- : be libaccelerantscommon.a
+ : be libaccelerantscommon.a atombios.a
;
Package haiku-radeon_hd-cvs :
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
2011-03-22 22:58:26 UTC (rev 41088)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
2011-03-22 23:00:27 UTC (rev 41089)
@@ -40,6 +40,9 @@
#include "CD_binding.h"
#include "CD_Common_Types.h"
+
+#define DISABLE_EASF
+
#ifndef DISABLE_EASF
#include "easf.h"
#endif
Added: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
(rev 0)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
2011-03-22 23:00:27 UTC (rev 41089)
@@ -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
+;
+
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
===================================================================
---
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
2011-03-22 22:58:26 UTC (rev 41088)
+++
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
2011-03-22 23:00:27 UTC (rev 41089)
@@ -37,34 +37,11 @@
#ifndef _COMMON_TYPES_H_
#define _COMMON_TYPES_H_
- #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;
+#if defined (__HAIKU__)
+ // It's how we roll
+ #include <stdint.h>
#endif
- typedef unsigned short uint16_t;
- typedef signed short int16_t;
- #endif
+
#ifndef UEFI_BUILD
typedef signed int intn_t;
typedef unsigned int uintn_t;
@@ -74,9 +51,6 @@
typedef unsigned int uintn_t;
#endif
#endif
-#ifndef FGL_LINUX
-#pragma warning ( disable : 4142 )
-#endif
#ifndef VOID
@@ -148,9 +122,6 @@
//typedef UINTN CD_STATUS;
-#ifndef FGL_LINUX
-#pragma warning ( default : 4142 )
-#endif
#endif // _COMMON_TYPES_H_
// EOF
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
===================================================================
---
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
2011-03-22 22:58:26 UTC (rev 41088)
+++
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
2011-03-22 23:00:27 UTC (rev 41089)
@@ -47,13 +47,13 @@
typedef UINT16 TABLE_UNIT_TYPE;
#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_MINOR_REVISION 0
//#include "atombios.h"
-#if (PARSER_TYPE==DRIVER_TYPE_PARSER)
+#if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
#ifdef FGL_LINUX
#pragma pack(push,1)
#else
@@ -457,7 +457,7 @@
UINT8 csize;
} INDIRECT_IO_PARSER_COMMANDS;
-#if (PARSER_TYPE==DRIVER_TYPE_PARSER)
+#if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
#pragma pack(pop)
#endif
Other related posts:
