[haiku-commits] r42589 - haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios

From: kallisti5@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 7 Aug 2011 05:40:23 +0200 (CEST)
Author: kallisti5
Date: 2011-08-07 05:40:23 +0200 (Sun, 07 Aug 2011)
New Revision: 42589
Changeset: https://dev.haiku-os.org/changeset/42589

Modified:
   haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
   haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
Log:
* tab fix
* add atom_parse_cmd|table_header functions to evaluate
  data structure versions
* convert asic function to status_t and reflect
  execute_table result
* cleanup logic in destroy atombios parser function


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-06 21:13:28 UTC (rev 42588)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp     
2011-08-07 03:40:23 UTC (rev 42589)
@@ -1248,7 +1248,7 @@
 }
 
 
-int
+status_t
 atom_asic_init(atom_context *ctx)
 {
        int hwi = CU16(ctx->data_table + ATOM_DATA_FWI_PTR);
@@ -1258,21 +1258,62 @@
        ps[0] = CU32(hwi + ATOM_FWI_DEFSCLK_PTR);
        ps[1] = CU32(hwi + ATOM_FWI_DEFMCLK_PTR);
        if (!ps[0] || !ps[1])
-               return 1;
+               return B_ERROR;
 
        if (!CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_INIT))
-               return 1;
+               return B_ERROR;
 
-       atom_execute_table(ctx, ATOM_CMD_INIT, ps);
-
-       return 0;
+       return atom_execute_table(ctx, ATOM_CMD_INIT, ps);
 }
 
 
 void
 atom_destroy(atom_context *ctx)
 {
-       if (ctx->iio)
-       free(ctx->iio);
+       if (ctx != NULL)
+               free(ctx->iio);
+
        free(ctx);
 }
+
+
+status_t
+atom_parse_data_header(atom_context *ctx, int index, uint16 *size,
+       uint8 *frev, uint8 *crev, uint16 *data_start)
+{
+       int offset = index * 2 + 4;
+       int idx = CU16(ctx->data_table + offset);
+       uint16 *mdt = (uint16 *)ctx->bios + ctx->data_table + 4;
+
+       if (!mdt[index])
+               return B_ERROR;
+
+       if (size)
+               *size = CU16(idx);
+       if (frev)
+               *frev = CU8(idx + 2);
+       if (crev)
+               *crev = CU8(idx + 3);
+       *data_start = idx;
+       return B_OK;
+}
+
+
+status_t
+atom_parse_cmd_header(atom_context *ctx, int index, uint8 * frev,
+       uint8 * crev)
+{
+       int offset = index * 2 + 4;
+       int idx = CU16(ctx->cmd_table + offset);
+       uint16 *mct = (uint16 *)ctx->bios + ctx->cmd_table + 4;
+
+       if (!mct[index])
+               return B_ERROR;
+
+       if (frev)
+               *frev = CU8(idx + 2);
+       if (crev)
+               *crev = CU8(idx + 3);
+       return B_OK;
+}
+

Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h       
2011-08-06 21:13:28 UTC (rev 42588)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/atom.h       
2011-08-07 03:40:23 UTC (rev 42589)
@@ -148,7 +148,11 @@
 
 atom_context *atom_parse(card_info *, void *);
 status_t atom_execute_table(atom_context *, int, uint32 *);
-int atom_asic_init(atom_context *);
+status_t atom_parse_data_header(atom_context *ctx, int index, uint16 *size,
+       uint8 *frev, uint8 *crev, uint16 *data_start);
+status_t atom_parse_cmd_header(atom_context *ctx, int index, uint8 * frev,
+       uint8 * crev);
+status_t atom_asic_init(atom_context *);
 void atom_destroy(atom_context *);
 
 #endif
[haiku-commits] r42589 - haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios

Other related posts:
