There is no such thing any more as "struct bdevsw".

There is only cdevsw (which should be renamed in a later edit to deventry
or something). cdevsw contains the union of what were in both bdevsw an
cdevsw entries.  The bdevsw[] table stiff exists and is a second pointer
to the cdevsw entry of the device. it's major is in d_bmaj rather than
d_maj. some cleanup still to happen (e.g. dsopen now gets two pointers
to the same cdevsw struct instead of one to a bdevsw and one to a cdevsw).

rawread()/rawwrite() went away as part of this though it's not strictly
the same  patch, just that it involves all the same lines in the drivers.

cdroms no longer have write() entries (they did have rawwrite (?)).
tapes no longer have support for bdev operations.

Reviewed by: Eivind Eklund and Mike Smith
	Changes suggested by eivind.

2 files changed, 5 insertions, 5 deletions

diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index 0fe76be..ffcb243 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_tree.c,v 1.53 1998/04/20 03:57:35 julian Exp $
+ *	$Id: devfs_tree.c,v 1.54 1998/06/21 14:53:20 bde Exp $
  */
 
 
@@ -1061,7 +1061,7 @@ devfs_add_devswf(void *devsw, int minor, int chrblk, uid_t uid,
 	devnm_p	new_dev;
 	dn_p	dnp;	/* devnode for parent directory */
 	struct	cdevsw *cd;
-	struct	bdevsw *bd;
+	struct	cdevsw *bd;
 	int	retval;
 	union	typeinfo by;
 
@@ -1106,7 +1106,7 @@ devfs_add_devswf(void *devsw, int minor, int chrblk, uid_t uid,
 		break;
 	case	DV_BLK:
 		bd = devsw;
-		major = bd->d_maj;
+		major = bd->d_bmaj;
 		if ( major == -1 ) return NULL;
 		by.Bdev.bdevsw = bd;
 		by.Bdev.dev = makedev(major, minor);
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index ef31dd9..cbde81d 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsdefs.h,v 1.13 1998/01/02 07:31:07 julian Exp $
+ * $Id: devfsdefs.h,v 1.14 1998/04/19 23:32:20 julian Exp $
  */
 #ifdef DEVFS_DEBUG
 #define DBPRINT(A) printf(A)
@@ -120,7 +120,7 @@ struct	devnode	/* the equivalent of an INODE */
 			dev_t	dev;
 		}Cdev;
 		struct {
-			struct	bdevsw	*bdevsw;
+			struct	cdevsw	*bdevsw;
 			dev_t	dev;
 		}Bdev;
 		struct {