[src/trunk]: src/sys/arch/usermode/dev Split out error reporting and make it ...

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

details:   https://anonhg.NetBSD.org/src/rev/0003a010d2a6
branches:  trunk
changeset: 319841:0003a010d2a6
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Wed Jun 13 19:59:14 2018 +0000

description:
Split out error reporting and make it compile without SCSIVERBOSE

diffstat:

 sys/arch/usermode/dev/vatapi.c |  26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 0a3af921d870 -r 0003a010d2a6 sys/arch/usermode/dev/vatapi.c
--- a/sys/arch/usermode/dev/vatapi.c    Wed Jun 13 19:37:23 2018 +0000
+++ b/sys/arch/usermode/dev/vatapi.c    Wed Jun 13 19:59:14 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vatapi.c,v 1.1 2018/06/05 20:02:43 reinoud Exp $ */
+/* $NetBSD: vatapi.c,v 1.2 2018/06/13 19:59:14 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2018 Reinoud Zandijk <reinoud%NetBSD.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vatapi.c,v 1.1 2018/06/05 20:02:43 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vatapi.c,v 1.2 2018/06/13 19:59:14 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,6 +48,8 @@
 #include <dev/scsipi/scsipiconf.h>
 #include <dev/scsipi/atapiconf.h>
 
+#include "opt_scsi.h"
+
 /* parameter? */
 #define VDEV_ATAPI_DRIVE       0
 #define MAX_SIZE               ((1<<16))
@@ -68,7 +70,9 @@
 static void    vatapi_complete(void *arg);
 
 /* for debugging */
+#ifdef SCSIVERBOSE
 void   scsipi_print_sense_data_real(struct scsi_sense_data *sense, int verbosity);
+#endif
 
 
 /* Note its one vdev, one adapter, one channel for now */
@@ -279,6 +283,21 @@
 
 
 static void
+vatapi_report_problem(scsireq_t *kreq)
+{
+#ifdef SCSIVERBOSE
+       printf("vatapi cmd failed: ");
+       for (int i = 0; i < kreq->cmdlen; i++) {
+               printf("%02x ", kreq->cmd[i]);
+       }
+       printf("\n");
+       scsipi_print_sense_data_real(
+               (struct scsi_sense_data *) kreq->sense, 1);
+#endif
+}
+
+
+static void
 vatapi_complete(void *arg)
 {
        struct vatapi_softc *sc = arg;
@@ -316,8 +335,7 @@
                        xs->error = XS_SHORTSENSE;      /* ATAPI */
                        memcpy(&xs->sense.scsi_sense, kreq.sense,
                                sizeof(struct scsi_sense_data));
-//                     scsipi_print_sense_data_real(
-//                             (struct scsi_sense_data *) kreq.sense, 1);
+                       vatapi_report_problem(&kreq);
                        break;
                default:
                        thunk_printf("unhandled/unknown retstst %d\n", kreq.retsts);