Module Name: src
Committed By: abs
Date: Tue Jul 10 22:34:37 UTC 2012
Modified Files:
src/sys/dev/mscp: mscp_disk.c
Log Message:
revert unwanted part of previous MSCP commit
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/mscp/mscp_disk.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/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.73 src/sys/dev/mscp/mscp_disk.c:1.74
--- src/sys/dev/mscp/mscp_disk.c:1.73 Tue Jul 10 22:30:23 2012
+++ src/sys/dev/mscp/mscp_disk.c Tue Jul 10 22:34:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,12 +82,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.73 2012/07/10 22:30:23 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.74 2012/07/10 22:34:37 abs Exp $");
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/bufq.h>
-#include <sys/cdio.h>
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
@@ -306,7 +305,7 @@ raclose(dev_t dev, int flags, int fmt, s
(void) tsleep(&udautab[unit], PZERO - 1,
"raclose", 0);
splx(s);
- ra->ra_state = DK_CLOSED;
+ ra->ra_state = CLOSED;
ra->ra_wlabel = 0;
}
#endif
@@ -462,8 +461,9 @@ raioctl(dev_t dev, u_long cmd, void *dat
if (cmd == ODIOCGDEFLABEL)
tp = &newlabel;
else
-#endif
+#else
tp = (struct disklabel *)data;
+#endif
memset(tp, 0, sizeof(struct disklabel));
tp->d_secsize = lp->d_secsize;
tp->d_nsectors = lp->d_nsectors;
@@ -516,21 +516,14 @@ raioctl(dev_t dev, u_long cmd, void *dat
return (dkwedge_list(&ra->ra_disk, dkwl, l));
}
- case DIOCTUR:
- /* test unit ready */
- if (ra->ra_state == DK_CLOSED &&
- ra_putonline(dev, ra) == MSCP_FAILED)
- error = ENXIO;
- *((int*)data) = (ra->ra_state == DK_OPEN);
- return error;
-
default:
error = ENOTTY;
break;
}
- return error;
+ return (error);
}
+
int
radump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
@@ -757,7 +750,6 @@ rx_putonline(struct rx_softc *rx)
return MSCP_DONE;
}
-
#if NRX
/*
