[src/trunk]: src/sys/dev/mscp revert unwanted part of previous MSCP commit

[abs <abs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c50050532e5
branches:  trunk
changeset: 780073:4c50050532e5
user:      abs <abs%NetBSD.org@localhost>
date:      Tue Jul 10 22:34:37 2012 +0000

description:
revert unwanted part of previous MSCP commit

diffstat:

 sys/dev/mscp/mscp_disk.c |  22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diffs (75 lines):

diff -r ed2e338838db -r 4c50050532e5 sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c  Tue Jul 10 22:34:32 2012 +0000
+++ b/sys/dev/mscp/mscp_disk.c  Tue Jul 10 22:34:37 2012 +0000
@@ -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 @@
                        (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 @@
                if (cmd == ODIOCGDEFLABEL)
                        tp = &newlabel;
                else
+#else
+               tp = (struct disklabel *)data;
 #endif
-               tp = (struct disklabel *)data;
                memset(tp, 0, sizeof(struct disklabel));
                tp->d_secsize = lp->d_secsize;
                tp->d_nsectors = lp->d_nsectors;
@@ -516,21 +516,14 @@
                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 @@
        return MSCP_DONE;
 }
 
-
 #if NRX
 
 /*