[haiku-commits] haiku: hrev47759 - headers/build src/add-ons/kernel/drivers/graphics/intel_extreme src/add-ons/kernel/busses/agp_gart headers/os/support
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 29 Aug 2014 09:38:02 +0200 (CEST)
hrev47759 adds 2 changesets to branch 'master'
old head: 72ec5a3630aa77a763c645e698c18259b8892953
new head: 2d5dbc78c4178166ef4459480e2fe528c39772bb
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=2d5dbc7+%5E72ec5a3
----------------------------------------------------------------------------
9e616c6: Fix HaikuBuildCompatibility to not define atmics anymore.
This reverts commit 34dbbb65fdfa4a70cd2c472731bb71b16385e29f.
Instead, we can remove thos from HaikuBuildCompatibility and things will work
fine, unless one try t build Haiku on BeOS (this isn't
supported anymore) or a very old Haiku which esdon't have those.
2d5dbc7: Add support for my Core i3 integrated graphics.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 6 insertions(+), 23 deletions(-)
headers/build/HaikuBuildCompatibility.h | 14 --------------
headers/os/support/SupportDefs.h | 7 -------
src/add-ons/kernel/busses/agp_gart/intel_gart.cpp | 4 +++-
.../kernel/drivers/graphics/intel_extreme/driver.cpp | 2 ++
.../drivers/graphics/intel_extreme/intel_extreme.cpp | 2 +-
############################################################################
Commit: 9e616c6b9ef12d2e707969857befc29b044dafce
URL: http://cgit.haiku-os.org/haiku/commit/?id=9e616c6
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Thu Aug 28 18:31:56 2014 UTC
Fix HaikuBuildCompatibility to not define atmics anymore.
This reverts commit 34dbbb65fdfa4a70cd2c472731bb71b16385e29f.
Instead, we can remove thos from HaikuBuildCompatibility and things will work
fine, unless one try t build Haiku on BeOS (this isn't
supported anymore) or a very old Haiku which esdon't have those.
----------------------------------------------------------------------------
diff --git a/headers/build/HaikuBuildCompatibility.h
b/headers/build/HaikuBuildCompatibility.h
index 833ab8d..7a852d4 100644
--- a/headers/build/HaikuBuildCompatibility.h
+++ b/headers/build/HaikuBuildCompatibility.h
@@ -119,20 +119,6 @@ struct media_node;
extern "C" {
#endif
-extern void atomic_set(int32* value, int32 newValue);
-extern int32 atomic_get_and_set(int32* value, int32 newValue);
-extern int32 atomic_test_and_set(int32 *value, int32 newValue,
- int32 testAgainst);
-extern int32 atomic_get(int32 *value);
-extern void atomic_set64(int64* value, int64 newValue);
-extern int64 atomic_get_and_set64(int64* value, int64 newValue);
-extern int64 atomic_test_and_set64(int64 *value, int64 newValue,
- int64 testAgainst);
-extern int64 atomic_get64(int64 *value);
-extern int64 atomic_add64(int64 *value, int64 addValue);
-extern int64 atomic_and64(int64 *value, int64 andValue);
-extern int64 atomic_or64(int64 *value, int64 orValue);
-
extern size_t strnlen(const char *string, size_t count);
extern size_t strlcat(char *dest, const char *source, size_t length);
diff --git a/headers/os/support/SupportDefs.h b/headers/os/support/SupportDefs.h
index 476d42c..7e47018 100644
--- a/headers/os/support/SupportDefs.h
+++ b/headers/os/support/SupportDefs.h
@@ -217,9 +217,6 @@ extern void* get_stack_frame(void);
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
-#ifdef __cplusplus
-extern "C" {
-#endif
static inline void
atomic_set(int32* value, int32 newValue)
@@ -322,10 +319,6 @@ atomic_get64(int64* value)
return __atomic_load_n(value, __ATOMIC_ACQUIRE);
}
-#ifdef __cplusplus
-}
-#endif
-
#else // __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
############################################################################
Revision: hrev47759
Commit: 2d5dbc78c4178166ef4459480e2fe528c39772bb
URL: http://cgit.haiku-os.org/haiku/commit/?id=2d5dbc7
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Fri Aug 29 07:35:12 2014 UTC
Add support for my Core i3 integrated graphics.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index da94083..c4c6c10 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -99,7 +99,9 @@ const struct supported_device {
{0x0154, 0x0156, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT1"},
{0x0154, 0x0166, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT2"},
{0x0158, 0x015a, INTEL_TYPE_IVBGS, "IvyBridge Server GT1"},
- {0x0158, 0x016a, INTEL_TYPE_IVBGS, "IvyBridge Server GT2"}
+ {0x0158, 0x016a, INTEL_TYPE_IVBGS, "IvyBridge Server GT2"},
+
+ {0x0c00, 0x0412, INTEL_TYPE_IVBG, "Haswell Desktop"}
};
struct intel_info {
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
index cfe5b66..95023ea 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -96,6 +96,8 @@ const struct supported_device {
{0x0166, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT2"},
{0x015a, INTEL_TYPE_IVBGS, "IvyBridge Server GT1"},
{0x016a, INTEL_TYPE_IVBGS, "IvyBridge Server GT2"},
+
+ {0x0412, INTEL_TYPE_IVBG, "Haswell Desktop"},
};
int32 api_version = B_CUR_DRIVER_API_VERSION;
diff --git
a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
index 0490421..531f2dd 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
@@ -227,7 +227,7 @@ intel_extreme_init(intel_info &info)
info.aperture = gGART->map_aperture(info.pci->bus, info.pci->device,
info.pci->function, 0, &info.aperture_base);
if (info.aperture < B_OK) {
- ERROR("error: could not map GART aperture!\n");
+ ERROR("error: could not map GART aperture! (%s)\n",
strerror(info.aperture));
return info.aperture;
}
Other related posts:
- » [haiku-commits] haiku: hrev47759 - headers/build src/add-ons/kernel/drivers/graphics/intel_extreme src/add-ons/kernel/busses/agp_gart headers/os/support - pulkomandy
