--- linux/kernel/blk_drv/scsi/hosts.c 2018/04/24 18:08:13 1.1.1.1 +++ linux/kernel/blk_drv/scsi/hosts.c 2018/04/24 18:13:31 1.1.1.3 @@ -8,10 +8,10 @@ /* - This file contains the medium level SCSI - host interface initialization, as well as the scsi_hosts array of SCSI - hosts currently present in the system. -*/ + * This file contains the medium level SCSI + * host interface initialization, as well as the scsi_hosts array of SCSI + * hosts currently present in the system. + */ #include @@ -33,6 +33,10 @@ #include "aha1542.h" #endif +#ifdef CONFIG_SCSI_FUTURE_DOMAIN +#include "fdomain.h" +#endif + #ifdef CONFIG_SCSI_SEAGATE #include "seagate.h" #endif @@ -41,27 +45,31 @@ #include "ultrastor.h" #endif +#ifdef CONFIG_SCSI_7000FASST +#include "7000fasst.h" +#endif + /* -static const char RCSid[] = "$Header: /var/lib/cvsd/linux/linux/kernel/blk_drv/scsi/hosts.c,v 1.1.1.1 2018/04/24 18:08:13 root Exp $"; +static const char RCSid[] = "$Header: /var/lib/cvsd/linux/linux/kernel/blk_drv/scsi/hosts.c,v 1.1.1.3 2018/04/24 18:13:31 root Exp $"; */ /* - The scsi host entries should be in the order you wish the - cards to be detected. A driver may appear more than once IFF - it can deal with being detected (and therefore initialized) - with more than one simulatenous host number, can handle being - rentrant, etc. - - They may appear in any order, as each SCSI host is told which host number it is - during detection. -*/ + * The scsi host entries should be in the order you wish the + * cards to be detected. A driver may appear more than once IFF + * it can deal with being detected (and therefore initialized) + * with more than one simulatenous host number, can handle being + * rentrant, etc. + * + * They may appear in any order, as each SCSI host is told which host number it is + * during detection. + */ /* - When figure is run, we don't want to link to any object code. Since - the macro for each host will contain function pointers, we cannot - use it and instead must use a "blank" that does no such - idiocy. -*/ + * When figure is run, we don't want to link to any object code. Since + * the macro for each host will contain function pointers, we cannot + * use it and instead must use a "blank" that does no such + * idiocy. + */ #ifdef FIGURE_MAX_SCSI_HOSTS #define BLANKIFY(what) BLANK_HOST @@ -75,12 +83,19 @@ Scsi_Host scsi_hosts[] = BLANKIFY(AHA1542), #endif +#ifdef CONFIG_SCSI_FUTURE_DOMAIN + BLANKIFY(FDOMAIN_16X0), +#endif + #ifdef CONFIG_SCSI_SEAGATE BLANKIFY(SEAGATE_ST0X), #endif #ifdef CONFIG_SCSI_ULTRASTOR BLANKIFY(ULTRASTOR_14F), #endif +#ifdef CONFIG_SCSI_7000FASST + BLANKIFY(WD7000FASST), +#endif }; #ifdef FIGURE_MAX_SCSI_HOSTS @@ -91,20 +106,17 @@ Scsi_Host scsi_hosts[] = #ifdef FIGURE_MAX_SCSI_HOSTS #include void main (void) -{ +{ printf("%d", MAX_SCSI_HOSTS); } #else /* - Our semaphores and timeout counters, where size depends on MAX_SCSI_HOSTS here. -*/ + * Our semaphores and timeout counters, where size depends on MAX_SCSI_HOSTS here. + */ volatile unsigned char host_busy[MAX_SCSI_HOSTS]; volatile int host_timeout[MAX_SCSI_HOSTS]; volatile Scsi_Cmnd *host_queue[MAX_SCSI_HOSTS]; -/* - scsi_init initializes the scsi hosts. -*/ void scsi_init(void) { @@ -115,28 +127,31 @@ void scsi_init(void) called = 1; for (count = i = 0; i < MAX_SCSI_HOSTS; ++i) { - /* - Initialize our semaphores. -1 is interpreted to mean - "inactive" - where as 0 will indicate a time out condition. - */ +/* + * Initialize our semaphores. -1 is interpreted to mean + * "inactive" - where as 0 will indicate a time out condition. + */ host_busy[i] = 0; host_timeout[i] = 0; host_queue[i] = NULL; if ((scsi_hosts[i].detect) && (scsi_hosts[i].present = scsi_hosts[i].detect(i))) - { - printk ("Host %d is detected as a(n) %s.\n\r", - count, scsi_hosts[i].name); - printk ("%s", scsi_hosts[i].info()); - ++count; - } + { + printk ("scsi%d : %s.\n\r", + count, scsi_hosts[i].name); + printk ("%s", scsi_hosts[i].info()); + ++count; + } } - printk ("%d host adapters detected. \n\r", count); + printk ("scsi : %d hosts. \n\r", count); } } #endif - +#else +void main(void) { + printf("0\n"); + } #endif