From: Alan Cox <alan@linux.intel.com>
Date: Sat, 10 Oct 2015 20:12:01 +0000 (+0100)
Subject: devscsi: keep naming of probe code akin to IDE
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=cd75ecbf88e62adec94d1b8e66b39e7d668ce456;p=FUZIX.git

devscsi: keep naming of probe code akin to IDE
---

diff --git a/Kernel/dev/devscsi.h b/Kernel/dev/devscsi.h
index 66571b4e..728b1320 100644
--- a/Kernel/dev/devscsi.h
+++ b/Kernel/dev/devscsi.h
@@ -143,7 +143,7 @@ extern int si_flush(void);
 extern int si_docmd(uint8_t *data);
 
 /* Discardables (we don't do hot plug) */
-extern void scsi_init(void);
+extern void devscsi_init(void);
 
 /* Driver provided */
 
diff --git a/Kernel/dev/devscsi_discard.c b/Kernel/dev/devscsi_discard.c
index 35aae29d..c71e8bce 100644
--- a/Kernel/dev/devscsi_discard.c
+++ b/Kernel/dev/devscsi_discard.c
@@ -33,8 +33,10 @@ void scsi_dev_init(uint8_t drive)
   si_dcb.device = drive;
   si_dcb.lun = 0;
   si_dcb.bus = 0;
+  kputchar('S');
   if (si_select())		/* Can't select it - probably not present */
     return;
+  kputchar('I');
   /* FIXME: check if this would be better as a memcpy of fixed struct */
   si_dcb.cb.cb0.opcode = SIINQUIRY;
   si_dcb.cb.cb0.hiblock = 0;
@@ -47,6 +49,7 @@ void scsi_dev_init(uint8_t drive)
   si_user = 0;
   if (si_docmd(identify))
     return;
+  kputchar(':');
 
   p = identify + 8;
   while (p < identify + 27)
@@ -100,7 +103,7 @@ void scsi_dev_init(uint8_t drive)
   blkdev_scan(blk, SWAPSCAN);
 }
 
-void scsi_init(void)
+void devscsi_init(void)
 {
   uint8_t i;
   /* This is a bit crude - we need to do proper scans of each controller