From: wdenk <wdenk>
Date: Fri, 23 Nov 2001 16:12:59 +0000 (+0000)
Subject: Replace the fixed device ID (0x0001) by a configuration #define
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=66cd8e333ec1635a25e6a7ba2c82a0f33f71f5d3;p=users%2Frw%2Fppcboot.git

Replace the fixed device ID (0x0001) by a configuration #define
(CONFIG_SCSI_DEV_ID).
09-18-2001 Andreas Heppel, Sysgo RTS GmbH <aheppel@sysgo.de>
---

diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index ec3bbba..49a131a 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -37,6 +37,8 @@
 #include <cmd_disk.h>
 #ifdef CONFIG_4xx
 #include <405gp_pci.h>
+#elif defined (CONFIG_BAB750)
+#include <mpc106.h>
 #endif
 
 
@@ -54,8 +56,12 @@
 
 #ifdef CONFIG_SCSI_SYM53C8XX
 #define SCSI_VEND_ID	0x1000
+#ifndef CONFIG_SCSI_DEV_ID
 #define SCSI_DEV_ID		0x0001
 #else
+#define SCSI_DEV_ID		CONFIG_SCSI_DEV_ID
+#endif
+#else
 #error CONFIG_SCSI_SYM53C8XX must be defined
 #endif
 
@@ -191,6 +197,11 @@ void scsi_init(void)
 		printf("Error SCSI Controller (%04X,%04X) not found\n",SCSI_VEND_ID,SCSI_DEV_ID);
 		return;
 	}
+#ifdef DEBUG
+	else {
+		printf("SCSI Controller (%04X,%04X) found (%d:%d:%d)\n",SCSI_VEND_ID,SCSI_DEV_ID,(busdevfunc>>16)&0xFF,(busdevfunc>>11)&0x1F,(busdevfunc>>8)&0x7);
+	}
+#endif
 	scsi_low_level_init(busdevfunc);
 	scsi_scan(1);
 }