summaryrefslogtreecommitdiff
path: root/src/video_out/vidix/drivers/radeon_vid.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out/vidix/drivers/radeon_vid.c')
-rw-r--r--src/video_out/vidix/drivers/radeon_vid.c41
1 files changed, 33 insertions, 8 deletions
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c
index 7872f0540..de4e66194 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/src/video_out/vidix/drivers/radeon_vid.c
@@ -22,10 +22,10 @@
#include "radeon.h"
#ifdef RAGE128
-#define RADEON_MSG "rage128_vid:"
+#define RADEON_MSG "[rage128]"
#define X_ADJUST 0
#else
-#define RADEON_MSG "radeon_vid:"
+#define RADEON_MSG "[radeon]"
#define X_ADJUST (((besr.chip_flags&R_OVL_SHIFT)==R_OVL_SHIFT)?8:0)
#ifndef RADEON
#define RADEON
@@ -266,8 +266,12 @@ static video_registers_t vregs[] =
#define R_280 0x00000006
#define R_300 0x00000007
#define R_350 0x00000008
+#define R_370 0x00000010
+#define R_380 0x00000020
+#define R_420 0x00000040
#define R_OVL_SHIFT 0x00000100
#define R_INTEGRATED 0x00000200
+#define R_PCIE 0x00000400
typedef struct ati_card_ids_s
{
@@ -386,7 +390,6 @@ static const ati_card_ids_t ati_card_ids[] =
{ DEVICE_ATI_R300_AG_FIREGL, R_300 },
{ DEVICE_ATI_RADEON_R300_ND, R_300 },
{ DEVICE_ATI_RADEON_R300_NE, R_300 },
- { DEVICE_ATI_RV350_NF_RADEON, R_300 },
{ DEVICE_ATI_RADEON_R300_NG, R_300 },
{ DEVICE_ATI_R300_AD_RADEON, R_300 },
{ DEVICE_ATI_R300_AE_RADEON, R_300 },
@@ -396,22 +399,44 @@ static const ati_card_ids_t ati_card_ids[] =
{ DEVICE_ATI_R350_AH_RADEON, R_350 },
{ DEVICE_ATI_R350_AI_RADEON, R_350 },
{ DEVICE_ATI_R350_AJ_RADEON, R_350 },
- { DEVICE_ATI_R350_AK_FIRE, R_350 },
+ { DEVICE_ATI_R350_AK_FIRE, R_350 },
{ DEVICE_ATI_RADEON_R350_RADEON2, R_350 },
{ DEVICE_ATI_RADEON_R350_RADEON3, R_350 },
{ DEVICE_ATI_RV350_NJ_RADEON, R_350 },
- { DEVICE_ATI_R350_NK_FIRE, R_350 },
+ { DEVICE_ATI_R350_NK_FIRE, R_350 },
{ DEVICE_ATI_RV350_AP_RADEON, R_350 },
{ DEVICE_ATI_RV350_AQ_RADEON, R_350 },
{ DEVICE_ATI_RV350_AR_RADEON, R_350 },
+ { DEVICE_ATI_RV350_AS_RADEON, R_350 },
{ DEVICE_ATI_RV350_AT_FIRE, R_350 },
+ { DEVICE_ATI_RV350_AU_FIRE, R_350 },
{ DEVICE_ATI_RV350_AV_FIRE, R_350 },
- { DEVICE_ATI_RV350_MOBILITY_RADEON,R_350 },
+ { DEVICE_ATI_RV350_AW_FIRE, R_350 },
+ { DEVICE_ATI_RV350_MOBILITY_RADEON, R_350 },
+ { DEVICE_ATI_RV350_NF_RADEON, R_300 },
+ { DEVICE_ATI_RV350_NJ_RADEON, R_300 },
{ DEVICE_ATI_M10_NQ_RADEON, R_350 },
- { DEVICE_ATI_RV350_MOBILITY_RADEON2,R_350 },
+ { DEVICE_ATI_RV350_MOBILITY_RADEON2, R_350 },
{ DEVICE_ATI_M10_NS_RADEON, R_350 },
{ DEVICE_ATI_M10_NT_FIREGL, R_350 },
- { DEVICE_ATI_M11_NV_FIREGL, R_350 }
+ { DEVICE_ATI_M11_NV_FIREGL, R_350 },
+ { DEVICE_ATI_RV370_5B60_RADEON, R_370|R_PCIE },
+ { DEVICE_ATI_RV370_5B62_RADEON, R_370|R_PCIE },
+ { DEVICE_ATI_RV370_5B64_FIREGL, R_370|R_PCIE },
+ { DEVICE_ATI_RV370_5B65_FIREGL, R_370|R_PCIE },
+ { DEVICE_ATI_RV380_0X3E50_RADEON, R_380|R_PCIE },
+ { DEVICE_ATI_RV380_0X3E54_FIREGL, R_380|R_PCIE },
+ { DEVICE_ATI_RV380_RADEON_X600, R_380|R_PCIE },
+ { DEVICE_ATI_R420_JH_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JI_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JJ_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JK_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JL_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JM_FIREGL, R_420|R_PCIE },
+ { DEVICE_ATI_M18_JN_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JP_RADEON, R_420|R_PCIE },
+ { DEVICE_ATI_R420_JM_FIREGL, R_420|R_PCIE },
+ { DEVICE_ATI_R423_5F57_RADEON, R_420|R_PCIE }
#endif
};