summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/isa/aztech.c27
-rw-r--r--sys/dev/isa/radiotrack.c30
-rw-r--r--sys/dev/isa/radiotrack2.c25
-rw-r--r--sys/dev/isa/sf16fmr2.c25
4 files changed, 59 insertions, 48 deletions
diff --git a/sys/dev/isa/aztech.c b/sys/dev/isa/aztech.c
index ae852097c2b..23898bff686 100644
--- a/sys/dev/isa/aztech.c
+++ b/sys/dev/isa/aztech.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aztech.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
+/* $OpenBSD: aztech.c,v 1.3 2002/01/02 19:36:51 mickey Exp $ */
/* $RuOBSD: aztech.c,v 1.11 2001/10/20 13:23:47 pva Exp $ */
/*
@@ -128,20 +128,21 @@ az_probe(struct device *parent, void *self, void *aux)
int iosize = 1, iobase = ia->ia_iobase;
if (!AZ_BASE_VALID(iobase)) {
- printf("az: configured iobase 0x%x invalid", iobase);
- return 0;
+ printf("az: configured iobase 0x%x invalid\n", iobase);
+ return (0);
}
if (bus_space_map(iot, iobase, iosize, 0, &ioh))
- return 0;
-
- bus_space_unmap(iot, ioh, iosize);
+ return (0);
- if (!az_find(iot, ioh))
- return 0;
+ if (!az_find(iot, ioh)) {
+ bus_space_unmap(iot, ioh, iosize);
+ return (0);
+ }
+ bus_space_unmap(iot, ioh, iosize);
ia->ia_iosize = iosize;
- return 1;
+ return (1);
}
void
@@ -159,10 +160,12 @@ az_attach(struct device *parent, struct device *self, void *aux)
/* remap I/O */
if (bus_space_map(sc->lm.iot, ia->ia_iobase, ia->ia_iosize,
- 0, &sc->lm.ioh))
- panic(": bus_space_map() of %s failed", sc->sc_dev.dv_xname);
+ 0, &sc->lm.ioh)) {
+ printf(": bus_space_map() failed\n");
+ return;
+ }
- printf(": Aztech/PackardBell");
+ printf(": Aztech/PackardBell\n");
/* Configure struct lm700x_t lm */
sc->lm.offset = 0;
diff --git a/sys/dev/isa/radiotrack.c b/sys/dev/isa/radiotrack.c
index fecd185e664..4e66b89c792 100644
--- a/sys/dev/isa/radiotrack.c
+++ b/sys/dev/isa/radiotrack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radiotrack.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
+/* $OpenBSD: radiotrack.c,v 1.2 2002/01/02 19:36:50 mickey Exp $ */
/* $RuOBSD: radiotrack.c,v 1.3 2001/10/18 16:51:36 pva Exp $ */
/*
@@ -137,22 +137,22 @@ rt_probe(struct device *parent, void *self, void *aux)
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
bus_space_handle_t ioh;
-
int iosize = 1, iobase = ia->ia_iobase;
if (!RT_BASE_VALID(iobase)) {
- printf("rt: configured iobase 0x%x invalid", iobase);
- return 0;
+ printf("rt: configured iobase 0x%x invalid\n", iobase);
+ return (0);
}
if (bus_space_map(iot, iobase, iosize, 0, &ioh))
- return 0;
-
- bus_space_unmap(iot, ioh, iosize);
+ return (0);
- if (!rt_find(iot, ioh))
- return 0;
+ if (!rt_find(iot, ioh)) {
+ bus_space_unmap(iot, ioh, iosize);
+ return (0);
+ }
+ bus_space_unmap(iot, ioh, iosize);
ia->ia_iosize = iosize;
return 1;
}
@@ -172,25 +172,27 @@ rt_attach(struct device *parent, struct device *self, void *aux)
/* remap I/O */
if (bus_space_map(sc->lm.iot, ia->ia_iobase, ia->ia_iosize,
- 0, &sc->lm.ioh))
- panic(": bus_space_map() of %s failed", sc->sc_dev.dv_xname);
+ 0, &sc->lm.ioh)) {
+ printf(": bus_space_map() failed\n");
+ return;
+ }
switch (sc->lm.iot) {
case 0x20C:
/* FALLTHROUGH */
case 0x30C:
sc->cardtype = CARD_RADIOTRACK;
- printf(": AIMS Lab Radiotrack or compatible");
+ printf(": AIMS Lab Radiotrack or compatible\n");
break;
case 0x284:
/* FALLTHROUGH */
case 0x384:
sc->cardtype = CARD_SF16FMI;
- printf(": SoundForte RadioX SF16-FMI");
+ printf(": SoundForte RadioX SF16-FMI\n");
break;
default:
sc->cardtype = CARD_UNKNOWN;
- printf(": Unknown card");
+ printf(": Unknown card\n");
break;
}
diff --git a/sys/dev/isa/radiotrack2.c b/sys/dev/isa/radiotrack2.c
index 86c554d61c2..99c4345392b 100644
--- a/sys/dev/isa/radiotrack2.c
+++ b/sys/dev/isa/radiotrack2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radiotrack2.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
+/* $OpenBSD: radiotrack2.c,v 1.2 2002/01/02 19:36:51 mickey Exp $ */
/* $RuOBSD: radiotrack2.c,v 1.2 2001/10/18 16:51:36 pva Exp $ */
/*
@@ -132,19 +132,20 @@ rtii_probe(struct device *parent, void *self, void *aux)
if (!RTII_BASE_VALID(iobase)) {
printf("rtii: configured iobase 0x%x invalid\n", iobase);
- return 0;
+ return (0);
}
if (bus_space_map(iot, iobase, iosize, 0, &ioh))
- return 0;
+ return (0);
- bus_space_unmap(iot, ioh, iosize);
-
- if (!rtii_find(iot, ioh))
- return 0;
+ if (!rtii_find(iot, ioh)) {
+ bus_space_unmap(iot, ioh, iosize);
+ return (0);
+ }
+ bus_space_unmap(iot, ioh, iosize);
ia->ia_iosize = iosize;
- return 1;
+ return (1);
}
void
@@ -162,8 +163,10 @@ rtii_attach(struct device *parent, struct device *self, void *aux)
/* remap I/O */
if (bus_space_map(sc->tea.iot, ia->ia_iobase, ia->ia_iosize,
- 0, &sc->tea.ioh))
- panic("rtiiattach: bus_space_map() failed");
+ 0, &sc->tea.ioh)) {
+ printf(": bus_space_map() failed\n");
+ return;
+ }
sc->tea.offset = 0;
@@ -172,7 +175,7 @@ rtii_attach(struct device *parent, struct device *self, void *aux)
sc->tea.write_bit = rtii_write_bit;
sc->tea.read = rtii_hw_read;
- printf(": AIMS Lab Radiotrack II");
+ printf(": AIMS Lab Radiotrack II\n");
tea5757_set_freq(&sc->tea, sc->stereo, sc->lock, sc->freq);
rtii_set_mute(sc);
diff --git a/sys/dev/isa/sf16fmr2.c b/sys/dev/isa/sf16fmr2.c
index 200f58ee199..1362823b21d 100644
--- a/sys/dev/isa/sf16fmr2.c
+++ b/sys/dev/isa/sf16fmr2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sf16fmr2.c,v 1.3 2001/12/18 18:48:08 mickey Exp $ */
+/* $OpenBSD: sf16fmr2.c,v 1.4 2002/01/02 19:36:51 mickey Exp $ */
/* $RuOBSD: sf16fmr2.c,v 1.12 2001/10/18 16:51:36 pva Exp $ */
/*
@@ -132,19 +132,20 @@ sf2r_probe(struct device *parent, void *self, void *aux)
if (!SF16FMR2_BASE_VALID(iobase)) {
printf("sf2r: configured iobase 0x%x invalid\n", iobase);
- return 0;
+ return (0);
}
if (bus_space_map(iot, iobase, iosize, 0, &ioh))
- return 0;
+ return (0);
- bus_space_unmap(iot, ioh, iosize);
-
- if (!sf2r_find(iot, ioh))
- return 0;
+ if (!sf2r_find(iot, ioh)) {
+ bus_space_unmap(iot, ioh, iosize);
+ return (0);
+ }
+ bus_space_unmap(iot, ioh, iosize);
ia->ia_iosize = iosize;
- return 1;
+ return (1);
}
void
@@ -162,8 +163,10 @@ sf2r_attach(struct device *parent, struct device *self, void *aux)
/* remap I/O */
if (bus_space_map(sc->tea.iot, ia->ia_iobase, ia->ia_iosize,
- 0, &sc->tea.ioh))
- panic("sf2rattach: bus_space_map() failed");
+ 0, &sc->tea.ioh)) {
+ printf(": bus_space_map() failed\n");
+ return;
+ }
sc->tea.offset = 0;
@@ -172,7 +175,7 @@ sf2r_attach(struct device *parent, struct device *self, void *aux)
sc->tea.write_bit = sf2r_write_bit;
sc->tea.read = sf2r_read_register;
- printf(": SoundForte RadioLink SF16-FMR2");
+ printf(": SoundForte RadioLink SF16-FMR2\n");
tea5757_set_freq(&sc->tea, sc->stereo, sc->lock, sc->freq);
sf2r_set_mute(sc);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 15:04:44 +0000