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
kernel reorg
[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
53f60a6
..
33a3051
100644
(file)
--- a/
usr/src/sys/vax/uba/rx.c
+++ b/
usr/src/sys/vax/uba/rx.c
@@
-1,9
+1,9
@@
/*
/*
- * Copyright (c) 1982 Regents of the University of California.
+ * 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.
*
* All rights reserved. The Berkeley software License Agreement
* specifies the terms and conditions for redistribution.
*
- * @(#)rx.c
6.4
(Berkeley) %G%
+ * @(#)rx.c
7.5
(Berkeley) %G%
*/
#include "rx.h"
*/
#include "rx.h"
@@
-24,19
+24,19
@@
* 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 "param.h"
-#include "buf.h"
-#include "systm.h"
-#include "conf.h"
-#include "errno.h"
-#include "time.h"
-#include "kernel.h"
-#include "uio.h"
-#include "file.h"
+#include "
sys/
param.h"
+#include "
sys/
buf.h"
+#include "sys
/sys
tm.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 "ubavar.h"
#include "../vax/nexus.h"
#include "ubavar.h"
@@
-143,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);
}
@@
-226,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)
@@
-731,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;
@@
-836,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;