mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-20 02:38:43 +00:00
Code Issues Releases Activity

Correctly save `flags' bits.

Browse Source
This commit is contained in:
Kazutaka YOKOTA 1999-08-15 06:06:14 +00:00
parent 175d1f69bf
commit 6c6028fffb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=49820
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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.11 1999/05/30 16:51:30 phk Exp $
* $Id: atkbd.c,v 1.12 1999/07/18 06:16:25 yokota Exp $
*/
#include "atkbd.h"
@ -499,6 +499,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
KBD_PROBE_DONE(kbd);
}
if (!KBD_IS_INITIALIZED(kbd) && !(flags & KB_CONF_PROBE_ONLY)) {
kbd->kb_config = flags & ~KB_CONF_PROBE_ONLY;
if (KBD_HAS_DEVICE(kbd)
&& init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config)
&& (kbd->kb_config & KB_CONF_FAIL_IF_NO_KBD))

3
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.11 1999/05/30 16:51:30 phk Exp $
* $Id: atkbd.c,v 1.12 1999/07/18 06:16:25 yokota Exp $
*/
#include "atkbd.h"
@ -499,6 +499,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
KBD_PROBE_DONE(kbd);
}
if (!KBD_IS_INITIALIZED(kbd) && !(flags & KB_CONF_PROBE_ONLY)) {
kbd->kb_config = flags & ~KB_CONF_PROBE_ONLY;
if (KBD_HAS_DEVICE(kbd)
&& init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config)
&& (kbd->kb_config & KB_CONF_FAIL_IF_NO_KBD))