minor silliness related to two or more controllers

This commit is contained in:
deraadt 1993-06-09 22:36:40 +00:00
parent d2f1cebe30
commit f6779cbdce
9 changed files with 42 additions and 28 deletions

View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.11 1993/05/22 08:01:00 cgd Exp $
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
*/
#include "ahb.h"
@ -464,7 +464,7 @@ ahb_attach(struct isa_device *dev)
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
ahb_timeout(0);
}

View File

@ -12,13 +12,16 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.9 1993/05/22 08:00:56 cgd Exp $
* $Id: aha1542.c,v 1.10 1993/06/09 22:36:40 deraadt Exp $
*/
/*
* HISTORY
* $Log: aha1542.c,v $
* Revision 1.9 1993/05/22 08:00:56 cgd
* Revision 1.10 1993/06/09 22:36:40 deraadt
* minor silliness related to two or more controllers
*
* Revision 1.9 1993/05/22 08:00:56 cgd
* add rcsids to everything and clean up headers
*
* Revision 1.8 1993/05/04 08:32:40 deraadt
@ -529,11 +532,12 @@ int
ahaattach(struct isa_device *dev)
{
static int firsttime;
static u_long speedprint; /* max 32 aha controllers */
int masunit = dev->id_masunit;
int r;
if(!firsttime) {
firsttime = 1;
if(!(speedprint & (1<<masunit))) {
speedprint |= (1<<masunit);
printf("aha%d: bus speed %dns\n", masunit, speed[masunit]);
}
@ -541,8 +545,8 @@ ahaattach(struct isa_device *dev)
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(masunit==0 && firsttime==1) {
firsttime = 2;
if(firsttime==0) {
firsttime = 1;
aha_timeout(0);
}
return r;

View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.11 1993/05/22 08:01:00 cgd Exp $
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
*/
#include "ahb.h"
@ -464,7 +464,7 @@ ahb_attach(struct isa_device *dev)
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
ahb_timeout(0);
}

View File

@ -12,13 +12,16 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.6 1993/05/22 08:01:05 cgd Exp $
* $Id: bt742a.c,v 1.7 1993/06/09 22:36:49 deraadt Exp $
*/
/*
* HISTORY
* $Log: bt742a.c,v $
* Revision 1.6 1993/05/22 08:01:05 cgd
* Revision 1.7 1993/06/09 22:36:49 deraadt
* minor silliness related to two or more controllers
*
* Revision 1.6 1993/05/22 08:01:05 cgd
* add rcsids to everything and clean up headers
*
* Revision 1.5 1993/05/04 08:32:44 deraadt
@ -663,7 +666,7 @@ struct isa_dev *dev;
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
bt_timeout(0);
}

View File

@ -15,7 +15,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: ultra14f.c,v 1.10 1993/05/22 08:01:41 cgd Exp $
* $Id: ultra14f.c,v 1.11 1993/06/09 22:36:53 deraadt Exp $
*/
#include <sys/types.h>
@ -444,7 +444,7 @@ struct isa_dev *dev;
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
uha_timeout(0);
}

View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.11 1993/05/22 08:01:00 cgd Exp $
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
*/
#include "ahb.h"
@ -464,7 +464,7 @@ ahb_attach(struct isa_device *dev)
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
ahb_timeout(0);
}

View File

@ -12,13 +12,16 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.9 1993/05/22 08:00:56 cgd Exp $
* $Id: aha1542.c,v 1.10 1993/06/09 22:36:40 deraadt Exp $
*/
/*
* HISTORY
* $Log: aha1542.c,v $
* Revision 1.9 1993/05/22 08:00:56 cgd
* Revision 1.10 1993/06/09 22:36:40 deraadt
* minor silliness related to two or more controllers
*
* Revision 1.9 1993/05/22 08:00:56 cgd
* add rcsids to everything and clean up headers
*
* Revision 1.8 1993/05/04 08:32:40 deraadt
@ -529,11 +532,12 @@ int
ahaattach(struct isa_device *dev)
{
static int firsttime;
static u_long speedprint; /* max 32 aha controllers */
int masunit = dev->id_masunit;
int r;
if(!firsttime) {
firsttime = 1;
if(!(speedprint & (1<<masunit))) {
speedprint |= (1<<masunit);
printf("aha%d: bus speed %dns\n", masunit, speed[masunit]);
}
@ -541,8 +545,8 @@ ahaattach(struct isa_device *dev)
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(masunit==0 && firsttime==1) {
firsttime = 2;
if(firsttime==0) {
firsttime = 1;
aha_timeout(0);
}
return r;

View File

@ -12,13 +12,16 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.6 1993/05/22 08:01:05 cgd Exp $
* $Id: bt742a.c,v 1.7 1993/06/09 22:36:49 deraadt Exp $
*/
/*
* HISTORY
* $Log: bt742a.c,v $
* Revision 1.6 1993/05/22 08:01:05 cgd
* Revision 1.7 1993/06/09 22:36:49 deraadt
* minor silliness related to two or more controllers
*
* Revision 1.6 1993/05/22 08:01:05 cgd
* add rcsids to everything and clean up headers
*
* Revision 1.5 1993/05/04 08:32:44 deraadt
@ -663,7 +666,7 @@ struct isa_dev *dev;
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
bt_timeout(0);
}

View File

@ -15,7 +15,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: ultra14f.c,v 1.10 1993/05/22 08:01:41 cgd Exp $
* $Id: ultra14f.c,v 1.11 1993/06/09 22:36:53 deraadt Exp $
*/
#include <sys/types.h>
@ -444,7 +444,7 @@ struct isa_dev *dev;
&dev->id_physid, &dev->id_unit, dev->id_flags);
/* only one for all boards */
if(firsttime==0 && masunit==0) {
if(firsttime==0) {
firsttime = 1;
uha_timeout(0);
}