system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Move the `return' statement the correct place so that the keyboard

Browse source 
won't be initialized if `atkbd?' is disabled.
This commit is contained in:
Kazutaka YOKOTA 1999-07-18 06:16:25 +00:00
parent 56d253f621
commit 29e59d7deb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=48878
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/atkbdc/atkbd.c
View file

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
* $Id: atkbd.c,v 1.11 1999/05/30 16:51:30 phk Exp $
*/
#include "atkbd.h"
@ -355,6 +355,9 @@ atkbd_configure(int flags)
int arg[2];
int i;
/* probe the keyboard controller */
atkbdc_configure();
/* if the driver is disabled, unregister the keyboard if any */
if ((resource_int_value("atkbd", ATKBD_DEFAULT, "disabled", &i) == 0)
&& i != 0) {
@ -363,17 +366,14 @@ atkbd_configure(int flags)
kbd = kbd_get_keyboard(i);
kbd_unregister(kbd);
kbd->kb_flags &= ~KB_REGISTERED;
return 0;
}
return 0;
}
/* XXX: a kludge to obtain the device configuration flags */
if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0)
flags |= i;
/* probe the keyboard controller */
atkbdc_configure();
/* probe the default keyboard */
arg[0] = -1;
arg[1] = -1;

10
sys/dev/kbd/atkbd.c
View file

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
* $Id: atkbd.c,v 1.11 1999/05/30 16:51:30 phk Exp $
*/
#include "atkbd.h"
@ -355,6 +355,9 @@ atkbd_configure(int flags)
int arg[2];
int i;
/* probe the keyboard controller */
atkbdc_configure();
/* if the driver is disabled, unregister the keyboard if any */
if ((resource_int_value("atkbd", ATKBD_DEFAULT, "disabled", &i) == 0)
&& i != 0) {
@ -363,17 +366,14 @@ atkbd_configure(int flags)
kbd = kbd_get_keyboard(i);
kbd_unregister(kbd);
kbd->kb_flags &= ~KB_REGISTERED;
return 0;
}
return 0;
}
/* XXX: a kludge to obtain the device configuration flags */
if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0)
flags |= i;
/* probe the keyboard controller */
atkbdc_configure();
/* probe the default keyboard */
arg[0] = -1;
arg[1] = -1;