Module Name: src
Committed By: rin
Date: Mon Aug 15 11:18:12 UTC 2022
Modified Files:
src/sys/arch/mac68k/obio: esp.c
Log Message:
Minor cosmetic changes. NFC.
- Use switch instead of if-else-if chain.
- Dedup codes a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mac68k/obio/esp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/obio/esp.c
diff -u src/sys/arch/mac68k/obio/esp.c:1.60 src/sys/arch/mac68k/obio/esp.c:1.61
--- src/sys/arch/mac68k/obio/esp.c:1.60 Mon Feb 22 05:23:36 2021
+++ src/sys/arch/mac68k/obio/esp.c Mon Aug 15 11:18:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.60 2021/02/22 05:23:36 rin Exp $ */
+/* $NetBSD: esp.c,v 1.61 2022/08/15 11:18:12 rin Exp $ */
/*
* Copyright (c) 1997 Jason R. Thorpe.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.60 2021/02/22 05:23:36 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.61 2022/08/15 11:18:12 rin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -202,12 +202,15 @@ espattach(device_t parent, device_t self
* pseudo-DMA timing. The default value is 0x1d1.
*/
if (oa->oa_addr == 0) {
- if (reg_offset == 0x10000) {
+ switch (reg_offset) {
+ case 0x10000:
quick = 1;
esp_have_dreq = esp_iosb_have_dreq;
- } else if (reg_offset == 0x18000)
+ break;
+ case 0x18000:
avdma = 1;
- else {
+ break;
+ default:
addr = 0xf9800024;
goto dafb_dreq;
}
@@ -262,11 +265,6 @@ dafb_dreq: bst = oa->oa_tag;
sc->sc_freq = 16500000;
} else
sc->sc_freq = 25000000;
-
- if (quick)
- aprint_normal(" (quick)");
- else if (avdma)
- aprint_normal(" (avdma)");
} else {
esp1 = esc;
@@ -274,11 +272,13 @@ dafb_dreq: bst = oa->oa_tag;
via2_register_irq(VIA2_SCSIIRQ, esp_dualbus_intr, NULL);
irq_mask = 0;
sc->sc_freq = 25000000;
-
- if (quick)
- printf(" (quick)");
}
+ if (quick)
+ aprint_normal(" (quick)");
+ else if (avdma)
+ aprint_normal(" (avdma)");
+
aprint_normal(": address %p", esc->sc_reg);
sc->sc_id = 7;
