diff options
Diffstat (limited to 'sys/dev/pci/ahd_pci.c')
| -rw-r--r-- | sys/dev/pci/ahd_pci.c | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index 89dba9301bc..a05f87f32c6 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahd_pci.c,v 1.22 2013/05/30 16:15:02 deraadt Exp $ */ +/* $OpenBSD: ahd_pci.c,v 1.23 2013/11/18 17:40:39 guenther Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -909,26 +909,26 @@ static const char *pci_status_source[] = static const char *split_status_strings[] = { - "%s: Received split response in %s.\n", - "%s: Received split completion error message in %s\n", - "%s: Receive overrun in %s\n", - "%s: Count not complete in %s\n", - "%s: Split completion data bucket in %s\n", - "%s: Split completion address error in %s\n", - "%s: Split completion byte count error in %s\n", - "%s: Signaled Target-abort to early terminate a split in %s\n" + "Received split response", + "Received split completion error message", + "Receive overrun", + "Count not complete", + "Split completion data bucket", + "Split completion address error", + "Split completion byte count error", + "Signaled Target-abort to early terminate a split" }; static const char *pci_status_strings[] = { - "%s: Data Parity Error has been reported via PERR# in %s\n", - "%s: Target initial wait state error in %s\n", - "%s: Split completion read data parity error in %s\n", - "%s: Split completion address attribute parity error in %s\n", - "%s: Received a Target Abort in %s\n", - "%s: Received a Master Abort in %s\n", - "%s: Signal System Error Detected in %s\n", - "%s: Address or Write Phase Parity Error Detected in %s.\n" + "Data Parity Error has been reported via PERR#", + "Target initial wait state error", + "Split completion read data parity error", + "Split completion address attribute parity error", + "Received a Target Abort", + "Received a Master Abort", + "Signal System Error Detected", + "Address or Write Phase Parity Error Detected" }; void @@ -973,12 +973,13 @@ ahd_pci_intr(struct ahd_softc *ahd) for (bit = 0; bit < 8; bit++) { if ((pci_status[i] & (0x1 << bit)) != 0) { - static const char *s; - - s = pci_status_strings[bit]; if (i == 7/*TARG*/ && bit == 3) - s = "%s: Signaled Target Abort\n"; - printf(s, ahd_name(ahd), pci_status_source[i]); + printf("%s: Signaled Target Abort\n", + ahd_name(ahd)); + else + printf("%s: %s in %s\n", ahd_name(ahd), + pci_status_strings[bit], + pci_status_source[i]); } } } @@ -1037,21 +1038,17 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat) for (bit = 0; bit < 8; bit++) { if ((split_status[i] & (0x1 << bit)) != 0) { - static const char *s; - - s = split_status_strings[bit]; - printf(s, ahd_name(ahd), - split_status_source[i]); + printf("%s: %s in %s\n", ahd_name(ahd), + split_status_strings[bit], + split_status_source[i]); } if (i > 1) continue; if ((sg_split_status[i] & (0x1 << bit)) != 0) { - static const char *s; - - s = split_status_strings[bit]; - printf(s, ahd_name(ahd), "SG"); + printf("%s: %s in %s\n", ahd_name(ahd), + split_status_strings[bit], "SG"); } } } |