o Return error when the controller can't accept commands.
o Make driver less chatty on boot (only announce version under bootverbose) Submitted by: Simon Shapiro <shimon@simon-shapiro.org>
This commit is contained in:
parent
ce47711dee
commit
e448e98a36
@ -36,7 +36,7 @@
|
||||
* future.
|
||||
*/
|
||||
|
||||
#ident "$Id: dpt_control.c,v 1.3 1998/02/20 13:11:44 bde Exp $"
|
||||
#ident "$Id: dpt_control.c,v 1.4 1998/04/17 22:36:20 des Exp $"
|
||||
|
||||
#include "opt_dpt.h"
|
||||
|
||||
@ -853,8 +853,9 @@ dpt_drvinit(void *unused)
|
||||
dev_t dev;
|
||||
|
||||
if (!dpt_devsw_installed) {
|
||||
printf("DPT: RAID Manager driver, Version %d.%d.%d\n",
|
||||
DPT_CTL_RELEASE, DPT_CTL_VERSION, DPT_CTL_PATCH);
|
||||
if (bootverbose)
|
||||
printf("DPT: RAID Manager driver, Version %d.%d.%d\n",
|
||||
DPT_CTL_RELEASE, DPT_CTL_VERSION, DPT_CTL_PATCH);
|
||||
|
||||
/* Add the I/O (data) channel */
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
|
@ -34,7 +34,7 @@
|
||||
* caveats: We may need an eisa and an isa files too
|
||||
*/
|
||||
|
||||
#ident "$Id: dpt_pci.c,v 1.4 1998/02/20 13:11:50 bde Exp $"
|
||||
#ident "$Id: dpt_pci.c,v 1.5 1998/03/11 00:30:16 julian Exp $"
|
||||
|
||||
#include "opt_devfs.h"
|
||||
#include "opt_dpt.h"
|
||||
@ -110,7 +110,7 @@ dpt_pci_probe(pcici_t tag, pcidi_t type)
|
||||
#define PCI_SUBCLASS_MASS_STORAGE_SCSI 0x00000000
|
||||
#endif
|
||||
|
||||
if ( !already_announced ) {
|
||||
if ( bootverbose && !already_announced ) {
|
||||
printf("DPT: PCI SCSI HBA Driver, version %d.%d.%d\n",
|
||||
DPT_RELEASE, DPT_VERSION, DPT_PATCH);
|
||||
++already_announced;
|
||||
|
@ -64,7 +64,7 @@
|
||||
* 3. dpt_handle_timeouts potentially inserts into the queue
|
||||
*/
|
||||
|
||||
#ident "$Id: dpt_scsi.c,v 1.4 1998/02/25 11:56:37 bde Exp $"
|
||||
#ident "$Id: dpt_scsi.c,v 1.5 1998/03/11 00:30:08 julian Exp $"
|
||||
#define _DPT_C_
|
||||
|
||||
#include "opt_dpt.h"
|
||||
@ -2105,13 +2105,11 @@ dpt_scsi_cmd(struct scsi_xfer * xs)
|
||||
/* This will setup the xs flags */
|
||||
dpt_process_completion(dpt, ccb);
|
||||
|
||||
if (status & HA_SERROR) {
|
||||
ospl = splsoftcam();
|
||||
dpt_Qpush_free(dpt, ccb);
|
||||
splx(ospl);
|
||||
return (COMPLETE);
|
||||
}
|
||||
ospl = splsoftcam();
|
||||
if ((status & HA_SERROR) || (ndx == xs->timeout)) {
|
||||
xs->error = XS_DRIVER_STUFFUP;
|
||||
}
|
||||
|
||||
dpt_Qpush_free(dpt, ccb);
|
||||
splx(ospl);
|
||||
return (COMPLETE);
|
||||
|
@ -34,7 +34,7 @@
|
||||
* caveats: We may need an eisa and an isa files too
|
||||
*/
|
||||
|
||||
#ident "$Id: dpt_pci.c,v 1.4 1998/02/20 13:11:50 bde Exp $"
|
||||
#ident "$Id: dpt_pci.c,v 1.5 1998/03/11 00:30:16 julian Exp $"
|
||||
|
||||
#include "opt_devfs.h"
|
||||
#include "opt_dpt.h"
|
||||
@ -110,7 +110,7 @@ dpt_pci_probe(pcici_t tag, pcidi_t type)
|
||||
#define PCI_SUBCLASS_MASS_STORAGE_SCSI 0x00000000
|
||||
#endif
|
||||
|
||||
if ( !already_announced ) {
|
||||
if ( bootverbose && !already_announced ) {
|
||||
printf("DPT: PCI SCSI HBA Driver, version %d.%d.%d\n",
|
||||
DPT_RELEASE, DPT_VERSION, DPT_PATCH);
|
||||
++already_announced;
|
||||
|
@ -40,7 +40,7 @@
|
||||
*/
|
||||
|
||||
|
||||
#ident "$Id: dpt.h,v 1.1 1998/01/26 06:11:15 julian Exp $"
|
||||
#ident "$Id: dpt.h,v 1.2 1998/04/15 17:47:28 bde Exp $"
|
||||
|
||||
#ifndef _DPT_H
|
||||
#define _DPT_H
|
||||
@ -63,10 +63,10 @@ extern u_long dpt_unit;
|
||||
|
||||
#define DPT_RELEASE 1
|
||||
#define DPT_VERSION 4
|
||||
#define DPT_PATCH 2
|
||||
#define DPT_MONTH 1
|
||||
#define DPT_DAY 20
|
||||
#define DPT_YEAR 18 /* 1997 - 1980 */
|
||||
#define DPT_PATCH 3
|
||||
#define DPT_MONTH 6
|
||||
#define DPT_DAY 1
|
||||
#define DPT_YEAR 18 /* 1998 - 1980 */
|
||||
|
||||
#define DPT_CTL_RELEASE 1
|
||||
#define DPT_CTL_VERSION 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user