i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* backport a missed endian change

Browse Source 
* clean up some tabs and spaces


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42625 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-08-12 02:04:32 +00:00
parent 5cdfd17b4b
commit 7a2bb2b04c
1 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
+60 -49
View File
@@ -103,49 +103,49 @@ atom_iio_execute(atom_context *ctx, int base, uint32 index, uint32 data)
uint32 temp = 0xCDCDCDCD; uint32 temp = 0xCDCDCDCD;
while (1) while (1)
switch(CU8(base)) { switch(CU8(base)) {
case ATOM_IIO_NOP: case ATOM_IIO_NOP:
base++; base++;
break; break;
case ATOM_IIO_READ: case ATOM_IIO_READ:
temp = ctx->card->ioreg_read(CU16(base + 1)); temp = ctx->card->ioreg_read(CU16(base + 1));
base += 3; base += 3;
break; break;
case ATOM_IIO_WRITE: case ATOM_IIO_WRITE:
(void)ctx->card->reg_read(CU16(base + 1)); (void)ctx->card->reg_read(CU16(base + 1));
ctx->card->ioreg_write(CU16(base + 1), temp); ctx->card->ioreg_write(CU16(base + 1), temp);
base += 3; base += 3;
break; break;
case ATOM_IIO_CLEAR: case ATOM_IIO_CLEAR:
temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 2)); temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 2));
base += 3; base += 3;
break; break;
case ATOM_IIO_SET: case ATOM_IIO_SET:
temp |= (0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 2); temp |= (0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 2);
base += 3; base += 3;
break; break;
case ATOM_IIO_MOVE_INDEX: case ATOM_IIO_MOVE_INDEX:
temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3)); temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3));
temp |= ((index >> CU8(base + 2)) temp |= ((index >> CU8(base + 2))
& (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3); & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3);
base += 4; base += 4;
break; break;
case ATOM_IIO_MOVE_DATA: case ATOM_IIO_MOVE_DATA:
temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3)); temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3));
temp |= ((data >> CU8(base + 2)) temp |= ((data >> CU8(base + 2))
& (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3); & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3);
base += 4; base += 4;
break; break;
case ATOM_IIO_MOVE_ATTR: case ATOM_IIO_MOVE_ATTR:
temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3)); temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 3));
temp |= ((ctx->io_attr >> CU8(base + 2)) temp |= ((ctx->io_attr >> CU8(base + 2))
& (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3); & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + 3);
base += 4; base += 4;
break; break;
case ATOM_IIO_END: case ATOM_IIO_END:
return temp; return temp;
default: default:
TRACE("%s: Unknown IIO opcode.\n", __func__); TRACE("%s: Unknown IIO opcode.\n", __func__);
return 0; return 0;
} }
} }
@@ -389,7 +389,7 @@ atom_put_dst(atom_exec_context *ctx, int arg, uint8 attr,
switch(gctx->io_mode) { switch(gctx->io_mode) {
case ATOM_IO_MM: case ATOM_IO_MM:
if (idx == 0) if (idx == 0)
gctx->card->reg_write(idx, val<<2); gctx->card->reg_write(idx, val << 2);
else else
gctx->card->reg_write(idx, val); gctx->card->reg_write(idx, val);
break; break;
@@ -402,11 +402,11 @@ atom_put_dst(atom_exec_context *ctx, int arg, uint8 attr,
__func__); __func__);
return; return;
default: default:
if (!(gctx->io_mode&0x80)) { if (!(gctx->io_mode & 0x80)) {
TRACE("%s: Bad IO mode.\n", __func__); TRACE("%s: Bad IO mode.\n", __func__);
return; return;
} }
if (!gctx->iio[gctx->io_mode&0xFF]) { if (!gctx->iio[gctx->io_mode & 0xFF]) {
TRACE("%s: Undefined indirect IO write method %d\n", TRACE("%s: Undefined indirect IO write method %d\n",
__func__, gctx->io_mode & 0x7F); __func__, gctx->io_mode & 0x7F);
return; return;
@@ -1243,7 +1243,18 @@ atom_parse(card_info *card, void *bios)
while (*str && ((*str == '\n') || (*str == '\r'))) while (*str && ((*str == '\n') || (*str == '\r')))
str++; str++;
TRACE("ATOM BIOS: %s", str); int i;
char name[512];
// Terminate bios string if not 0 terminated
for (i = 0; i < 511; i++) {
name[i] = str[i];
if (name[i] < '.' || name[i] > 'z') {
name[i] = 0;
break;
}
}
TRACE("ATOM BIOS: %s", name);
return ctx; return ctx;
} }
@@ -1256,8 +1267,8 @@ atom_asic_init(atom_context *ctx)
uint32 ps[16]; uint32 ps[16];
memset(ps, 0, 64); memset(ps, 0, 64);
ps[0] = CU32(hwi + ATOM_FWI_DEFSCLK_PTR); ps[0] = B_HOST_TO_LENDIAN_INT32(CU32(hwi + ATOM_FWI_DEFSCLK_PTR));
ps[1] = CU32(hwi + ATOM_FWI_DEFMCLK_PTR); ps[1] = B_HOST_TO_LENDIAN_INT32(CU32(hwi + ATOM_FWI_DEFMCLK_PTR));
if (!ps[0] || !ps[1]) if (!ps[0] || !ps[1])
return B_ERROR; return B_ERROR;