Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23590
b: refs/heads/master
c: 30087ba
h: refs/heads/master
v: v3
  • Loading branch information
Vasily Averin authored and Linus Torvalds committed Mar 25, 2006
1 parent cf65df4 commit d5708c8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e692ed37a507e18d8afe8e5faebd8c4722c5f12
refs/heads/master: 30087baf8810cd96b0ca2858993f29a89965ffff
31 changes: 13 additions & 18 deletions trunk/drivers/message/i2o/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,58 +419,53 @@ void i2o_dump_hrt(struct i2o_controller *c)
d = (u8 *) (rows + 2);
state = p[1] << 8 | p[0];

printk(KERN_DEBUG "TID %04X:[", state & 0xFFF);
printk("TID %04X:[", state & 0xFFF);
state >>= 12;
if (state & (1 << 0))
printk(KERN_DEBUG "H"); /* Hidden */
printk("H"); /* Hidden */
if (state & (1 << 2)) {
printk(KERN_DEBUG "P"); /* Present */
printk("P"); /* Present */
if (state & (1 << 1))
printk(KERN_DEBUG "C"); /* Controlled */
printk("C"); /* Controlled */
}
if (state > 9)
printk(KERN_DEBUG "*"); /* Hard */
printk("*"); /* Hard */

printk(KERN_DEBUG "]:");
printk("]:");

switch (p[3] & 0xFFFF) {
case 0:
/* Adapter private bus - easy */
printk(KERN_DEBUG
"Local bus %d: I/O at 0x%04X Mem 0x%08X", p[2],
printk("Local bus %d: I/O at 0x%04X Mem 0x%08X", p[2],
d[1] << 8 | d[0], *(u32 *) (d + 4));
break;
case 1:
/* ISA bus */
printk(KERN_DEBUG
"ISA %d: CSN %d I/O at 0x%04X Mem 0x%08X", p[2],
printk("ISA %d: CSN %d I/O at 0x%04X Mem 0x%08X", p[2],
d[2], d[1] << 8 | d[0], *(u32 *) (d + 4));
break;

case 2: /* EISA bus */
printk(KERN_DEBUG
"EISA %d: Slot %d I/O at 0x%04X Mem 0x%08X",
printk("EISA %d: Slot %d I/O at 0x%04X Mem 0x%08X",
p[2], d[3], d[1] << 8 | d[0], *(u32 *) (d + 4));
break;

case 3: /* MCA bus */
printk(KERN_DEBUG
"MCA %d: Slot %d I/O at 0x%04X Mem 0x%08X", p[2],
printk("MCA %d: Slot %d I/O at 0x%04X Mem 0x%08X", p[2],
d[3], d[1] << 8 | d[0], *(u32 *) (d + 4));
break;

case 4: /* PCI bus */
printk(KERN_DEBUG
"PCI %d: Bus %d Device %d Function %d", p[2],
printk("PCI %d: Bus %d Device %d Function %d", p[2],
d[2], d[1], d[0]);
break;

case 0x80: /* Other */
default:
printk(KERN_DEBUG "Unsupported bus type.");
printk("Unsupported bus type.");
break;
}
printk(KERN_DEBUG "\n");
printk("\n");
rows += length;
}
}
Expand Down

0 comments on commit d5708c8

Please sign in to comment.