d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bugs in the probe routine uncovered by the previous fix.

Browse Source
This commit is contained in:
David Greenman 1993-06-27 10:28:28 +00:00
parent 10ca1c6c92
commit 43d5830f3d
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/ed/if_ed.c
View File

@ -17,6 +17,10 @@
* Modification history
*
* $Log: if_ed.c,v $
* Revision 1.11 93/06/27 03:07:01 davidg
* fixed bugs in the 3Com part of the probe routine that were uncovered by
* the previous fix.
*
* Revision 1.10 93/06/25 19:23:19 davidg
* fixed bug that caused erroneous 'Invalid irq configuration' message when
* no board is present (during autoconfiguration).
@ -421,7 +425,7 @@ ed_probe(isa_dev)
* Verify that the kernel configured I/O address matches the board
* configured address
*/
switch (sc->asic_addr + ED_3COM_BCFR) {
switch (inb(sc->asic_addr + ED_3COM_BCFR)) {
case ED_3COM_BCFR_300:
if (isa_dev->id_iobase != 0x300)
return(0);
@ -462,21 +466,21 @@ ed_probe(isa_dev)
* Verify that the kernel shared memory address matches the
* board configured address.
*/
switch (sc->asic_addr + ED_3COM_PCFR) {
switch (inb(sc->asic_addr + ED_3COM_PCFR)) {
case ED_3COM_PCFR_DC000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_DC000)
if (kvtop(isa_dev->id_maddr) != 0xdc000)
return(0);
break;
case ED_3COM_PCFR_D8000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_D8000)
if (kvtop(isa_dev->id_maddr) != 0xd8000)
return(0);
break;
case ED_3COM_PCFR_CC000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_CC000)
if (kvtop(isa_dev->id_maddr) != 0xcc000)
return(0);
break;
case ED_3COM_PCFR_C8000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_C8000)
if (kvtop(isa_dev->id_maddr) != 0xc8000)
return(0);
break;
default:
@ -618,7 +622,7 @@ ed_probe(isa_dev)
#if 0
printf("Starting write\n");
for (i = 0; i < 8192; ++i)
bzero(sc->smem_start, 8192);
bzerow(sc->smem_start, 8192);
printf("Done.\n");
#endif
#if 0

18
sys/i386/isa/if_ed.c
View File

@ -17,6 +17,10 @@
* Modification history
*
* $Log: if_ed.c,v $
* Revision 1.11 93/06/27 03:07:01 davidg
* fixed bugs in the 3Com part of the probe routine that were uncovered by
* the previous fix.
*
* Revision 1.10 93/06/25 19:23:19 davidg
* fixed bug that caused erroneous 'Invalid irq configuration' message when
* no board is present (during autoconfiguration).
@ -421,7 +425,7 @@ ed_probe(isa_dev)
* Verify that the kernel configured I/O address matches the board
* configured address
*/
switch (sc->asic_addr + ED_3COM_BCFR) {
switch (inb(sc->asic_addr + ED_3COM_BCFR)) {
case ED_3COM_BCFR_300:
if (isa_dev->id_iobase != 0x300)
return(0);
@ -462,21 +466,21 @@ ed_probe(isa_dev)
* Verify that the kernel shared memory address matches the
* board configured address.
*/
switch (sc->asic_addr + ED_3COM_PCFR) {
switch (inb(sc->asic_addr + ED_3COM_PCFR)) {
case ED_3COM_PCFR_DC000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_DC000)
if (kvtop(isa_dev->id_maddr) != 0xdc000)
return(0);
break;
case ED_3COM_PCFR_D8000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_D8000)
if (kvtop(isa_dev->id_maddr) != 0xd8000)
return(0);
break;
case ED_3COM_PCFR_CC000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_CC000)
if (kvtop(isa_dev->id_maddr) != 0xcc000)
return(0);
break;
case ED_3COM_PCFR_C8000:
if (kvtop(isa_dev->id_maddr) != ED_3COM_PCFR_C8000)
if (kvtop(isa_dev->id_maddr) != 0xc8000)
return(0);
break;
default:
@ -618,7 +622,7 @@ ed_probe(isa_dev)
#if 0
printf("Starting write\n");
for (i = 0; i < 8192; ++i)
bzero(sc->smem_start, 8192);
bzerow(sc->smem_start, 8192);
printf("Done.\n");
#endif
#if 0