[haiku-commits] r42625 - haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 12 Aug 2011 04:04:33 +0200 (CEST)
Author: kallisti5
Date: 2011-08-12 04:04:32 +0200 (Fri, 12 Aug 2011)
New Revision: 42625
Changeset: https://dev.haiku-os.org/changeset/42625
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
Log:
* backport a missed endian change
* clean up some tabs and spaces
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
2011-08-12 01:00:34 UTC (rev 42624)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
2011-08-12 02:04:32 UTC (rev 42625)
@@ -103,49 +103,49 @@
uint32 temp = 0xCDCDCDCD;
while (1)
switch(CU8(base)) {
- case ATOM_IIO_NOP:
- base++;
- break;
- case ATOM_IIO_READ:
- temp = ctx->card->ioreg_read(CU16(base + 1));
- base += 3;
- break;
- case ATOM_IIO_WRITE:
- (void)ctx->card->reg_read(CU16(base + 1));
- ctx->card->ioreg_write(CU16(base + 1), temp);
- base += 3;
- break;
- case ATOM_IIO_CLEAR:
- temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base +
2));
- base += 3;
- break;
- case ATOM_IIO_SET:
- temp |= (0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base + 2);
- base += 3;
- break;
- case ATOM_IIO_MOVE_INDEX:
- temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base +
3));
- temp |= ((index >> CU8(base + 2))
- & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base +
3);
- base += 4;
- break;
- case ATOM_IIO_MOVE_DATA:
- temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base +
3));
- temp |= ((data >> CU8(base + 2))
- & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base +
3);
- base += 4;
- break;
- case ATOM_IIO_MOVE_ATTR:
- temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << CU8(base +
3));
- temp |= ((ctx->io_attr >> CU8(base + 2))
- & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base +
3);
- base += 4;
- break;
- case ATOM_IIO_END:
- return temp;
- default:
- TRACE("%s: Unknown IIO opcode.\n", __func__);
- return 0;
+ case ATOM_IIO_NOP:
+ base++;
+ break;
+ case ATOM_IIO_READ:
+ temp = ctx->card->ioreg_read(CU16(base + 1));
+ base += 3;
+ break;
+ case ATOM_IIO_WRITE:
+ (void)ctx->card->reg_read(CU16(base + 1));
+ ctx->card->ioreg_write(CU16(base + 1), temp);
+ base += 3;
+ break;
+ case ATOM_IIO_CLEAR:
+ temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
CU8(base + 2));
+ base += 3;
+ break;
+ case ATOM_IIO_SET:
+ temp |= (0xFFFFFFFF >> (32 - CU8(base + 1))) <<
CU8(base + 2);
+ base += 3;
+ break;
+ case ATOM_IIO_MOVE_INDEX:
+ temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
CU8(base + 3));
+ temp |= ((index >> CU8(base + 2))
+ & (0xFFFFFFFF >> (32 - CU8(base + 1)))) <<
CU8(base + 3);
+ base += 4;
+ break;
+ case ATOM_IIO_MOVE_DATA:
+ temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
CU8(base + 3));
+ temp |= ((data >> CU8(base + 2))
+ & (0xFFFFFFFF >> (32 - CU8(base + 1)))) <<
CU8(base + 3);
+ base += 4;
+ break;
+ case ATOM_IIO_MOVE_ATTR:
+ temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) <<
CU8(base + 3));
+ temp |= ((ctx->io_attr >> CU8(base + 2))
+ & (0xFFFFFFFF >> (32 - CU8(base + 1)))) <<
CU8(base + 3);
+ base += 4;
+ break;
+ case ATOM_IIO_END:
+ return temp;
+ default:
+ TRACE("%s: Unknown IIO opcode.\n", __func__);
+ return 0;
}
}
@@ -389,7 +389,7 @@
switch(gctx->io_mode) {
case ATOM_IO_MM:
if (idx == 0)
- gctx->card->reg_write(idx,
val<<2);
+ gctx->card->reg_write(idx, val
<< 2);
else
gctx->card->reg_write(idx, val);
break;
@@ -402,11 +402,11 @@
__func__);
return;
default:
- if (!(gctx->io_mode&0x80)) {
+ if (!(gctx->io_mode & 0x80)) {
TRACE("%s: Bad IO mode.\n",
__func__);
return;
}
- if (!gctx->iio[gctx->io_mode&0xFF]) {
+ if (!gctx->iio[gctx->io_mode & 0xFF]) {
TRACE("%s: Undefined indirect
IO write method %d\n",
__func__, gctx->io_mode
& 0x7F);
return;
@@ -1243,8 +1243,19 @@
while (*str && ((*str == '\n') || (*str == '\r')))
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;
}
@@ -1256,8 +1267,8 @@
uint32 ps[16];
memset(ps, 0, 64);
- ps[0] = CU32(hwi + ATOM_FWI_DEFSCLK_PTR);
- ps[1] = CU32(hwi + ATOM_FWI_DEFMCLK_PTR);
+ ps[0] = B_HOST_TO_LENDIAN_INT32(CU32(hwi + ATOM_FWI_DEFSCLK_PTR));
+ ps[1] = B_HOST_TO_LENDIAN_INT32(CU32(hwi + ATOM_FWI_DEFMCLK_PTR));
if (!ps[0] || !ps[1])
return B_ERROR;
Other related posts:
- » [haiku-commits] r42625 - haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios - kallisti5
