From cc9e8e94d48193b0b59c0f9475e662d1330e0899 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 1 Aug 2011 22:56:18 +0000 Subject: [PATCH] * Add card_info struct used by AtomBIOS parser git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42535 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/radeon_hd/atombios/atom.h | 15 ++++++++++++++- src/add-ons/accelerants/radeon_hd/bios.h | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/atombios/atom.h b/src/add-ons/accelerants/radeon_hd/atombios/atom.h index 324cb1f4c6..79f6f1f2cb 100644 --- a/src/add-ons/accelerants/radeon_hd/atombios/atom.h +++ b/src/add-ons/accelerants/radeon_hd/atombios/atom.h @@ -25,10 +25,23 @@ #ifndef ATOM_H #define ATOM_H + #ifndef __HAIKU__ #include -#endif #include "card.h" +#else +struct card_info { + struct drm_device *dev; + void (* reg_write)(struct card_info *, uint32_t, uint32_t); /* filled by driver */ + uint32_t (* reg_read)(struct card_info *, uint32_t); /* filled by driver */ + void (* ioreg_write)(struct card_info *, uint32_t, uint32_t); /* filled by driver */ + uint32_t (* ioreg_read)(struct card_info *, uint32_t); /* filled by driver */ + void (* mc_write)(struct card_info *, uint32_t, uint32_t); /* filled by driver */ + uint32_t (* mc_read)(struct card_info *, uint32_t); /* filled by driver */ + void (* pll_write)(struct card_info *, uint32_t, uint32_t); /* filled by driver */ + uint32_t (* pll_read)(struct card_info *, uint32_t); /* filled by driver */ +}; +#endif #define ATOM_BIOS_MAGIC 0xAA55 #define ATOM_ATI_MAGIC_PTR 0x30 diff --git a/src/add-ons/accelerants/radeon_hd/bios.h b/src/add-ons/accelerants/radeon_hd/bios.h index 0c98fbde39..80f8ca57c6 100644 --- a/src/add-ons/accelerants/radeon_hd/bios.h +++ b/src/add-ons/accelerants/radeon_hd/bios.h @@ -13,7 +13,7 @@ // AtomBios includes extern "C" { -//#include "atom.h" + #include "atom.h" }