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

Attempt to support the 688 as well. It looks vaguely right from inspecting 

esl.
This commit is contained in:
mycroft 2004-08-07 19:32:56 +00:00
parent 9e25bf4c82
commit 665e1f0611
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/isa/ess.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ess.c,v 1.62 2004/08/06 15:11:48 mycroft Exp $ */
/* $NetBSD: ess.c,v 1.63 2004/08/07 19:32:56 mycroft Exp $ */
/*
* Copyright 1997
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.62 2004/08/06 15:11:48 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.63 2004/08/07 19:32:56 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -189,6 +189,7 @@ void ess_read_multi_mix_reg __P((struct ess_softc *, u_char, u_int8_t *, bus_siz
static char *essmodel[] = {
"unsupported",
"688",
"1688",
"1788",
"1868",
@ -648,8 +649,8 @@ ess_identify(sc)
reg2 = ess_rdsp(sc);
if (((reg2 & 0xf0) != 0x80) ||
((reg2 & 0x0f) < 8)) {
printf("ess: Second ID byte wrong (0x%02x)\n", reg2);
return 1;
sc->sc_model = ESS_688;
return 0;
}
/*

23
sys/dev/isa/essvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: essvar.h,v 1.20 2004/08/06 15:11:48 mycroft Exp $ */
/* $NetBSD: essvar.h,v 1.21 2004/08/07 19:32:56 mycroft Exp $ */
/*
* Copyright 1997
* Digital Equipment Corporation. All rights reserved.
@ -33,7 +33,7 @@
*/
/*
** @(#) $RCSfile: essvar.h,v $ $Revision: 1.20 $ (SHARK) $Date: 2004/08/06 15:11:48 $
** @(#) $RCSfile: essvar.h,v $ $Revision: 1.21 $ (SHARK) $Date: 2004/08/07 19:32:56 $
**
**++
**
@ -151,15 +151,16 @@ struct ess_softc
u_int sc_model;
#define ESS_UNSUPPORTED 0
#define ESS_1688 1
#define ESS_1788 2
#define ESS_1868 3
#define ESS_1869 4
#define ESS_1878 5
#define ESS_1879 6
#define ESS_888 7
#define ESS_1887 8
#define ESS_1888 9
#define ESS_688 1
#define ESS_1688 2
#define ESS_1788 3
#define ESS_1868 4
#define ESS_1869 5
#define ESS_1878 6
#define ESS_1879 7
#define ESS_888 8
#define ESS_1887 9
#define ESS_1888 10
u_int sc_version; /* Legacy ES688/ES1688 ID */