CVS commit: src/sys/dev

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Tue Mar 19 07:01:15 UTC 2019

Modified Files:
        src/sys/dev: ld.c ldvar.h

Log Message:
Let backend provide a disk type. The information can be queried through
drvctl(4).


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ld.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ldvar.h

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/ld.c
diff -u src/sys/dev/ld.c:1.105 src/sys/dev/ld.c:1.106
--- src/sys/dev/ld.c:1.105	Sat Oct 13 14:24:35 2018
+++ src/sys/dev/ld.c	Tue Mar 19 07:01:14 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld.c,v 1.105 2018/10/13 14:24:35 mlelstv Exp $	*/
+/*	$NetBSD: ld.c,v 1.106 2019/03/19 07:01:14 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.105 2018/10/13 14:24:35 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.106 2019/03/19 07:01:14 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -587,7 +587,7 @@ ld_set_geometry(struct ld_softc *sc)
 	dg->dg_ntracks = sc->sc_nheads;
 	dg->dg_ncylinders = sc->sc_ncylinders;
 
-	disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, NULL);
+	disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, sc->sc_typename);
 }
 
 static void

Index: src/sys/dev/ldvar.h
diff -u src/sys/dev/ldvar.h:1.32 src/sys/dev/ldvar.h:1.33
--- src/sys/dev/ldvar.h:1.32	Sun Aug 20 15:58:43 2017
+++ src/sys/dev/ldvar.h	Tue Mar 19 07:01:14 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldvar.h,v 1.32 2017/08/20 15:58:43 mlelstv Exp $	*/
+/*	$NetBSD: ldvar.h,v 1.33 2019/03/19 07:01:14 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -57,6 +57,7 @@ struct ld_softc {
 	int		sc_secsize;	/* sector size in bytes */
 	int		sc_maxxfer;	/* max xfer size in bytes */
 	int		sc_maxqueuecnt;	/* maximum h/w queue depth */
+	char		*sc_typename;	/* inquiry data */
 
 	int		(*sc_dump)(struct ld_softc *, void *, int, int);
 	int		(*sc_ioctl)(struct ld_softc *, u_long, void *, int32_t, bool);