projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BSD 4_4 release
[unix-history]
/
usr
/
src
/
sys
/
vax
/
uba
/
rx.c
diff --git
a/usr/src/sys/vax/uba/rx.c
b/usr/src/sys/vax/uba/rx.c
index
eebec05
..
05de40f
100644
(file)
--- a/
usr/src/sys/vax/uba/rx.c
+++ b/
usr/src/sys/vax/uba/rx.c
@@
-1,4
+1,10
@@
-/* rx.c 6.2 84/07/09 */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved. The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ * @(#)rx.c 7.5 (Berkeley) 12/16/90
+ */
#include "rx.h"
#if NFX > 0
#include "rx.h"
#if NFX > 0
@@
-18,24
+24,24
@@
* powered off at boot time, the controller won't interrupt!
*/
* powered off at boot time, the controller won't interrupt!
*/
-#include "../
machin
e/pte.h"
+#include "../
includ
e/pte.h"
-#include "
../h
/param.h"
-#include "
../h
/buf.h"
-#include "
../h
/systm.h"
-#include "
../h
/conf.h"
-#include "
../h
/errno.h"
-#include "
../h
/time.h"
-#include "
../h
/kernel.h"
-#include "
../h
/uio.h"
-#include "
../h
/file.h"
+#include "
sys
/param.h"
+#include "
sys
/buf.h"
+#include "
sys
/systm.h"
+#include "
sys
/conf.h"
+#include "
sys
/errno.h"
+#include "
sys
/time.h"
+#include "
sys
/kernel.h"
+#include "
sys
/uio.h"
+#include "
sys
/file.h"
-#include "../
vax
/cpu.h"
+#include "../
include
/cpu.h"
#include "../vax/nexus.h"
#include "../vax/nexus.h"
-#include "
../vaxuba/
ubavar.h"
-#include "
../vaxuba/
ubareg.h"
-#include "
../vaxuba/
rxreg.h"
+#include "ubavar.h"
+#include "ubareg.h"
+#include "rxreg.h"
#define b_cylin b_resid
#define b_cylin b_resid
@@
-137,12
+143,11
@@
rxprobe (reg)
return (sizeof (*rxaddr));
}
return (sizeof (*rxaddr));
}
+/*ARGSUSED*/
rxslave(ui, reg)
struct uba_device *ui;
caddr_t reg;
{
rxslave(ui, reg)
struct uba_device *ui;
caddr_t reg;
{
-
- ui->ui_dk = 1;
return (ui->ui_slave == 0 || ui->ui_slave == 1);
}
return (ui->ui_slave == 0 || ui->ui_slave == 1);
}
@@
-220,6
+225,7
@@
rxclose(dev, flag)
#ifdef RXDEBUG
printf("rxclose: dev=0x%x, sc_open=%d\n", dev, sc->sc_open);
#endif
#ifdef RXDEBUG
printf("rxclose: dev=0x%x, sc_open=%d\n", dev, sc->sc_open);
#endif
+ return (0);
}
rxstrategy(bp)
}
rxstrategy(bp)
@@
-725,8
+731,11
@@
rxreset(uban)
if ((um = rxminfo[ctlr]) == 0 || um->um_ubanum != uban ||
um->um_alive == 0)
continue;
if ((um = rxminfo[ctlr]) == 0 || um->um_ubanum != uban ||
um->um_alive == 0)
continue;
- if (um->um_ubinfo)
+ printf(" fx%d", ctlr);
+ if (um->um_ubinfo) {
+ printf("<%d>", UBAI_BDP(um->um_ubinfo));
um->um_ubinfo = 0;
um->um_ubinfo = 0;
+ }
rx_ctlr[ctlr].rxc_state = RXS_IDLE;
rxaddr = (struct rxdevice *)um->um_addr;
rxaddr->rxcs = RX_INIT;
rx_ctlr[ctlr].rxc_state = RXS_IDLE;
rxaddr = (struct rxdevice *)um->um_addr;
rxaddr->rxcs = RX_INIT;
@@
-830,7
+839,7
@@
rxformat(dev)
int unit = RXUNIT(dev);
struct buf *bp;
struct rx_softc *sc = &rx_softc[unit];
int unit = RXUNIT(dev);
struct buf *bp;
struct rx_softc *sc = &rx_softc[unit];
- int
s,
error = 0;
+ int error = 0;
bp = &rrxbuf[unit];
bp->b_flags = B_BUSY | B_CTRL;
bp = &rrxbuf[unit];
bp->b_flags = B_BUSY | B_CTRL;