aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-06-26 13:39:01 -0700
committerIan Romanick <idr@us.ibm.com>2007-06-26 13:39:01 -0700
commitb9ef1467fed9e96c5e7bd453d01511f8ce98583c (patch)
tree6ad7179f133ecfba86de75e5397d89d5cd1a606d
parent3547fbda63925217a5be24de5d5abec3b53d3fe1 (diff)
Clean up mixed declarations and code.
-rw-r--r--linux-core/xgi_cmdlist.c3
-rw-r--r--linux-core/xgi_misc.c17
2 files changed, 14 insertions, 6 deletions
diff --git a/linux-core/xgi_cmdlist.c b/linux-core/xgi_cmdlist.c
index e00ea228..99be2145 100644
--- a/linux-core/xgi_cmdlist.c
+++ b/linux-core/xgi_cmdlist.c
@@ -196,9 +196,10 @@ void xgi_submit_cmdlist(xgi_info_t * info, xgi_cmd_info_t * pCmdInfo)
/* Jong 06/13/2006; remove marked for system hang test */
/* xgi_waitfor_pci_idle(info); */
} else {
+ U32 *lastBatchVirtAddr;
+
XGI_INFO
("Jong-xgi_submit_cmdlist-s_cmdring._lastBatchStartAddr != 0 \n");
- U32 *lastBatchVirtAddr;
/* Jong 05/25/2006 */
/* return; */
diff --git a/linux-core/xgi_misc.c b/linux-core/xgi_misc.c
index 61e40594..06cf0160 100644
--- a/linux-core/xgi_misc.c
+++ b/linux-core/xgi_misc.c
@@ -200,13 +200,15 @@ BOOL xgi_ge_irq_handler(xgi_info_t * info)
STALL_INTERRUPT_RESET_THRESHOLD) {
continoue_int_count = 0;
} else if (continoue_int_count >= 3) {
+ int time_out;
+
continoue_int_count = 0;
// GE Hung up, need reset.
XGI_INFO("Reset GE!\n");
*(mmio_vbase + 0xb057) = 8;
- int time_out = 0xffff;
+ time_out = 0xffff;
while (0 !=
(ge_3d_status[0x00] &
0xf0000000)) {
@@ -214,6 +216,11 @@ BOOL xgi_ge_irq_handler(xgi_info_t * info)
((--time_out) &
0xfff)) ;
if (0 == time_out) {
+ U8 old_3ce;
+ U8 old_3cf;
+ U8 old_index;
+ U8 old_36;
+
XGI_INFO
("Can not reset back 0x%lx!\n",
ge_3d_status
@@ -222,24 +229,24 @@ BOOL xgi_ge_irq_handler(xgi_info_t * info)
0xb057) = 0;
// Have to use 3x5.36 to reset.
// Save and close dynamic gating
- U8 old_3ce =
+ old_3ce =
*(mmio_vbase
+ 0x3ce);
*(mmio_vbase +
0x3ce) = 0x2a;
- U8 old_3cf =
+ old_3cf =
*(mmio_vbase
+ 0x3cf);
*(mmio_vbase +
0x3cf) =
old_3cf & 0xfe;
// Reset GE
- U8 old_index =
+ old_index =
*(mmio_vbase
+ 0x3d4);
*(mmio_vbase +
0x3d4) = 0x36;
- U8 old_36 =
+ old_36 =
*(mmio_vbase
+ 0x3d5);
*(mmio_vbase +