Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch from rgrimes to add delay to let data port stabilize, also

Browse Source 
make "lpflag" unique to each driver
This commit is contained in:
cgd 1993-06-05 22:58:29 +00:00
parent e13c2fa2e7
commit 9d6a908bb7
6 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/i386/isa/lpa.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpa.c,v 1.3 1993/05/22 11:41:20 cgd Exp $
* $Id: lpa.c,v 1.4 1993/06/05 22:58:29 cgd Exp $
*/
/*
@ -102,7 +102,8 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lpaflag) printf
int lpaflag = 1;
#endif
int lpaprobe(), lpaattach();
@ -140,11 +141,14 @@ struct lpa_softc {
int
lpa_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}

14
sys/arch/i386/isa/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.4 1993/05/22 11:41:22 cgd Exp $
* $Id: lpt.c,v 1.5 1993/06/05 22:58:31 cgd Exp $
*/
/*
@ -80,12 +80,13 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lptflag) printf
int lptflag = 1;
#endif
int lptout();
#ifdef DEBUG
int lpflag = 1;
int lptflag = 1;
#endif
int lptprobe(), lptattach(), lptintr();
@ -131,11 +132,14 @@ struct lpt_softc {
int
lpt_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}

14
sys/dev/ic/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.4 1993/05/22 11:41:22 cgd Exp $
* $Id: lpt.c,v 1.5 1993/06/05 22:58:31 cgd Exp $
*/
/*
@ -80,12 +80,13 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lptflag) printf
int lptflag = 1;
#endif
int lptout();
#ifdef DEBUG
int lpflag = 1;
int lptflag = 1;
#endif
int lptprobe(), lptattach(), lptintr();
@ -131,11 +132,14 @@ struct lpt_softc {
int
lpt_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}

14
sys/dev/ic/lptvar.h
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lptvar.h,v 1.4 1993/05/22 11:41:22 cgd Exp $
* $Id: lptvar.h,v 1.5 1993/06/05 22:58:31 cgd Exp $
*/
/*
@ -80,12 +80,13 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lptflag) printf
int lptflag = 1;
#endif
int lptout();
#ifdef DEBUG
int lpflag = 1;
int lptflag = 1;
#endif
int lptprobe(), lptattach(), lptintr();
@ -131,11 +132,14 @@ struct lpt_softc {
int
lpt_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}

14
sys/dev/isa/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.4 1993/05/22 11:41:22 cgd Exp $
* $Id: lpt.c,v 1.5 1993/06/05 22:58:31 cgd Exp $
*/
/*
@ -80,12 +80,13 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lptflag) printf
int lptflag = 1;
#endif
int lptout();
#ifdef DEBUG
int lpflag = 1;
int lptflag = 1;
#endif
int lptprobe(), lptattach(), lptintr();
@ -131,11 +132,14 @@ struct lpt_softc {
int
lpt_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}

14
sys/dev/isa/lpt_isa.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt_isa.c,v 1.4 1993/05/22 11:41:22 cgd Exp $
* $Id: lpt_isa.c,v 1.5 1993/06/05 22:58:31 cgd Exp $
*/
/*
@ -80,12 +80,13 @@
#ifndef DEBUG
#define lprintf
#else
#define lprintf if (lpflag) printf
#define lprintf if (lptflag) printf
int lptflag = 1;
#endif
int lptout();
#ifdef DEBUG
int lpflag = 1;
int lptflag = 1;
#endif
int lptprobe(), lptattach(), lptintr();
@ -131,11 +132,14 @@ struct lpt_softc {
int
lpt_port_test(short port, u_char data, u_char mask)
{
int temp;
int temp, timeout;
data = data & mask;
outb(port, data);
temp = inb(port) & mask;
timeout = 100;
do
temp = inb(port) & mask;
while (temp != data && --timeout);
lprintf("Port 0x%x\tout=%x\tin=%x\n", port, data, temp);
return (temp == data);
}