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.c99
1 files changed, 46 insertions, 53 deletions
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c
index af8eb5429..7872f0540 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/src/video_out/vidix/drivers/radeon_vid.c
@@ -340,17 +340,17 @@ static const ati_card_ids_t ati_card_ids[] =
{ DEVICE_ATI_RADEON_R100_QE, R_100|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_R100_QF, R_100|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_R100_QG, R_100|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RS100_IGP320, R_150|R_OVL_SHIFT|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS100_MOBILITY, R_150|R_OVL_SHIFT|R_INTEGRATED },
- { DEVICE_ATI_RADEON_VE_QY, R_120|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_VE_QZ, R_120|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_IGP_320, R_150|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_MOBILITY_U1, R_150|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_RV100_QY, R_120|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV100_QZ, R_120|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_MOBILITY_M7, R_150|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_MOBILITY_M72, R_150|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV200_LX, R_150|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_MOBILITY_M6, R_120|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_MOBILITY_M62, R_120|R_OVL_SHIFT },
/* Radeon2 (indeed: Rage 512 Pro ;) */
- { DEVICE_ATI_RADEON_R200_BB, R_200 },
- { DEVICE_ATI_RADEON_R200_BC, R_200 },
+ { DEVICE_ATI_R200_BB_RADEON, R_200 },
+ { DEVICE_ATI_R200_BC_RADEON, R_200 },
{ DEVICE_ATI_RADEON_R200_QH, R_200 },
{ DEVICE_ATI_RADEON_R200_QI, R_200 },
{ DEVICE_ATI_RADEON_R200_QJ, R_200 },
@@ -366,59 +366,52 @@ static const ati_card_ids_t ati_card_ids[] =
{ DEVICE_ATI_RADEON_R200_QL2, R_200 },
{ DEVICE_ATI_RADEON_RV200_QW, R_150|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_RV200_QX, R_150|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RS200_IGP330_340_350,R_200|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS200_MOBILITY, R_200|R_INTEGRATED },
- { DEVICE_ATI_RADEON_R250_IG, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RS250_7000, R_250|R_OVL_SHIFT|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS250_MOBILITY, R_250|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_IGP330_340_350,R_200|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_IGP_330M_340M_350M,R_200|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_RV250_IG, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_7000_IGP, R_250|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_MOBILITY_7000, R_250|R_OVL_SHIFT|R_INTEGRATED },
{ DEVICE_ATI_RADEON_RV250_ID, R_250|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_RV250_IE, R_250|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_RV250_IF, R_250|R_OVL_SHIFT },
{ DEVICE_ATI_RADEON_RV250_IG, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RV250_LD, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RV250_LE, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RV250_LF, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RV250_LG, R_250|R_OVL_SHIFT },
- { DEVICE_ATI_RADEON_RV280_9200, R_280 },
- { DEVICE_ATI_RADEON_RV280_92002, R_280 },
- { DEVICE_ATI_RADEON_RV280_92003, R_280 },
- { DEVICE_ATI_RADEON_RV280_92004, R_280 },
- { DEVICE_ATI_RADEON_RV280_M9, R_280 },
- { DEVICE_ATI_RADEON_RV280_M92, R_280 },
- { DEVICE_ATI_RADEON_RV280_M93, R_280 },
- { DEVICE_ATI_RADEON_RV280_M94, R_280 },
+ { DEVICE_ATI_RADEON_R250_LD, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_R250_LE, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_R250_LF, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_R250_LG, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RV280_RADEON_92003, R_280 },
+ { DEVICE_ATI_RV280_RADEON_92004, R_280 },
+ { DEVICE_ATI_RV280_RADEON_92005, R_280 },
/* Radeon3 (indeed: Rage 1024 Pro ;) */
- { DEVICE_ATI_RADEON_R300, R_300 },
+ { DEVICE_ATI_R300_AG_FIREGL, R_300 },
{ DEVICE_ATI_RADEON_R300_ND, R_300 },
{ DEVICE_ATI_RADEON_R300_NE, R_300 },
- { DEVICE_ATI_RADEON_R300_NF, R_300 },
+ { DEVICE_ATI_RV350_NF_RADEON, R_300 },
{ DEVICE_ATI_RADEON_R300_NG, R_300 },
- { DEVICE_ATI_RADEON_RV300_9500, R_300 },
- { DEVICE_ATI_RADEON_RV300_95002, R_300 },
- { DEVICE_ATI_RADEON_RV300_9600TX, R_300 },
- { DEVICE_ATI_RADEON_RS300_9000, R_300|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS300_MOBILITY, R_300|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS300_5836, R_300|R_INTEGRATED },
- { DEVICE_ATI_RADEON_RS300_5837, R_300|R_INTEGRATED },
- { DEVICE_ATI_RADEON_R350, R_350 },
- { DEVICE_ATI_RADEON_R3502, R_350 },
- { DEVICE_ATI_RADEON_R3503, R_350 },
- { DEVICE_ATI_RADEON_R3504, R_350 },
- { DEVICE_ATI_RADEON_R350_NH, R_350 },
- { DEVICE_ATI_RADEON_R350_NI, R_350 },
- { DEVICE_ATI_RADEON_R360_NJ, R_350 },
- { DEVICE_ATI_RADEON_R350_NK, R_350 },
- { DEVICE_ATI_RADEON_RV350_9600, R_350 },
- { DEVICE_ATI_RADEON_RV350_9600SE, R_350 },
- { DEVICE_ATI_RADEON_RV360_9600XT, R_350 },
- { DEVICE_ATI_RADEON_RV350_FIREGL, R_350 },
- { DEVICE_ATI_RADEON_RV360_FIREGL, R_350 },
- { DEVICE_ATI_RADEON_RV350_NP, R_350 },
- { DEVICE_ATI_RADEON_RV350_NQ, R_350 },
- { DEVICE_ATI_RADEON_RV350_NR, R_350 },
- { DEVICE_ATI_RADEON_RV350_NS, R_350 },
- { DEVICE_ATI_RADEON_RV350_NT, R_350 },
- { DEVICE_ATI_RADEON_RV350_NV, R_350 }
+ { DEVICE_ATI_R300_AD_RADEON, R_300 },
+ { DEVICE_ATI_R300_AE_RADEON, R_300 },
+ { DEVICE_ATI_R300_AF_RADEON, R_300 },
+ { DEVICE_ATI_RADEON_9100_IGP2, R_300|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RS300M_AGP_RADEON, R_300|R_INTEGRATED },
+ { 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_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_RV350_AP_RADEON, R_350 },
+ { DEVICE_ATI_RV350_AQ_RADEON, R_350 },
+ { DEVICE_ATI_RV350_AR_RADEON, R_350 },
+ { DEVICE_ATI_RV350_AT_FIRE, R_350 },
+ { DEVICE_ATI_RV350_AV_FIRE, R_350 },
+ { DEVICE_ATI_RV350_MOBILITY_RADEON,R_350 },
+ { DEVICE_ATI_M10_NQ_RADEON, 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 }
#endif
};
@@ -984,7 +977,7 @@ unsigned VIDIX_NAME(vixGetVersion)( void ) { return VIDIX_VERSION; }
static int find_chip(unsigned chip_id)
{
unsigned i;
- for(i = 0;i < sizeof(ati_card_ids)/sizeof(unsigned short);i++)
+ for(i = 0;i < sizeof(ati_card_ids)/sizeof(ati_card_ids_t);i++)
{
if(chip_id == ati_card_ids[i].id) return i;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-01 02:45:30 +0000