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

Commit some tweaks I have had laying around my tree for over a year now.

Browse Source 
Always set the APM "device" description.  Some minor style tweaks.
This commit is contained in:
Peter Wemm 2001-03-13 05:56:48 +00:00
parent e793f3a0e0
commit 02846353f9
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,7 +691,7 @@ apm_timeout(void *dummy)
if (sc->active == 1)
/* Run slightly more oftan than 1 Hz */
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1 );
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1);
}
/* enable APM BIOS */
@ -766,13 +766,14 @@ apm_probe(device_t dev)
struct apm_softc *sc = &apm_softc;
int disabled, flags;
if (resource_int_value("apm", 0, "disabled", &disabled) == 0
&& disabled != 0)
return ENXIO;
device_set_desc(dev, "APM BIOS");
if ( device_get_unit(dev) > 0 ) {
if (resource_int_value("apm", 0, "disabled", &disabled) != 0)
disabled = 0;
if (disabled)
return ENXIO;
if (device_get_unit(dev) > 0) {
printf("apm: Only one APM driver supported.\n");
return ENXIO;
}

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

@ -691,7 +691,7 @@ apm_timeout(void *dummy)
if (sc->active == 1)
/* Run slightly more oftan than 1 Hz */
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1 );
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1);
}
/* enable APM BIOS */
@ -766,13 +766,14 @@ apm_probe(device_t dev)
struct apm_softc *sc = &apm_softc;
int disabled, flags;
if (resource_int_value("apm", 0, "disabled", &disabled) == 0
&& disabled != 0)
return ENXIO;
device_set_desc(dev, "APM BIOS");
if ( device_get_unit(dev) > 0 ) {
if (resource_int_value("apm", 0, "disabled", &disabled) != 0)
disabled = 0;
if (disabled)
return ENXIO;
if (device_get_unit(dev) > 0) {
printf("apm: Only one APM driver supported.\n");
return ENXIO;
}