summaryrefslogtreecommitdiff
path: root/sys/dev/pci/ichiic.c
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2006-09-28 18:19:15 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2006-09-28 18:19:15 +0000
commit9bc37f523540e08996c6f3965f553c7897bba9cb (patch)
tree07378cb28cedc5833461e93a623015b2cff73c95 /sys/dev/pci/ichiic.c
parentc24574ef8ee137207b9abf4f462e6bda4c734c78 (diff)
Provide more info in error messages so we can see what's going
on. And some cosmetics in debug messages while here.
Diffstat (limited to 'sys/dev/pci/ichiic.c')
-rw-r--r--sys/dev/pci/ichiic.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c
index a882ec62d8f..3093d24a729 100644
--- a/sys/dev/pci/ichiic.c
+++ b/sys/dev/pci/ichiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichiic.c,v 1.16 2006/08/19 19:13:33 brad Exp $ */
+/* $OpenBSD: ichiic.c,v 1.17 2006/09/28 18:19:14 grange Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -120,7 +120,7 @@ ichiic_attach(struct device *parent, struct device *self, void *aux)
/* Read configuration */
conf = pci_conf_read(pa->pa_pc, pa->pa_tag, ICH_SMB_HOSTC);
- DPRINTF((": conf 0x%x", conf));
+ DPRINTF((": conf 0x%08x", conf));
if ((conf & ICH_SMB_HOSTC_HSTEN) == 0) {
printf(": SMBus disabled\n");
@@ -201,8 +201,9 @@ ichiic_i2c_exec(void *cookie, i2c_op_t op, i2c_addr_t addr,
u_int8_t ctl, st;
int retries;
- DPRINTF(("%s: exec: op %d, addr 0x%x, cmdlen %d, len %d, flags 0x%x\n",
- sc->sc_dev.dv_xname, op, addr, cmdlen, len, flags));
+ DPRINTF(("%s: exec: op %d, addr 0x%02x, cmdlen %d, len %d, "
+ "flags 0x%02x\n", sc->sc_dev.dv_xname, op, addr, cmdlen,
+ len, flags));
/* Wait for bus to be idle */
for (retries = 100; retries > 0; retries--) {
@@ -293,14 +294,16 @@ timeout:
/*
* Transfer timeout. Kill the transaction and clear status bits.
*/
- printf("%s: timeout, status 0x%b\n", sc->sc_dev.dv_xname, st,
- ICH_SMB_HS_BITS);
+ printf("%s: exec: op %d, addr 0x%02x, cmdlen %d, len %d, "
+ "flags 0x%02x: timeout, status 0x%b\n",
+ sc->sc_dev.dv_xname, op, addr, cmdlen, len, flags,
+ st, ICH_SMB_HS_BITS);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, ICH_SMB_HC,
ICH_SMB_HC_KILL);
DELAY(ICHIIC_DELAY);
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, ICH_SMB_HS);
if ((st & ICH_SMB_HS_FAILED) == 0)
- printf("%s: transaction abort failed, status 0x%b\n",
+ printf("%s: abort failed, status 0x%b\n",
sc->sc_dev.dv_xname, st, ICH_SMB_HS_BITS);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, ICH_SMB_HS, st);
return (1);