Module Name: src
Committed By: mlelstv
Date: Tue Mar 19 06:59:40 UTC 2019
Modified Files:
src/sys/dev/scsipi: sd.c sdvar.h
Log Message:
Set disk product name as disk type. The information can be queried through
drvctl(4).
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/scsipi/sdvar.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/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.326 src/sys/dev/scsipi/sd.c:1.327
--- src/sys/dev/scsipi/sd.c:1.326 Sun Oct 7 18:14:32 2018
+++ src/sys/dev/scsipi/sd.c Tue Mar 19 06:59:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.326 2018/10/07 18:14:32 christos Exp $ */
+/* $NetBSD: sd.c,v 1.327 2019/03/19 06:59:40 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.326 2018/10/07 18:14:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.327 2019/03/19 06:59:40 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -256,6 +256,8 @@ sdattach(device_t parent, device_t self,
sd->type = (sa->sa_inqbuf.type & SID_TYPE);
strncpy(sd->name, sa->sa_inqbuf.product, sizeof(sd->name));
+ strncpy(sd->typename, sa->sa_inqbuf.product, sizeof(sd->typename));
+
if (sd->type == T_SIMPLE_DIRECT)
periph->periph_quirks |= PQUIRK_ONLYBIG | PQUIRK_NOBIGMODESENSE;
@@ -1936,5 +1938,5 @@ sd_set_geometry(struct sd_softc *sd)
dg->dg_ntracks = sd->params.heads;
dg->dg_ncylinders = sd->params.cyls;
- disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, NULL);
+ disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, sd->typename);
}
Index: src/sys/dev/scsipi/sdvar.h
diff -u src/sys/dev/scsipi/sdvar.h:1.38 src/sys/dev/scsipi/sdvar.h:1.39
--- src/sys/dev/scsipi/sdvar.h:1.38 Sat Dec 10 10:26:38 2016
+++ src/sys/dev/scsipi/sdvar.h Tue Mar 19 06:59:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.38 2016/12/10 10:26:38 mlelstv Exp $ */
+/* $NetBSD: sdvar.h,v 1.39 2019/03/19 06:59:40 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -88,6 +88,7 @@ struct sd_softc {
callout_t sc_callout;
u_int8_t type;
char name[16]; /* product name, for default disklabel */
+ char typename[128+4+1]; /* stored in disk info */
};
#define SDGP_RESULT_OK 0 /* parameters obtained */
