mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-15 05:43:33 +08:00
Update to FreeBSD head 2017-08-01
Git mirror commit f5002f5e5f78cae9f0269d812dc0aedb0339312c. Update #3472.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include <machine/rtems-bsd-kernel-space.h>
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2016 Vladimir Kondratyev <wulf@cicgroup.ru>
|
||||
* Copyright (c) 2016 Vladimir Kondratyev <wulf@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -29,14 +29,14 @@
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <dev/evdev/input.h>
|
||||
#include <dev/evdev/evdev.h>
|
||||
#include <dev/evdev/evdev_private.h>
|
||||
#include <dev/evdev/input.h>
|
||||
|
||||
#ifdef DEBUG
|
||||
#define debugf(fmt, args...) printf("evdev: " fmt "\n", ##args)
|
||||
@@ -226,13 +226,9 @@ void
|
||||
evdev_push_nfingers(struct evdev_dev *evdev, int32_t nfingers)
|
||||
{
|
||||
|
||||
if (evdev->ev_lock_type == EV_LOCK_INTERNAL)
|
||||
EVDEV_LOCK(evdev);
|
||||
else
|
||||
EVDEV_LOCK_ASSERT(evdev);
|
||||
EVDEV_ENTER(evdev);
|
||||
evdev_send_nfingers(evdev, nfingers);
|
||||
if (evdev->ev_lock_type == EV_LOCK_INTERNAL)
|
||||
EVDEV_UNLOCK(evdev);
|
||||
EVDEV_EXIT(evdev);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -266,13 +262,9 @@ void
|
||||
evdev_push_mt_compat(struct evdev_dev *evdev)
|
||||
{
|
||||
|
||||
if (evdev->ev_lock_type == EV_LOCK_INTERNAL)
|
||||
EVDEV_LOCK(evdev);
|
||||
else
|
||||
EVDEV_LOCK_ASSERT(evdev);
|
||||
EVDEV_ENTER(evdev);
|
||||
evdev_send_mt_compat(evdev);
|
||||
if (evdev->ev_lock_type == EV_LOCK_INTERNAL)
|
||||
EVDEV_UNLOCK(evdev);
|
||||
EVDEV_EXIT(evdev);
|
||||
}
|
||||
|
||||
void
|
||||
|
Reference in New Issue
Block a user