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

Make apm_probe() properly return an error code when APM BIOS calls

Browse Source 
failed, so that the apm driver won't be attached.
This commit is contained in:
yokota 1999-05-09 04:58:13 +00:00
parent 3f092f3796
commit 58c19147f4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/i386/apm/apm.c
View File

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.82 1999/05/07 10:10:17 phk Exp $
* $Id: apm.c,v 1.83 1999/05/08 21:59:13 dfr Exp $
*/
#include "opt_devfs.h"
@ -739,13 +739,13 @@ apm_probe(device_t dev)
switch (apm_version) {
case APMINI_CANTFIND:
/* silent */
return 0;
return ENXIO;
case APMINI_NOT32BIT:
printf("apm: 32bit connection is not supported.\n");
return 0;
return ENXIO;
case APMINI_CONNECTERR:
printf("apm: 32-bit connection error.\n");
return 0;
return ENXIO;
}
if (flags & 0x20)
statclock_disable = 1;

8
sys/i386/bios/apm.c
View File

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.82 1999/05/07 10:10:17 phk Exp $
* $Id: apm.c,v 1.83 1999/05/08 21:59:13 dfr Exp $
*/
#include "opt_devfs.h"
@ -739,13 +739,13 @@ apm_probe(device_t dev)
switch (apm_version) {
case APMINI_CANTFIND:
/* silent */
return 0;
return ENXIO;
case APMINI_NOT32BIT:
printf("apm: 32bit connection is not supported.\n");
return 0;
return ENXIO;
case APMINI_CONNECTERR:
printf("apm: 32-bit connection error.\n");
return 0;
return ENXIO;
}
if (flags & 0x20)
statclock_disable = 1;