summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsimokawa <simokawa@FreeBSD.org>2003-01-29 02:13:31 +0000
committersimokawa <simokawa@FreeBSD.org>2003-01-29 02:13:31 +0000
commit0a3c80b382ae2a354dc33c44ebce9477f94321de (patch)
tree6d254ab0de8087e7a8b161380965995d13027224
parentcc3760c9733664fa22e018ac20c5e1faf46b33ed (diff)
downloadFreeBSD-src-0a3c80b382ae2a354dc33c44ebce9477f94321de.zip
FreeBSD-src-0a3c80b382ae2a354dc33c44ebce9477f94321de.tar.gz
- Fix build on alpha.
- Add a missing newline in printf.
-rw-r--r--sys/dev/firewire/firewire.c5
-rw-r--r--sys/dev/firewire/fwohci.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index e555266..0b93285 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -1020,10 +1020,9 @@ void fw_sidrcv(struct firewire_comm* fc, caddr_t buf, u_int len, u_int off)
}else{
printf(", cable IRM = %d", fc->irm);
if (fc->irm == fc->nodeid)
- printf(" (me)\n");
- else
- printf("\n");
+ printf(" (me)");
}
+ printf("\n");
if (try_bmr && (fc->irm != -1) && (CSRARC(fc, BUS_MGR_ID) == 0x3f)) {
if (fc->irm == ((CSRARC(fc, NODE_IDS) >> 16 ) & 0x3f)) {
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 1161d87..c651622 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -662,7 +662,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
device_printf(dev, "sid_buf alloc failed.\n");
return ENOMEM;
}
- if (((u_int32_t) sc->fc.sid_buf & (OHCI_SIDSIZE - 1)) != 0) {
+ if (((vm_offset_t) sc->fc.sid_buf & (OHCI_SIDSIZE - 1)) != 0) {
device_printf(dev, "sid_buf(%p) not aligned.\n",
sc->fc.sid_buf);
return ENOMEM;
OpenPOWER on IntegriCloud